The purpose of this patch is to prepare for adding the OMAP4 architecture, which is Cortex A9
Cortex A8 and A9 both belong to the armv7 architecture, hence the name change.
The two architectures are similar enough that substantial code can be shared.
Signed-off-by: Aneesh V aneesh@ti.com Signed-off-by: Steve Sakoman steve@sakoman.com --- MAINTAINERS | 18 ++++++++-------- MAKEALL | 8 +++--- Makefile | 22 ++++++++++---------- arch/arm/cpu/{arm_cortexa8 => armv7}/Makefile | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/config.mk | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/cpu.c | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/Makefile | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/clock.c | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/iomux.c | 0 .../{arm_cortexa8 => armv7}/mx51/lowlevel_init.S | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/soc.c | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/speed.c | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/timer.c | 0 .../cpu/{arm_cortexa8 => armv7}/mx51/u-boot.lds | 2 +- .../arm/cpu/{arm_cortexa8 => armv7}/omap3/Makefile | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/board.c | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/cache.S | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/clock.c | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/gpio.c | 0 .../{arm_cortexa8 => armv7}/omap3/lowlevel_init.S | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/mem.c | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/reset.S | 0 .../cpu/{arm_cortexa8 => armv7}/omap3/sys_info.c | 0 .../arm/cpu/{arm_cortexa8 => armv7}/omap3/syslib.c | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/timer.c | 0 .../cpu/{arm_cortexa8 => armv7}/s5pc1xx/Makefile | 0 .../cpu/{arm_cortexa8 => armv7}/s5pc1xx/cache.S | 2 +- .../cpu/{arm_cortexa8 => armv7}/s5pc1xx/clock.c | 0 .../cpu/{arm_cortexa8 => armv7}/s5pc1xx/cpu_info.c | 0 .../cpu/{arm_cortexa8 => armv7}/s5pc1xx/reset.S | 0 .../cpu/{arm_cortexa8 => armv7}/s5pc1xx/sromc.c | 0 .../cpu/{arm_cortexa8 => armv7}/s5pc1xx/timer.c | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/start.S | 0 arch/arm/cpu/{arm_cortexa8 => armv7}/u-boot.lds | 2 +- arch/arm/include/asm/arch-mx51/asm-offsets.h | 2 +- board/logicpd/zoom2/zoom2.c | 2 +- include/configs/devkit8000.h | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/omap3_overo.h | 2 +- include/configs/omap3_pandora.h | 2 +- include/configs/omap3_sdp3430.h | 2 +- include/configs/omap3_zoom1.h | 2 +- include/configs/omap3_zoom2.h | 2 +- include/configs/smdkc100.h | 2 +- 45 files changed, 38 insertions(+), 38 deletions(-) rename arch/arm/cpu/{arm_cortexa8 => armv7}/Makefile (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/config.mk (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/cpu.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/Makefile (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/clock.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/iomux.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/lowlevel_init.S (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/soc.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/speed.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/timer.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/u-boot.lds (97%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/Makefile (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/board.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/cache.S (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/clock.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/gpio.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/lowlevel_init.S (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/mem.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/reset.S (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/sys_info.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/syslib.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/timer.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/Makefile (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/cache.S (98%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/clock.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/cpu_info.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/reset.S (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/sromc.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/timer.c (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/start.S (100%) rename arch/arm/cpu/{arm_cortexa8 => armv7}/u-boot.lds (97%)
diff --git a/MAINTAINERS b/MAINTAINERS index 7a13d28..b9c6af2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -536,7 +536,7 @@ Stefano Babic sbabic@denx.de
Dirk Behme dirk.behme@gmail.com
- omap3_beagle ARM CORTEX-A8 (OMAP3530 SoC) + omap3_beagle ARM ARMV7 (OMAP3530 SoC)
Eric Benard eric@eukrea.com
@@ -602,7 +602,7 @@ Kshitij Gupta kshitij@ti.com
Grazvydas Ignotas notasas@gmail.com
- omap3_pandora ARM CORTEX-A8 (OMAP3xx SoC) + omap3_pandora ARM ARMV7 (OMAP3xx SoC)
Gary Jennejohn garyj@denx.de
@@ -628,7 +628,7 @@ Simon Kagstrom simon.kagstrom@netinsight.net
Minkyu Kang mk7.kang@samsung.com
- SMDKC100 ARM CORTEX-A8 (S5PC100 SoC) + SMDKC100 ARM ARMV7 (S5PC100 SoC)
Nishant Kamat nskamat@ti.com
@@ -636,7 +636,7 @@ Nishant Kamat nskamat@ti.com
Frederik Kriewitz frederik@kriewitz.eu
- devkit8000 ARM CORTEX-A8 (OMAP3530 SoC) + devkit8000 ARM ARMV7 (OMAP3530 SoC)
Sergey Kubushyn ksi@koi8.net
@@ -667,8 +667,8 @@ Guennadi Liakhovetski g.liakhovetski@gmx.de
Nishanth Menon nm@ti.com
- omap3_sdp3430 ARM CORTEX-A8 (OMAP3xx SoC) - omap3_zoom1 ARM CORTEX-A8 (OMAP3xx SoC) + omap3_sdp3430 ARM ARMV7 (OMAP3xx SoC) + omap3_zoom1 ARM ARMV7 (OMAP3xx SoC)
David Müller d.mueller@elsoft.ch
@@ -706,7 +706,7 @@ Dave Peverley dpeverley@mpc-data.co.uk
Manikandan Pillai mani.pillai@ti.com
- omap3_evm ARM CORTEX-A8 (OMAP3xx SoC) + omap3_evm ARM ARMV7 (OMAP3xx SoC)
Stelian Pop stelian.pop@leadtechdesign.com
@@ -718,7 +718,7 @@ Stelian Pop stelian.pop@leadtechdesign.com
Tom Rix Tom.Rix@windriver.com
- omap3_zoom2 ARM CORTEX-A8 (OMAP3xx SoC) + omap3_zoom2 ARM ARMV7 (OMAP3xx SoC)
John Rigby jcrigby@gmail.com
@@ -737,7 +737,7 @@ Nomadik Linux Team STN_WMM_nomadik_linux@list.st.com
Steve Sakoman sakoman@gmail.com
- omap3_overo ARM CORTEX-A8 (OMAP3xx SoC) + omap3_overo ARM ARMV7 (OMAP3xx SoC)
Jens Scharsig esw@bus-elektronik.de
diff --git a/MAKEALL b/MAKEALL index 2527352..1ebcb65 100755 --- a/MAKEALL +++ b/MAKEALL @@ -638,9 +638,9 @@ LIST_ARM11=" \ "
######################################################################### -## ARM Cortex-A8 Systems +## ARMV7 Systems ######################################################################### -LIST_ARM_CORTEX_A8=" \ +LIST_ARMV7=" \ devkit8000 \ mx51evk \ omap3_beagle \ @@ -730,7 +730,7 @@ LIST_arm=" \ ${LIST_ARM9} \ ${LIST_ARM10} \ ${LIST_ARM11} \ - ${LIST_ARM_CORTEX_A8} \ + ${LIST_ARMV7} \ ${LIST_at91} \ ${LIST_pxa} \ ${LIST_ixp} \ @@ -996,7 +996,7 @@ print_stats() { for arg in $@ do case "$arg" in - arm|SA|ARM7|ARM9|ARM10|ARM11|ARM_CORTEX_A8|at91|ixp|pxa \ + arm|SA|ARM7|ARM9|ARM10|ARM11|ARMV7|at91|ixp|pxa \ |avr32 \ |blackfin \ |coldfire \ diff --git a/Makefile b/Makefile index c26e491..4006b75 100644 --- a/Makefile +++ b/Makefile @@ -3152,35 +3152,35 @@ SMN42_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm720t SMN42 siemens lpc2292
######################################################################### -## ARM CORTEX Systems +## ARMV7 Systems #########################################################################
devkit8000_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 devkit8000 timll omap3 + @$(MKCONFIG) $(@:_config=) arm armv7 devkit8000 timll omap3
omap3_beagle_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle ti omap3 + @$(MKCONFIG) $(@:_config=) arm armv7 beagle ti omap3
omap3_overo_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo NULL omap3 + @$(MKCONFIG) $(@:_config=) arm armv7 overo NULL omap3
omap3_evm_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm ti omap3 + @$(MKCONFIG) $(@:_config=) arm armv7 evm ti omap3
omap3_pandora_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora NULL omap3 + @$(MKCONFIG) $(@:_config=) arm armv7 pandora NULL omap3
omap3_sdp3430_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 sdp3430 ti omap3 + @$(MKCONFIG) $(@:_config=) arm armv7 sdp3430 ti omap3
omap3_zoom1_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 logicpd omap3 + @$(MKCONFIG) $(@:_config=) arm armv7 zoom1 logicpd omap3
omap3_zoom2_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3 + @$(MKCONFIG) $(@:_config=) arm armv7 zoom2 logicpd omap3
smdkc100_config: unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx + @$(MKCONFIG) $(@:_config=) arm armv7 smdkc100 samsung s5pc1xx
######################################################################### ## XScale Systems @@ -3299,7 +3299,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 armv7 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/armv7/Makefile similarity index 100% rename from arch/arm/cpu/arm_cortexa8/Makefile rename to arch/arm/cpu/armv7/Makefile diff --git a/arch/arm/cpu/arm_cortexa8/config.mk b/arch/arm/cpu/armv7/config.mk similarity index 100% rename from arch/arm/cpu/arm_cortexa8/config.mk rename to arch/arm/cpu/armv7/config.mk diff --git a/arch/arm/cpu/arm_cortexa8/cpu.c b/arch/arm/cpu/armv7/cpu.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/cpu.c rename to arch/arm/cpu/armv7/cpu.c diff --git a/arch/arm/cpu/arm_cortexa8/mx51/Makefile b/arch/arm/cpu/armv7/mx51/Makefile similarity index 100% rename from arch/arm/cpu/arm_cortexa8/mx51/Makefile rename to arch/arm/cpu/armv7/mx51/Makefile diff --git a/arch/arm/cpu/arm_cortexa8/mx51/clock.c b/arch/arm/cpu/armv7/mx51/clock.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/mx51/clock.c rename to arch/arm/cpu/armv7/mx51/clock.c diff --git a/arch/arm/cpu/arm_cortexa8/mx51/iomux.c b/arch/arm/cpu/armv7/mx51/iomux.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/mx51/iomux.c rename to arch/arm/cpu/armv7/mx51/iomux.c diff --git a/arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S b/arch/arm/cpu/armv7/mx51/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S rename to arch/arm/cpu/armv7/mx51/lowlevel_init.S diff --git a/arch/arm/cpu/arm_cortexa8/mx51/soc.c b/arch/arm/cpu/armv7/mx51/soc.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/mx51/soc.c rename to arch/arm/cpu/armv7/mx51/soc.c diff --git a/arch/arm/cpu/arm_cortexa8/mx51/speed.c b/arch/arm/cpu/armv7/mx51/speed.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/mx51/speed.c rename to arch/arm/cpu/armv7/mx51/speed.c diff --git a/arch/arm/cpu/arm_cortexa8/mx51/timer.c b/arch/arm/cpu/armv7/mx51/timer.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/mx51/timer.c rename to arch/arm/cpu/armv7/mx51/timer.c diff --git a/arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds b/arch/arm/cpu/armv7/mx51/u-boot.lds similarity index 97% rename from arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds rename to arch/arm/cpu/armv7/mx51/u-boot.lds index 2953b93..d66434c 100644 --- a/arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds +++ b/arch/arm/cpu/armv7/mx51/u-boot.lds @@ -36,7 +36,7 @@ SECTIONS . = ALIGN(4); .text : { - arch/arm/cpu/arm_cortexa8/start.o + arch/arm/cpu/armv7/start.o *(.text) }
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/Makefile b/arch/arm/cpu/armv7/omap3/Makefile similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/Makefile rename to arch/arm/cpu/armv7/omap3/Makefile diff --git a/arch/arm/cpu/arm_cortexa8/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/board.c rename to arch/arm/cpu/armv7/omap3/board.c diff --git a/arch/arm/cpu/arm_cortexa8/omap3/cache.S b/arch/arm/cpu/armv7/omap3/cache.S similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/cache.S rename to arch/arm/cpu/armv7/omap3/cache.S diff --git a/arch/arm/cpu/arm_cortexa8/omap3/clock.c b/arch/arm/cpu/armv7/omap3/clock.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/clock.c rename to arch/arm/cpu/armv7/omap3/clock.c diff --git a/arch/arm/cpu/arm_cortexa8/omap3/gpio.c b/arch/arm/cpu/armv7/omap3/gpio.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/gpio.c rename to arch/arm/cpu/armv7/omap3/gpio.c diff --git a/arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S b/arch/arm/cpu/armv7/omap3/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S rename to arch/arm/cpu/armv7/omap3/lowlevel_init.S diff --git a/arch/arm/cpu/arm_cortexa8/omap3/mem.c b/arch/arm/cpu/armv7/omap3/mem.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/mem.c rename to arch/arm/cpu/armv7/omap3/mem.c diff --git a/arch/arm/cpu/arm_cortexa8/omap3/reset.S b/arch/arm/cpu/armv7/omap3/reset.S similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/reset.S rename to arch/arm/cpu/armv7/omap3/reset.S diff --git a/arch/arm/cpu/arm_cortexa8/omap3/sys_info.c b/arch/arm/cpu/armv7/omap3/sys_info.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/sys_info.c rename to arch/arm/cpu/armv7/omap3/sys_info.c diff --git a/arch/arm/cpu/arm_cortexa8/omap3/syslib.c b/arch/arm/cpu/armv7/omap3/syslib.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/syslib.c rename to arch/arm/cpu/armv7/omap3/syslib.c diff --git a/arch/arm/cpu/arm_cortexa8/omap3/timer.c b/arch/arm/cpu/armv7/omap3/timer.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/timer.c rename to arch/arm/cpu/armv7/omap3/timer.c diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile b/arch/arm/cpu/armv7/s5pc1xx/Makefile similarity index 100% rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile rename to arch/arm/cpu/armv7/s5pc1xx/Makefile diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S b/arch/arm/cpu/armv7/s5pc1xx/cache.S similarity index 98% rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S rename to arch/arm/cpu/armv7/s5pc1xx/cache.S index 906118d..7734b32 100644 --- a/arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S +++ b/arch/arm/cpu/armv7/s5pc1xx/cache.S @@ -2,7 +2,7 @@ * Copyright (C) 2009 Samsung Electronics * Minkyu Kang mk7.kang@samsung.com * - * based on arch/arm/cpu/arm_cortexa8/omap3/cache.S + * based on arch/arm/cpu/armv7/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/armv7/s5pc1xx/clock.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c rename to arch/arm/cpu/armv7/s5pc1xx/clock.c diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c b/arch/arm/cpu/armv7/s5pc1xx/cpu_info.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c rename to arch/arm/cpu/armv7/s5pc1xx/cpu_info.c diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S b/arch/arm/cpu/armv7/s5pc1xx/reset.S similarity index 100% rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S rename to arch/arm/cpu/armv7/s5pc1xx/reset.S diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c b/arch/arm/cpu/armv7/s5pc1xx/sromc.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c rename to arch/arm/cpu/armv7/s5pc1xx/sromc.c diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c b/arch/arm/cpu/armv7/s5pc1xx/timer.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c rename to arch/arm/cpu/armv7/s5pc1xx/timer.c diff --git a/arch/arm/cpu/arm_cortexa8/start.S b/arch/arm/cpu/armv7/start.S similarity index 100% rename from arch/arm/cpu/arm_cortexa8/start.S rename to arch/arm/cpu/armv7/start.S diff --git a/arch/arm/cpu/arm_cortexa8/u-boot.lds b/arch/arm/cpu/armv7/u-boot.lds similarity index 97% rename from arch/arm/cpu/arm_cortexa8/u-boot.lds rename to arch/arm/cpu/armv7/u-boot.lds index 820e3a1..9e5b5a9 100644 --- a/arch/arm/cpu/arm_cortexa8/u-boot.lds +++ b/arch/arm/cpu/armv7/u-boot.lds @@ -34,7 +34,7 @@ SECTIONS . = ALIGN(4); .text : { - arch/arm/cpu/arm_cortexa8/start.o (.text) + arch/arm/cpu/armv7/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..afd2728 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/armv7/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..e9f6625 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/armv7/omap3/mem.c * * The details of the setting of the serial gpmc setup are not available. * The values were provided by another party. diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 7d1332f..cfe02c8 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -32,7 +32,7 @@ #define __CONFIG_H
/* High Level Configuration Options */ -#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ +#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3430 1 /* which is in a 3430 */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 08d79ac..af6485c 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -31,7 +31,7 @@ /* * High Level Configuration Options */ -#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ +#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3430 1 /* which is in a 3430 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 0d99f7d..405dfe6 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -36,7 +36,7 @@ /* * High Level Configuration Options */ -#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ +#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3430 1 /* which is in a 3430 */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index a43500b..5c34eb7 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -23,7 +23,7 @@ /* * High Level Configuration Options */ -#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ +#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3430 1 /* which is in a 3430 */ diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 945c053..112caf2 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -26,7 +26,7 @@ /* * High Level Configuration Options */ -#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ +#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3430 1 /* which is in a 3430 */ diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index b4919db..7b1c772 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -36,7 +36,7 @@ /* * High Level Configuration Options */ -#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ +#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3430 1 /* which is in a 3430 */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index ae7ebf9..9259638 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -32,7 +32,7 @@ /* * High Level Configuration Options */ -#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ +#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3430 1 /* which is in a 3430 */ diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index c88c732..39e6429 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -33,7 +33,7 @@ /* * High Level Configuration Options */ -#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ +#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3430 1 /* which is in a 3430 */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 09bce6d..76a47c4 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -32,7 +32,7 @@ * High Level Configuration Options * (easy to change) */ -#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ +#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */ #define CONFIG_S5PC1XX 1 /* which is in a S5PC1XX Family */ #define CONFIG_S5PC100 1 /* which is in a S5PC100 */