From: Steve Sakoman Date: Fri, 18 Jun 2010 04:50:01 +0000 (-0700) Subject: ARM: Rename arch/arm/cpu/arm_cortexa8 to armv7 X-Git-Tag: v2010.09-rc1~90 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f56348af5d255f6dc2a8bcd7d798ab5edf8fba25;p=karo-tx-uboot.git ARM: Rename arch/arm/cpu/arm_cortexa8 to armv7 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 Signed-off-by: Steve Sakoman Signed-off-by: Sandeep Paulraj --- diff --git a/MAINTAINERS b/MAINTAINERS index 94850702ea..381d681a0d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -550,7 +550,7 @@ Stefano Babic Dirk Behme - omap3_beagle ARM CORTEX-A8 (OMAP3530 SoC) + omap3_beagle ARM ARMV7 (OMAP3530 SoC) Eric Benard @@ -616,11 +616,11 @@ Kshitij Gupta Vaibhav Hiremath - am3517_evm ARM CORTEX-A8 (AM35x SoC) + am3517_evm ARM ARMV7 (AM35x SoC) Grazvydas Ignotas - omap3_pandora ARM CORTEX-A8 (OMAP3xx SoC) + omap3_pandora ARM ARMV7 (OMAP3xx SoC) Gary Jennejohn @@ -650,12 +650,12 @@ Nishant Kamat Minkyu Kang - s5p_goni ARM CORTEX-A8 (S5PC110 SoC) - SMDKC100 ARM CORTEX-A8 (S5PC100 SoC) + s5p_goni ARM ARMV7 (S5PC110 SoC) + SMDKC100 ARM ARMV7 (S5PC100 SoC) Frederik Kriewitz - devkit8000 ARM CORTEX-A8 (OMAP3530 SoC) + devkit8000 ARM ARMV7 (OMAP3530 SoC) Sergey Kubushyn @@ -680,8 +680,8 @@ Sergey Lapin Nishanth Menon - 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 @@ -719,7 +719,7 @@ Dave Peverley Manikandan Pillai - omap3_evm ARM CORTEX-A8 (OMAP3xx SoC) + omap3_evm ARM ARMV7 (OMAP3xx SoC) Stelian Pop @@ -731,7 +731,7 @@ Stelian Pop Tom Rix - omap3_zoom2 ARM CORTEX-A8 (OMAP3xx SoC) + omap3_zoom2 ARM ARMV7 (OMAP3xx SoC) John Rigby @@ -750,7 +750,7 @@ Nomadik Linux Team Steve Sakoman - omap3_overo ARM CORTEX-A8 (OMAP3xx SoC) + omap3_overo ARM ARMV7 (OMAP3xx SoC) Jens Scharsig diff --git a/MAKEALL b/MAKEALL index 463739069d..78cffe3b4b 100755 --- a/MAKEALL +++ b/MAKEALL @@ -644,9 +644,9 @@ LIST_ARM11=" \ " ######################################################################### -## ARM Cortex-A8 Systems +## ARMV7 Systems ######################################################################### -LIST_ARM_CORTEX_A8=" \ +LIST_ARMV7=" \ am3517_evm \ devkit8000 \ mx51evk \ @@ -739,7 +739,7 @@ LIST_arm=" \ ${LIST_ARM9} \ ${LIST_ARM10} \ ${LIST_ARM11} \ - ${LIST_ARM_CORTEX_A8} \ + ${LIST_ARMV7} \ ${LIST_at91} \ ${LIST_pxa} \ ${LIST_ixp} \ @@ -1005,7 +1005,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/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 2953b93632..d66434c95d 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/emif4.c b/arch/arm/cpu/armv7/omap3/emif4.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/emif4.c rename to arch/arm/cpu/armv7/omap3/emif4.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/sdrc.c b/arch/arm/cpu/armv7/omap3/sdrc.c similarity index 100% rename from arch/arm/cpu/arm_cortexa8/omap3/sdrc.c rename to arch/arm/cpu/armv7/omap3/sdrc.c 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 906118d820..7734b328d7 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 * - * 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 820e3a1043..9e5b5a97d7 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 fbba412aab..afd27283af 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 6455d1dc3c..e9f6625ce0 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/boards.cfg b/boards.cfg index da31c3647e..b0af1d5e01 100644 --- a/boards.cfg +++ b/boards.cfg @@ -45,7 +45,7 @@ pm9261 arm arm926ejs - ronetix at91 pm9263 arm arm926ejs - ronetix at91 suen3 arm arm926ejs km_arm keymile kirkwood rd6281a arm arm926ejs - Marvell kirkwood -mx51evk arm arm_cortexa8 mx51evk freescale mx51 +mx51evk arm armv7 mx51evk freescale mx51 actux1 arm ixp actux2 arm ixp actux3 arm ixp @@ -255,17 +255,17 @@ imx27lite arm arm926ejs imx27lite logicpd mx27 magnesium arm arm926ejs imx27lite logicpd mx27 omap5912osk arm arm926ejs - ti omap edminiv2 arm arm926ejs - LaCie orion5x -omap3_overo arm arm_cortexa8 overo - omap3 -omap3_pandora arm arm_cortexa8 pandora - omap3 -omap3_zoom1 arm arm_cortexa8 zoom1 logicpd omap3 -omap3_zoom2 arm arm_cortexa8 zoom2 logicpd omap3 -omap3_beagle arm arm_cortexa8 beagle ti omap3 -omap3_evm arm arm_cortexa8 evm ti omap3 -omap3_sdp3430 arm arm_cortexa8 sdp3430 ti omap3 -am3517_evm arm arm_cortexa8 am3517evm logicpd omap3 -devkit8000 arm arm_cortexa8 devkit8000 timll omap3 -s5p_goni arm arm_cortexa8 goni samsung s5pc1xx -smdkc100 arm arm_cortexa8 smdkc100 samsung s5pc1xx +omap3_overo arm armv7 overo - omap3 +omap3_pandora arm armv7 pandora - omap3 +omap3_zoom1 arm armv7 zoom1 logicpd omap3 +omap3_zoom2 arm armv7 zoom2 logicpd omap3 +omap3_beagle arm armv7 beagle ti omap3 +omap3_evm arm armv7 evm ti omap3 +omap3_sdp3430 arm armv7 sdp3430 ti omap3 +am3517_evm arm armv7 am3517evm logicpd omap3 +devkit8000 arm armv7 devkit8000 timll omap3 +s5p_goni arm armv7 goni samsung s5pc1xx +smdkc100 arm armv7 smdkc100 samsung s5pc1xx ixdpg425 arm ixp lpd7a400 arm lh7a40x lpd7a40x lpd7a404 arm lh7a40x lpd7a40x diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 513d005ee4..10af21b1b8 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -28,7 +28,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_OMAP3_AM3517EVM 1 /* working with AM3517EVM */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 1076de6fcd..281577153f 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 e018b217cf..ae5a7919d8 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 af7c65ad30..c4aa220f78 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 b4418319f1..3a3b389614 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 9eba003c21..3308aceb49 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 d4482d3ae6..5439aa3dd9 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 1e88dc02e0..f612e0fd19 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 be9daf4fcd..aaf929e08e 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/s5p_goni.h b/include/configs/s5p_goni.h index 171ec94e76..ff0dbd3c21 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -28,7 +28,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_SAMSUNG 1 /* in a SAMSUNG core */ #define CONFIG_S5PC1XX 1 /* which is in a S5PC1XX Family */ #define CONFIG_S5PC110 1 /* which is in a S5PC110 */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 09bce6d0fa..76a47c4456 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 */