[U-Boot] [PATCH 2/2] ARM: reorganize Cortex directory
Rabin Vincent
rabin.vincent at stericsson.com
Wed Apr 14 11:53:17 CEST 2010
Rename arch/arm/cpu/arm_cortexa8 to arch/arm/cpu/cortex, and move
Cortex-A8 SOC directories into arch/arm/cpu/cortex/a8. This will allow
a logical separation between the A8 and A9 variants while at the same
time allowing them to share code.
Since currently all code can be shared between A8 and A9, we don't put
any source files in the top-level a8 directory. When such code is
needed, we can put the a8-specific code and Makefiles in
arch/arm/cpu/cortex/a8 and use $SUBCPU to reference it from the
arch/arm/cpu/cortex Makefiles.
Acked-by: Michael Brandt <michael.brandt at stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent at stericsson.com>
---
Makefile | 20 ++++++++++----------
arch/arm/cpu/{arm_cortexa8 => cortex}/Makefile | 0
.../cpu/{arm_cortexa8 => cortex/a8}/mx51/Makefile | 0
.../cpu/{arm_cortexa8 => cortex/a8}/mx51/clock.c | 0
.../cpu/{arm_cortexa8 => cortex/a8}/mx51/iomux.c | 0
.../a8}/mx51/lowlevel_init.S | 0
.../arm/cpu/{arm_cortexa8 => cortex/a8}/mx51/soc.c | 0
.../cpu/{arm_cortexa8 => cortex/a8}/mx51/speed.c | 0
.../cpu/{arm_cortexa8 => cortex/a8}/mx51/timer.c | 0
.../{arm_cortexa8 => cortex/a8}/mx51/u-boot.lds | 2 +-
.../cpu/{arm_cortexa8 => cortex/a8}/omap3/Makefile | 0
.../cpu/{arm_cortexa8 => cortex/a8}/omap3/board.c | 0
.../cpu/{arm_cortexa8 => cortex/a8}/omap3/cache.S | 0
.../cpu/{arm_cortexa8 => cortex/a8}/omap3/clock.c | 0
.../cpu/{arm_cortexa8 => cortex/a8}/omap3/gpio.c | 0
.../a8}/omap3/lowlevel_init.S | 0
.../cpu/{arm_cortexa8 => cortex/a8}/omap3/mem.c | 0
.../cpu/{arm_cortexa8 => cortex/a8}/omap3/reset.S | 0
.../{arm_cortexa8 => cortex/a8}/omap3/sys_info.c | 0
.../cpu/{arm_cortexa8 => cortex/a8}/omap3/syslib.c | 0
.../cpu/{arm_cortexa8 => cortex/a8}/omap3/timer.c | 0
.../{arm_cortexa8 => cortex/a8}/s5pc1xx/Makefile | 0
.../{arm_cortexa8 => cortex/a8}/s5pc1xx/cache.S | 2 +-
.../{arm_cortexa8 => cortex/a8}/s5pc1xx/clock.c | 0
.../{arm_cortexa8 => cortex/a8}/s5pc1xx/cpu_info.c | 0
.../cpu/{arm_cortexa8 => cortex/a8}/s5pc1xx/gpio.c | 0
.../{arm_cortexa8 => cortex/a8}/s5pc1xx/reset.S | 0
.../{arm_cortexa8 => cortex/a8}/s5pc1xx/sromc.c | 0
.../{arm_cortexa8 => cortex/a8}/s5pc1xx/timer.c | 0
arch/arm/cpu/{arm_cortexa8 => cortex}/config.mk | 0
arch/arm/cpu/{arm_cortexa8 => cortex}/cpu.c | 0
arch/arm/cpu/{arm_cortexa8 => cortex}/start.S | 0
arch/arm/cpu/{arm_cortexa8 => cortex}/u-boot.lds | 2 +-
arch/arm/include/asm/arch-mx51/asm-offsets.h | 2 +-
board/logicpd/zoom2/zoom2.c | 2 +-
35 files changed, 15 insertions(+), 15 deletions(-)
rename arch/arm/cpu/{arm_cortexa8 => cortex}/Makefile (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/mx51/Makefile (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/mx51/clock.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/mx51/iomux.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/mx51/lowlevel_init.S (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/mx51/soc.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/mx51/speed.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/mx51/timer.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/mx51/u-boot.lds (97%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/Makefile (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/board.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/cache.S (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/clock.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/gpio.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/lowlevel_init.S (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/mem.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/reset.S (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/sys_info.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/syslib.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/omap3/timer.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/s5pc1xx/Makefile (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/s5pc1xx/cache.S (98%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/s5pc1xx/clock.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/s5pc1xx/cpu_info.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/s5pc1xx/gpio.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/s5pc1xx/reset.S (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/s5pc1xx/sromc.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex/a8}/s5pc1xx/timer.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex}/config.mk (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex}/cpu.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex}/start.S (100%)
rename arch/arm/cpu/{arm_cortexa8 => cortex}/u-boot.lds (97%)
diff --git a/Makefile b/Makefile
index ca0dffb..b945eba 100644
--- a/Makefile
+++ b/Makefile
@@ -3150,31 +3150,31 @@ SMN42_config : unconfig
#########################################################################
devkit8000_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 devkit8000 timll omap3
+ @$(MKCONFIG) $(@:_config=) arm cortex/a8 devkit8000 timll omap3
omap3_beagle_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle ti omap3
+ @$(MKCONFIG) $(@:_config=) arm cortex/a8 beagle ti omap3
omap3_overo_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo NULL omap3
+ @$(MKCONFIG) $(@:_config=) arm cortex/a8 overo NULL omap3
omap3_evm_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm ti omap3
+ @$(MKCONFIG) $(@:_config=) arm cortex/a8 evm ti omap3
omap3_pandora_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora NULL omap3
+ @$(MKCONFIG) $(@:_config=) arm cortex/a8 pandora NULL omap3
omap3_sdp3430_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 sdp3430 ti omap3
+ @$(MKCONFIG) $(@:_config=) arm cortex/a8 sdp3430 ti omap3
omap3_zoom1_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 logicpd omap3
+ @$(MKCONFIG) $(@:_config=) arm cortex/a8 zoom1 logicpd omap3
omap3_zoom2_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3
+ @$(MKCONFIG) $(@:_config=) arm cortex/a8 zoom2 logicpd omap3
smdkc100_config: unconfig
- @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx
+ @$(MKCONFIG) $(@:_config=) arm cortex/a8 smdkc100 samsung s5pc1xx
#########################################################################
## XScale Systems
@@ -3293,7 +3293,7 @@ mx31pdk_nand_config : unconfig
@$(MKCONFIG) -a mx31pdk arm arm1136 mx31pdk freescale mx31
mx51evk_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 mx51evk freescale mx51
+ @$(MKCONFIG) $(@:_config=) arm cortex/a8 mx51evk freescale mx51
omap2420h4_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 ti omap24xx
diff --git a/arch/arm/cpu/arm_cortexa8/Makefile b/arch/arm/cpu/cortex/Makefile
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/Makefile
rename to arch/arm/cpu/cortex/Makefile
diff --git a/arch/arm/cpu/arm_cortexa8/mx51/Makefile b/arch/arm/cpu/cortex/a8/mx51/Makefile
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/mx51/Makefile
rename to arch/arm/cpu/cortex/a8/mx51/Makefile
diff --git a/arch/arm/cpu/arm_cortexa8/mx51/clock.c b/arch/arm/cpu/cortex/a8/mx51/clock.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/mx51/clock.c
rename to arch/arm/cpu/cortex/a8/mx51/clock.c
diff --git a/arch/arm/cpu/arm_cortexa8/mx51/iomux.c b/arch/arm/cpu/cortex/a8/mx51/iomux.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/mx51/iomux.c
rename to arch/arm/cpu/cortex/a8/mx51/iomux.c
diff --git a/arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S b/arch/arm/cpu/cortex/a8/mx51/lowlevel_init.S
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S
rename to arch/arm/cpu/cortex/a8/mx51/lowlevel_init.S
diff --git a/arch/arm/cpu/arm_cortexa8/mx51/soc.c b/arch/arm/cpu/cortex/a8/mx51/soc.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/mx51/soc.c
rename to arch/arm/cpu/cortex/a8/mx51/soc.c
diff --git a/arch/arm/cpu/arm_cortexa8/mx51/speed.c b/arch/arm/cpu/cortex/a8/mx51/speed.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/mx51/speed.c
rename to arch/arm/cpu/cortex/a8/mx51/speed.c
diff --git a/arch/arm/cpu/arm_cortexa8/mx51/timer.c b/arch/arm/cpu/cortex/a8/mx51/timer.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/mx51/timer.c
rename to arch/arm/cpu/cortex/a8/mx51/timer.c
diff --git a/arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds b/arch/arm/cpu/cortex/a8/mx51/u-boot.lds
similarity index 97%
rename from arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds
rename to arch/arm/cpu/cortex/a8/mx51/u-boot.lds
index 2953b93..65287fc 100644
--- a/arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds
+++ b/arch/arm/cpu/cortex/a8/mx51/u-boot.lds
@@ -36,7 +36,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- arch/arm/cpu/arm_cortexa8/start.o
+ arch/arm/cpu/cortex/start.o
*(.text)
}
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/Makefile b/arch/arm/cpu/cortex/a8/omap3/Makefile
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/Makefile
rename to arch/arm/cpu/cortex/a8/omap3/Makefile
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/board.c b/arch/arm/cpu/cortex/a8/omap3/board.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/board.c
rename to arch/arm/cpu/cortex/a8/omap3/board.c
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/cache.S b/arch/arm/cpu/cortex/a8/omap3/cache.S
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/cache.S
rename to arch/arm/cpu/cortex/a8/omap3/cache.S
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/clock.c b/arch/arm/cpu/cortex/a8/omap3/clock.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/clock.c
rename to arch/arm/cpu/cortex/a8/omap3/clock.c
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/gpio.c b/arch/arm/cpu/cortex/a8/omap3/gpio.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/gpio.c
rename to arch/arm/cpu/cortex/a8/omap3/gpio.c
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S b/arch/arm/cpu/cortex/a8/omap3/lowlevel_init.S
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S
rename to arch/arm/cpu/cortex/a8/omap3/lowlevel_init.S
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/mem.c b/arch/arm/cpu/cortex/a8/omap3/mem.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/mem.c
rename to arch/arm/cpu/cortex/a8/omap3/mem.c
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/reset.S b/arch/arm/cpu/cortex/a8/omap3/reset.S
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/reset.S
rename to arch/arm/cpu/cortex/a8/omap3/reset.S
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/sys_info.c b/arch/arm/cpu/cortex/a8/omap3/sys_info.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/sys_info.c
rename to arch/arm/cpu/cortex/a8/omap3/sys_info.c
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/syslib.c b/arch/arm/cpu/cortex/a8/omap3/syslib.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/syslib.c
rename to arch/arm/cpu/cortex/a8/omap3/syslib.c
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/timer.c b/arch/arm/cpu/cortex/a8/omap3/timer.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/omap3/timer.c
rename to arch/arm/cpu/cortex/a8/omap3/timer.c
diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile b/arch/arm/cpu/cortex/a8/s5pc1xx/Makefile
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile
rename to arch/arm/cpu/cortex/a8/s5pc1xx/Makefile
diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S b/arch/arm/cpu/cortex/a8/s5pc1xx/cache.S
similarity index 98%
rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S
rename to arch/arm/cpu/cortex/a8/s5pc1xx/cache.S
index 906118d..c6106ad 100644
--- a/arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S
+++ b/arch/arm/cpu/cortex/a8/s5pc1xx/cache.S
@@ -2,7 +2,7 @@
* Copyright (C) 2009 Samsung Electronics
* Minkyu Kang <mk7.kang at samsung.com>
*
- * based on arch/arm/cpu/arm_cortexa8/omap3/cache.S
+ * based on arch/arm/cpu/cortex/a8/omap3/cache.S
*
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c b/arch/arm/cpu/cortex/a8/s5pc1xx/clock.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c
rename to arch/arm/cpu/cortex/a8/s5pc1xx/clock.c
diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c b/arch/arm/cpu/cortex/a8/s5pc1xx/cpu_info.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c
rename to arch/arm/cpu/cortex/a8/s5pc1xx/cpu_info.c
diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c b/arch/arm/cpu/cortex/a8/s5pc1xx/gpio.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c
rename to arch/arm/cpu/cortex/a8/s5pc1xx/gpio.c
diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S b/arch/arm/cpu/cortex/a8/s5pc1xx/reset.S
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S
rename to arch/arm/cpu/cortex/a8/s5pc1xx/reset.S
diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c b/arch/arm/cpu/cortex/a8/s5pc1xx/sromc.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c
rename to arch/arm/cpu/cortex/a8/s5pc1xx/sromc.c
diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c b/arch/arm/cpu/cortex/a8/s5pc1xx/timer.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c
rename to arch/arm/cpu/cortex/a8/s5pc1xx/timer.c
diff --git a/arch/arm/cpu/arm_cortexa8/config.mk b/arch/arm/cpu/cortex/config.mk
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/config.mk
rename to arch/arm/cpu/cortex/config.mk
diff --git a/arch/arm/cpu/arm_cortexa8/cpu.c b/arch/arm/cpu/cortex/cpu.c
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/cpu.c
rename to arch/arm/cpu/cortex/cpu.c
diff --git a/arch/arm/cpu/arm_cortexa8/start.S b/arch/arm/cpu/cortex/start.S
similarity index 100%
rename from arch/arm/cpu/arm_cortexa8/start.S
rename to arch/arm/cpu/cortex/start.S
diff --git a/arch/arm/cpu/arm_cortexa8/u-boot.lds b/arch/arm/cpu/cortex/u-boot.lds
similarity index 97%
rename from arch/arm/cpu/arm_cortexa8/u-boot.lds
rename to arch/arm/cpu/cortex/u-boot.lds
index 820e3a1..439852d 100644
--- a/arch/arm/cpu/arm_cortexa8/u-boot.lds
+++ b/arch/arm/cpu/cortex/u-boot.lds
@@ -34,7 +34,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- arch/arm/cpu/arm_cortexa8/start.o (.text)
+ arch/arm/cpu/cortex/start.o (.text)
*(.text)
}
diff --git a/arch/arm/include/asm/arch-mx51/asm-offsets.h b/arch/arm/include/asm/arch-mx51/asm-offsets.h
index fbba412..d0c2fab 100644
--- a/arch/arm/include/asm/arch-mx51/asm-offsets.h
+++ b/arch/arm/include/asm/arch-mx51/asm-offsets.h
@@ -1,5 +1,5 @@
/*
- * needed for arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S
+ * needed for arch/arm/cpu/cortex/a8/mx51/lowlevel_init.S
*
* These should be auto-generated
*/
diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c
index 6455d1d..c2c99ea 100644
--- a/board/logicpd/zoom2/zoom2.c
+++ b/board/logicpd/zoom2/zoom2.c
@@ -46,7 +46,7 @@
/*
* This the the zoom2, board specific, gpmc configuration for the
* quad uart on the debug board. The more general gpmc configurations
- * are setup at the cpu level in arch/arm/cpu/arm_cortexa8/omap3/mem.c
+ * are setup at the cpu level in arch/arm/cpu/cortex/a8/omap3/mem.c
*
* The details of the setting of the serial gpmc setup are not available.
* The values were provided by another party.
--
1.7.0
More information about the U-Boot
mailing list