ARM: Rename arch/arm/cpu/arm_cortexa8 to armv7
authorSteve Sakoman <steve@sakoman.com>
Fri, 18 Jun 2010 04:50:01 +0000 (21:50 -0700)
committerSandeep Paulraj <s-paulraj@ti.com>
Mon, 5 Jul 2010 23:59:55 +0000 (19:59 -0400)
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>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
49 files changed:
MAINTAINERS
MAKEALL
arch/arm/cpu/armv7/Makefile [moved from arch/arm/cpu/arm_cortexa8/Makefile with 100% similarity]
arch/arm/cpu/armv7/config.mk [moved from arch/arm/cpu/arm_cortexa8/config.mk with 100% similarity]
arch/arm/cpu/armv7/cpu.c [moved from arch/arm/cpu/arm_cortexa8/cpu.c with 100% similarity]
arch/arm/cpu/armv7/mx51/Makefile [moved from arch/arm/cpu/arm_cortexa8/mx51/Makefile with 100% similarity]
arch/arm/cpu/armv7/mx51/clock.c [moved from arch/arm/cpu/arm_cortexa8/mx51/clock.c with 100% similarity]
arch/arm/cpu/armv7/mx51/iomux.c [moved from arch/arm/cpu/arm_cortexa8/mx51/iomux.c with 100% similarity]
arch/arm/cpu/armv7/mx51/lowlevel_init.S [moved from arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S with 100% similarity]
arch/arm/cpu/armv7/mx51/soc.c [moved from arch/arm/cpu/arm_cortexa8/mx51/soc.c with 100% similarity]
arch/arm/cpu/armv7/mx51/speed.c [moved from arch/arm/cpu/arm_cortexa8/mx51/speed.c with 100% similarity]
arch/arm/cpu/armv7/mx51/timer.c [moved from arch/arm/cpu/arm_cortexa8/mx51/timer.c with 100% similarity]
arch/arm/cpu/armv7/mx51/u-boot.lds [moved from arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds with 97% similarity]
arch/arm/cpu/armv7/omap3/Makefile [moved from arch/arm/cpu/arm_cortexa8/omap3/Makefile with 100% similarity]
arch/arm/cpu/armv7/omap3/board.c [moved from arch/arm/cpu/arm_cortexa8/omap3/board.c with 100% similarity]
arch/arm/cpu/armv7/omap3/cache.S [moved from arch/arm/cpu/arm_cortexa8/omap3/cache.S with 100% similarity]
arch/arm/cpu/armv7/omap3/clock.c [moved from arch/arm/cpu/arm_cortexa8/omap3/clock.c with 100% similarity]
arch/arm/cpu/armv7/omap3/emif4.c [moved from arch/arm/cpu/arm_cortexa8/omap3/emif4.c with 100% similarity]
arch/arm/cpu/armv7/omap3/gpio.c [moved from arch/arm/cpu/arm_cortexa8/omap3/gpio.c with 100% similarity]
arch/arm/cpu/armv7/omap3/lowlevel_init.S [moved from arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S with 100% similarity]
arch/arm/cpu/armv7/omap3/mem.c [moved from arch/arm/cpu/arm_cortexa8/omap3/mem.c with 100% similarity]
arch/arm/cpu/armv7/omap3/reset.S [moved from arch/arm/cpu/arm_cortexa8/omap3/reset.S with 100% similarity]
arch/arm/cpu/armv7/omap3/sdrc.c [moved from arch/arm/cpu/arm_cortexa8/omap3/sdrc.c with 100% similarity]
arch/arm/cpu/armv7/omap3/sys_info.c [moved from arch/arm/cpu/arm_cortexa8/omap3/sys_info.c with 100% similarity]
arch/arm/cpu/armv7/omap3/syslib.c [moved from arch/arm/cpu/arm_cortexa8/omap3/syslib.c with 100% similarity]
arch/arm/cpu/armv7/omap3/timer.c [moved from arch/arm/cpu/arm_cortexa8/omap3/timer.c with 100% similarity]
arch/arm/cpu/armv7/s5pc1xx/Makefile [moved from arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile with 100% similarity]
arch/arm/cpu/armv7/s5pc1xx/cache.S [moved from arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S with 98% similarity]
arch/arm/cpu/armv7/s5pc1xx/clock.c [moved from arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c with 100% similarity]
arch/arm/cpu/armv7/s5pc1xx/cpu_info.c [moved from arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c with 100% similarity]
arch/arm/cpu/armv7/s5pc1xx/reset.S [moved from arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S with 100% similarity]
arch/arm/cpu/armv7/s5pc1xx/sromc.c [moved from arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c with 100% similarity]
arch/arm/cpu/armv7/s5pc1xx/timer.c [moved from arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c with 100% similarity]
arch/arm/cpu/armv7/start.S [moved from arch/arm/cpu/arm_cortexa8/start.S with 100% similarity]
arch/arm/cpu/armv7/u-boot.lds [moved from arch/arm/cpu/arm_cortexa8/u-boot.lds with 97% similarity]
arch/arm/include/asm/arch-mx51/asm-offsets.h
board/logicpd/zoom2/zoom2.c
boards.cfg
include/configs/am3517_evm.h
include/configs/devkit8000.h
include/configs/omap3_beagle.h
include/configs/omap3_evm.h
include/configs/omap3_overo.h
include/configs/omap3_pandora.h
include/configs/omap3_sdp3430.h
include/configs/omap3_zoom1.h
include/configs/omap3_zoom2.h
include/configs/s5p_goni.h
include/configs/smdkc100.h

index 9485070..381d681 100644 (file)
@@ -550,7 +550,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>
 
@@ -616,11 +616,11 @@ Kshitij Gupta <kshitij@ti.com>
 
 Vaibhav Hiremath <hvaibhav@ti.com>
 
-       am3517_evm      ARM CORTEX-A8 (AM35x SoC)
+       am3517_evm      ARM ARMV7 (AM35x SoC)
 
 Grazvydas Ignotas <notasas@gmail.com>
 
-       omap3_pandora   ARM CORTEX-A8 (OMAP3xx SoC)
+       omap3_pandora   ARM ARMV7 (OMAP3xx SoC)
 
 Gary Jennejohn <garyj@denx.de>
 
@@ -650,12 +650,12 @@ Nishant Kamat <nskamat@ti.com>
 
 Minkyu Kang <mk7.kang@samsung.com>
 
-       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 <frederik@kriewitz.eu>
 
-       devkit8000      ARM CORTEX-A8 (OMAP3530 SoC)
+       devkit8000      ARM ARMV7 (OMAP3530 SoC)
 
 Sergey Kubushyn <ksi@koi8.net>
 
@@ -680,8 +680,8 @@ Sergey Lapin <slapin@ossfans.org>
 
 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>
 
@@ -719,7 +719,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>
 
@@ -731,7 +731,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>
 
@@ -750,7 +750,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 4637390..78cffe3 100755 (executable)
--- 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 \
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 (file)
@@ -36,7 +36,7 @@ SECTIONS
        . = ALIGN(4);
        .text      :
        {
-         arch/arm/cpu/arm_cortexa8/start.o
+         arch/arm/cpu/armv7/start.o
          *(.text)
        }
 
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 (file)
@@ -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.
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 (file)
@@ -34,7 +34,7 @@ SECTIONS
        . = ALIGN(4);
        .text   :
        {
-               arch/arm/cpu/arm_cortexa8/start.o       (.text)
+               arch/arm/cpu/armv7/start.o      (.text)
                *(.text)
        }
 
index fbba412..afd2728 100644 (file)
@@ -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
  */
index 6455d1d..e9f6625 100644 (file)
@@ -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.
index da31c36..b0af1d5 100644 (file)
@@ -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
index 513d005..10af21b 100644 (file)
@@ -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 */
index 1076de6..2815771 100644 (file)
@@ -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 */
index e018b21..ae5a791 100644 (file)
@@ -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 */
index af7c65a..c4aa220 100644 (file)
@@ -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 */
index b441831..3a3b389 100644 (file)
@@ -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 */
index 9eba003..3308ace 100644 (file)
@@ -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 */
index d4482d3..5439aa3 100644 (file)
@@ -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 */
index 1e88dc0..f612e0f 100644 (file)
@@ -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 */
index be9daf4..aaf929e 100644 (file)
@@ -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 */
index 171ec94..ff0dbd3 100644 (file)
@@ -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 */
index 09bce6d..76a47c4 100644 (file)
@@ -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 */