Delete CONFIG_ARM<CPU_NAME> and use CONFIG_CPU_<CPU_NAME>

PATCH New Masahiro Yamada 3 participants 12 messages Nov 6, 2014 – Nov 24, 2014

Subsystems (9)

Arm (32-bit) USB Arm i.MX and Layerscape Arm/Microchip (AT91) SoC support +5 more subsystems

lore

Share & tools

lore

Masahiro Yamada

author

2014-11-06 05:59 UTC #0 lore raw

cover Delete CONFIG_ARM<CPU_NAME> and use CONFIG_CPU_<CPU_NAME>

Since commit 2e07c249a67e055 (kconfig: arm: introduce symbol for ARM CPUs), every ARM board is supposed to select CONFIG_CPU_<CPU_NAME>. (CONFIG_CPU_ARM720T, CONFIG_CPU_ARM920T, CONFIG_CPU_V7, etc.)

We no longer need CONFIG_ARM920T, CONFIG_ARMV7, etc. These macros have been defined inconsistently.
For example, some ARMv7 boards define CONFIG_ARMV7 in header files, but some ARMv7 boards do not.
Macros defines based on a whim seems useless.

Going forward, let's use CONFIG_CPU_*.

I built all the ARM boards and compared MD5SUM.
I confirmed all the checksum matched with/without this series, so I am sure this series does not change the output binaries at all.

Masahiro Yamada (5):
ARM: remove CONFIG_ARMV7 defines
ARM: remove CONFIG_ARM1176 defines
ARM: remove CONFIG_ARM920T defines
ARM: remove CONFIG_ARM926EJS defines
ARM: remove CONFIG_ARM1136 defines

 arch/arm/include/asm/arch-armada100/config.h | 1 -
 arch/arm/include/asm/arch-at91/at91rm9200.h  | 1 -
 arch/arm/include/asm/arch-at91/at91sam9260.h | 1 -
 arch/arm/include/asm/arch-at91/at91sam9261.h | 1 -
 arch/arm/include/asm/arch-at91/at91sam9263.h | 1 -
 arch/arm/include/asm/arch-at91/at91sam9g45.h | 1 -
 arch/arm/include/asm/arch-at91/at91sam9rl.h  | 1 -
 arch/arm/include/asm/arch-at91/at91sam9x5.h  | 1 -
 arch/arm/include/asm/arch-at91/sama5d3.h     | 1 -
 arch/arm/include/asm/arch-kirkwood/config.h  | 1 -
 arch/arm/include/asm/arch-lpc32xx/config.h   | 1 -
 arch/arm/include/asm/arch-pantheon/config.h  | 1 -
 arch/arm/lib/cache.c                         | 8 ++++----
 drivers/usb/host/ohci-hcd.c                  | 2 +-
 include/configs/VCMA9.h                      | 3 +--
 include/configs/alt.h                        | 1 -
 include/configs/apf27.h                      | 3 +--
 include/configs/armadillo-800eva.h           | 1 -
 include/configs/bcm28155_ap.h                | 3 +--
 include/configs/bcm_ep_board.h               | 2 --
 include/configs/calimain.h                   | 1 -
 include/configs/cam_enc_4xx.h                | 1 -
 include/configs/cpuat91.h                    | 1 -
 include/configs/da830evm.h                   | 1 -
 include/configs/da850evm.h                   | 1 -
 include/configs/davinci_dm355evm.h           | 1 -
 include/configs/davinci_dm355leopard.h       | 1 -
 include/configs/davinci_dm365evm.h           | 1 -
 include/configs/davinci_dm6467evm.h          | 1 -
 include/configs/davinci_dvevm.h              | 1 -
 include/configs/davinci_schmoogie.h          | 1 -
 include/configs/davinci_sffsdr.h             | 1 -
 include/configs/davinci_sonata.h             | 1 -
 include/configs/ea20.h                       | 1 -
 include/configs/edb93xx.h                    | 3 +--
 include/configs/edminiv2.h                   | 1 -
 include/configs/enbw_cmc.h                   | 1 -
 include/configs/flea3.h                      | 1 -
 include/configs/hawkboard.h                  | 1 -
 include/configs/imx27lite-common.h           | 1 -
 include/configs/imx31_litekit.h              | 3 +--
 include/configs/imx31_phycore.h              | 3 +--
 include/configs/ipam390.h                    | 1 -
 include/configs/jadecpu.h                    | 1 -
 include/configs/koelsch.h                    | 1 -
 include/configs/ks2_evm.h                    | 1 -
 include/configs/lager.h                      | 1 -
 include/configs/mx31ads.h                    | 3 +--
 include/configs/mx31pdk.h                    | 3 +--
 include/configs/mx35pdk.h                    | 1 -
 include/configs/nhk8815.h                    | 1 -
 include/configs/omap3_mvblx.h                | 1 -
 include/configs/qong.h                       | 3 +--
 include/configs/rpi_b.h                      | 1 -
 include/configs/scb9328.h                    | 3 +--
 include/configs/smdk2410.h                   | 3 +--
 include/configs/socfpga_common.h             | 1 -
 include/configs/tao3530.h                    | 1 -
 include/configs/tnetv107x_evm.h              | 1 -
 include/configs/tt01.h                       | 1 -
 include/configs/versatile.h                  | 3 +--
 include/configs/woodburn_common.h            | 1 -
 include/configs/zmx25.h                      | 1 -
 include/configs/zynq-common.h                | 3 ---
 64 files changed, 17 insertions(+), 82 deletions(-)

Signature · 1 line

1.9.1

Masahiro Yamada

author

2014-11-06 05:59 UTC #1 lore raw

PATCH 1/5 ARM: remove CONFIG_ARMV7 defines

Some (not all) of ARMv7 boards define CONFIG_ARMV7, which is useless. Besides, it is never referenced.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/arm/include/asm/arch-at91/sama5d3.h | 1 -
 include/configs/alt.h                    | 1 -
 include/configs/armadillo-800eva.h       | 1 -
 include/configs/bcm28155_ap.h            | 3 +--
 include/configs/bcm_ep_board.h           | 2 --
 include/configs/koelsch.h                | 1 -
 include/configs/ks2_evm.h                | 1 -
 include/configs/lager.h                  | 1 -
 include/configs/omap3_mvblx.h            | 1 -
 include/configs/socfpga_common.h         | 1 -
 include/configs/tao3530.h                | 1 -
 include/configs/zynq-common.h            | 3 ---
 12 files changed, 1 insertion(+), 16 deletions(-)

arch/arm/include/asm/arch-at91/sama5d3.h +0 -1

index f7bc4ad..227ba80 100644
@@ -16,7 +16,6 @@
 /*
  * defines to be used in other places
  */
-#define CONFIG_ARMV7		/* ARM A5 Core */
 #define CONFIG_AT91FAMILY	/* it's a member of AT91 */
 
 /*

include/configs/alt.h +0 -1

index 7bd649f..ceb0446 100644
@@ -11,7 +11,6 @@
 #define __ALT_H
 
 #undef DEBUG
-#define CONFIG_ARMV7
 #define CONFIG_R8A7794
 #define CONFIG_RMOBILE_BOARD_STRING "Alt"
 #define CONFIG_SH_GPIO_PFC

include/configs/armadillo-800eva.h +0 -1

index b073b97..72469f3 100644
@@ -10,7 +10,6 @@
 #define __ARMADILLO_800EVA_H
 
 #undef DEBUG
-#define CONFIG_ARMV7
 #define CONFIG_R8A7740
 #define CONFIG_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
 #define CONFIG_SH_GPIO_PFC

include/configs/bcm28155_ap.h +1 -2

index bf09939..1045779 100644
@@ -10,8 +10,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/sysmap.h>
 
-/* Architecture, CPU, chip, mach, etc */
-#define CONFIG_ARMV7
+/* CPU, chip, mach, etc */
 #define CONFIG_KONA
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_SYS_GENERIC_BOARD

include/configs/bcm_ep_board.h +0 -2

index 827844e..fb85c72 100644
@@ -9,8 +9,6 @@
 
 #include <asm/arch/configs.h>
 
-/* Architecture, CPU, chip, etc */
-#define CONFIG_ARMV7
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
 #define CONFIG_SYS_GENERIC_BOARD

include/configs/koelsch.h +0 -1

index 3ccadd0..6f67d34 100644
@@ -10,7 +10,6 @@
 #define __KOELSCH_H
 
 #undef DEBUG
-#define CONFIG_ARMV7
 #define CONFIG_R8A7791
 #define CONFIG_RMOBILE_BOARD_STRING "Koelsch"
 #define CONFIG_SH_GPIO_PFC

include/configs/ks2_evm.h +0 -1

index b0c91d8..96452c8 100644
@@ -20,7 +20,6 @@
 #define CONFIG_SYS_THUMB_BUILD
 
 /* SoC Configuration */
-#define CONFIG_ARMV7
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SYS_ARCH_TIMER
 #define CONFIG_SYS_TEXT_BASE		0x0c001000

include/configs/lager.h +0 -1

index a814b4c..ebf1a95 100644
@@ -11,7 +11,6 @@
 #define __LAGER_H
 
 #undef DEBUG
-#define CONFIG_ARMV7
 #define CONFIG_R8A7790
 #define CONFIG_RMOBILE_BOARD_STRING "Lager"
 #define CONFIG_SH_GPIO_PFC

include/configs/omap3_mvblx.h +0 -1

index f3c21c4..bf1d34d 100644
@@ -18,7 +18,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_ARMV7		1	/* This is an ARM V7 CPU core */
 #define CONFIG_OMAP		1	/* in a TI OMAP core */
 #define CONFIG_MVBLX		1	/* working with mvBlueLYNX-X */
 #define CONFIG_MACH_TYPE	MACH_TYPE_MVBLX

include/configs/socfpga_common.h +0 -1

index 83a1bcd..bbd576a 100644
@@ -11,7 +11,6 @@
 /* Virtual target or real hardware */
 #undef CONFIG_SOCFPGA_VIRTUAL_TARGET
 
-#define CONFIG_ARMV7
 #define CONFIG_SYS_THUMB_BUILD
 
 #define CONFIG_SOCFPGA

include/configs/tao3530.h +0 -1

index d687717..a160329 100644
@@ -16,7 +16,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_ARMV7			/* This is an ARM V7 CPU core */
 #define CONFIG_OMAP			/* in a TI OMAP core */
 
 #define CONFIG_OMAP_GPIO

include/configs/zynq-common.h +0 -3

index 2bc1562..c39c568 100644
@@ -10,9 +10,6 @@
 #ifndef __CONFIG_ZYNQ_COMMON_H
 #define __CONFIG_ZYNQ_COMMON_H
 
-/* High Level configuration Options */
-#define CONFIG_ARMV7
-
 /* CPU clock */
 #ifndef CONFIG_CPU_FREQ_HZ
 # define CONFIG_CPU_FREQ_HZ	800000000

Signature · 1 line

1.9.1

Nobuhiro Iwamatsu

2014-11-06 06:01 UTC #2 lore raw

PATCH 1/5 ARM: remove CONFIG_ARMV7 defines

Hi,

2014-11-06 14:59 GMT+09:00 Masahiro Yamada <[email protected]>:

Quoted 4 lines

Some (not all) of ARMv7 boards define CONFIG_ARMV7, which is useless. Besides, it is never referenced.
Signed-off-by Masahiro Yamada <[email protected]>

Acked-by Nobuhiro Iwamatsu <[email protected]>

Quoted 172 lines

---

 arch/arm/include/asm/arch-at91/sama5d3.h | 1 -
 include/configs/alt.h                    | 1 -
 include/configs/armadillo-800eva.h       | 1 -
 include/configs/bcm28155_ap.h            | 3 +--
 include/configs/bcm_ep_board.h           | 2 --
 include/configs/koelsch.h                | 1 -
 include/configs/ks2_evm.h                | 1 -
 include/configs/lager.h                  | 1 -
 include/configs/omap3_mvblx.h            | 1 -
 include/configs/socfpga_common.h         | 1 -
 include/configs/tao3530.h                | 1 -
 include/configs/zynq-common.h            | 3 ---
 12 files changed, 1 insertion(+), 16 deletions(-)

arch/arm/include/asm/arch-at91/sama5d3.h +0 -1

index f7bc4ad..227ba80 100644
@@ -16,7 +16,6 @@
 /*
  * defines to be used in other places
  */
-#define CONFIG_ARMV7           /* ARM A5 Core */
 #define CONFIG_AT91FAMILY      /* it's a member of AT91 */
 
 /*

include/configs/alt.h +0 -1

index 7bd649f..ceb0446 100644
@@ -11,7 +11,6 @@
 #define __ALT_H
 
 #undef DEBUG
-#define CONFIG_ARMV7
 #define CONFIG_R8A7794
 #define CONFIG_RMOBILE_BOARD_STRING "Alt"
 #define CONFIG_SH_GPIO_PFC

include/configs/armadillo-800eva.h +0 -1

index b073b97..72469f3 100644
@@ -10,7 +10,6 @@
 #define __ARMADILLO_800EVA_H
 
 #undef DEBUG
-#define CONFIG_ARMV7
 #define CONFIG_R8A7740
 #define CONFIG_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
 #define CONFIG_SH_GPIO_PFC

include/configs/bcm28155_ap.h +1 -2

index bf09939..1045779 100644
@@ -10,8 +10,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/sysmap.h>
 
-/* Architecture, CPU, chip, mach, etc */
-#define CONFIG_ARMV7
+/* CPU, chip, mach, etc */
 #define CONFIG_KONA
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_SYS_GENERIC_BOARD

include/configs/bcm_ep_board.h +0 -2

index 827844e..fb85c72 100644
@@ -9,8 +9,6 @@
 
 #include <asm/arch/configs.h>
 
-/* Architecture, CPU, chip, etc */
-#define CONFIG_ARMV7
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
 #define CONFIG_SYS_GENERIC_BOARD

include/configs/koelsch.h +0 -1

index 3ccadd0..6f67d34 100644
@@ -10,7 +10,6 @@
 #define __KOELSCH_H
 
 #undef DEBUG
-#define CONFIG_ARMV7
 #define CONFIG_R8A7791
 #define CONFIG_RMOBILE_BOARD_STRING "Koelsch"
 #define CONFIG_SH_GPIO_PFC

include/configs/ks2_evm.h +0 -1

index b0c91d8..96452c8 100644
@@ -20,7 +20,6 @@
 #define CONFIG_SYS_THUMB_BUILD
 
 /* SoC Configuration */
-#define CONFIG_ARMV7
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SYS_ARCH_TIMER
 #define CONFIG_SYS_TEXT_BASE           0x0c001000

include/configs/lager.h +0 -1

index a814b4c..ebf1a95 100644
@@ -11,7 +11,6 @@
 #define __LAGER_H
 
 #undef DEBUG
-#define CONFIG_ARMV7
 #define CONFIG_R8A7790
 #define CONFIG_RMOBILE_BOARD_STRING "Lager"
 #define CONFIG_SH_GPIO_PFC

include/configs/omap3_mvblx.h +0 -1

index f3c21c4..bf1d34d 100644
@@ -18,7 +18,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_ARMV7           1       /* This is an ARM V7 CPU core */
 #define CONFIG_OMAP            1       /* in a TI OMAP core */
 #define CONFIG_MVBLX           1       /* working with mvBlueLYNX-X */
 #define CONFIG_MACH_TYPE       MACH_TYPE_MVBLX

include/configs/socfpga_common.h +0 -1

index 83a1bcd..bbd576a 100644
@@ -11,7 +11,6 @@
 /* Virtual target or real hardware */
 #undef CONFIG_SOCFPGA_VIRTUAL_TARGET
 
-#define CONFIG_ARMV7
 #define CONFIG_SYS_THUMB_BUILD
 
 #define CONFIG_SOCFPGA

include/configs/tao3530.h +0 -1

index d687717..a160329 100644
@@ -16,7 +16,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_ARMV7                   /* This is an ARM V7 CPU core */
 #define CONFIG_OMAP                    /* in a TI OMAP core */
 
 #define CONFIG_OMAP_GPIO

include/configs/zynq-common.h +0 -4

index 2bc1562..c39c568 100644
@@ -10,9 +10,6 @@
 #ifndef __CONFIG_ZYNQ_COMMON_H
 #define __CONFIG_ZYNQ_COMMON_H
 
-/* High Level configuration Options */
-#define CONFIG_ARMV7
-
 /* CPU clock */
 #ifndef CONFIG_CPU_FREQ_HZ
 # define CONFIG_CPU_FREQ_HZ    800000000
--

1.9.1

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 3 lines

Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

Tom Rini

2014-11-24 22:09 UTC #3 lore raw

PATCH 1/5 ARM: remove CONFIG_ARMV7 defines

In reply to Masahiro Yamada

Quoted 5 lines · Masahiro Yamada

Some (not all) of ARMv7 boards define CONFIG_ARMV7, which is useless. Besides, it is never referenced.
Signed-off-by Masahiro Yamada <[email protected]>
Acked-by Nobuhiro Iwamatsu <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141124/a800f798/attachment.pgp>

Masahiro Yamada

author

2014-11-06 05:59 UTC #4 lore raw

PATCH 2/5 ARM: remove CONFIG_ARM1176 defines

In reply to Masahiro Yamada

CONFIG_ARM1176 is defined for some boards but not referenced at all.

Signed-off-by Masahiro Yamada <[email protected]>

---

 include/configs/rpi_b.h         | 1 -
 include/configs/tnetv107x_evm.h | 1 -
 2 files changed, 2 deletions(-)

include/configs/rpi_b.h +0 -1

index ca27f9a..41e975f 100644
@@ -21,7 +21,6 @@
 
 /* Architecture, CPU, etc.*/
 #define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_ARM1176
 #define CONFIG_BCM2835
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SYS_DCACHE_OFF

include/configs/tnetv107x_evm.h +0 -1

index 162826f..00a1a9e 100644
@@ -16,7 +16,6 @@
 #include <asm/arch/clock.h>
 
 /* Architecture, CPU, etc */
-#define CONFIG_ARM1176
 #define CONFIG_TNETV107X
 #define CONFIG_TNETV107X_EVM
 #define CONFIG_TNETV107X_WATCHDOG

Signature · 1 line

1.9.1

Tom Rini

2014-11-24 22:10 UTC #5 lore raw

PATCH 2/5 ARM: remove CONFIG_ARM1176 defines

Quoted 3 lines · Masahiro Yamada

CONFIG_ARM1176 is defined for some boards but not referenced at all.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141124/68356098/attachment.pgp>

Masahiro Yamada

author

2014-11-06 05:59 UTC #6 lore raw

PATCH 3/5 ARM: remove CONFIG_ARM920T defines

In reply to Masahiro Yamada

CONFIG_CPU_ARM920T was introduced into Kconfig by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs).

This commit removes all the defines of CONFIG_ARM920T and replaces the only reference in drivers/usb/host/ohci-hcd.c with CONFIG_CPU_ARM920T.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/arm/include/asm/arch-at91/at91rm9200.h | 1 -
 drivers/usb/host/ohci-hcd.c                 | 2 +-
 include/configs/VCMA9.h                     | 3 +--
 include/configs/cpuat91.h                   | 1 -
 include/configs/edb93xx.h                   | 3 +--
 include/configs/scb9328.h                   | 3 +--
 include/configs/smdk2410.h                  | 3 +--
 7 files changed, 5 insertions(+), 11 deletions(-)

arch/arm/include/asm/arch-at91/at91rm9200.h +0 -1

index 25bb071..d177bdc 100644
@@ -7,7 +7,6 @@
 #define __AT91RM9200_H__
 
 #define CONFIG_AT91FAMILY	/* it's a member of AT91 family */
-#define CONFIG_ARM920T		/* it's an ARM920T Core */
 #define CONFIG_ARCH_CPU_INIT	/* we need arch_cpu_init() for hw timers */
 #define CONFIG_AT91_GPIO	/* and require always gpio features */

drivers/usb/host/ohci-hcd.c +1 -1

index dc0a4e3..2ab28a4 100644
@@ -47,7 +47,7 @@
 #include <asm/arch/hardware.h>	/* needed for AT91_USB_HOST_BASE */
 #endif
 
-#if defined(CONFIG_ARM920T) || \
+#if defined(CONFIG_CPU_ARM920T) || \
     defined(CONFIG_S3C24X0) || \
     defined(CONFIG_440EP) || \
     defined(CONFIG_PCI_OHCI) || \

include/configs/VCMA9.h +1 -2

index a97f5fa..94078f5 100644
@@ -20,8 +20,7 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_ARM920T		/* This is an ARM920T Core */
-#define CONFIG_S3C24X0		/* in a SAMSUNG S3C24x0-type SoC */
+#define CONFIG_S3C24X0		/* This is a SAMSUNG S3C24x0-type SoC */
 #define CONFIG_S3C2410		/* specifically a SAMSUNG S3C2410 SoC */
 #define CONFIG_VCMA9		/* on a MPL VCMA9 Board  */
 #define CONFIG_MACH_TYPE	MACH_TYPE_MPL_VCMA9 /* Machine type */

include/configs/cpuat91.h +0 -1

index ce52101..8c7d97a 100644
@@ -26,7 +26,6 @@
 #define AT91C_MASTER_CLOCK		(AT91C_MAIN_CLOCK / 3)
 #define CONFIG_SYS_HZ_CLOCK		(AT91C_MASTER_CLOCK / 2)
 
-#define CONFIG_ARM920T
 #define CONFIG_AT91RM9200
 #define CONFIG_CPUAT91
 #define USE_920T_MMU

include/configs/edb93xx.h +1 -2

index 47a8420..a82e8bc 100644
@@ -85,8 +85,7 @@
 #endif
 
 /* High-level configuration options */
-#define CONFIG_ARM920T		1		/* This is an ARM920T core... */
-#define CONFIG_EP93XX		1		/* in a Cirrus Logic 93xx SoC */
+#define CONFIG_EP93XX		1		/* This is a Cirrus Logic 93xx SoC */
 
 #define CONFIG_SYS_CLK_FREQ	14745600	/* EP93xx has a 14.7456 clock */
 #undef CONFIG_USE_IRQ				/* Don't need IRQ/FIQ */

include/configs/scb9328.h +1 -2

index e6d272d..f4a40bb 100644
@@ -10,8 +10,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_ARM920T		1     /* this is an ARM920T CPU	    */
-#define CONFIG_IMX		1     /* in a Motorola MC9328MXL Chip */
+#define CONFIG_IMX		1     /* This is a Motorola MC9328MXL Chip */
 #define CONFIG_SCB9328		1     /* on a scb9328tronix board */
 
 #define CONFIG_IMX_SERIAL

include/configs/smdk2410.h +1 -2

index d4ae19f..b83c15f 100644
@@ -17,8 +17,7 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_ARM920T		/* This is an ARM920T Core */
-#define CONFIG_S3C24X0		/* in a SAMSUNG S3C24x0-type SoC */
+#define CONFIG_S3C24X0		/* This is a SAMSUNG S3C24x0-type SoC */
 #define CONFIG_S3C2410		/* specifically a SAMSUNG S3C2410 SoC */
 #define CONFIG_SMDK2410		/* on a SAMSUNG SMDK2410 Board */

Signature · 1 line

1.9.1

Tom Rini

2014-11-24 22:10 UTC #7 lore raw

PATCH 3/5 ARM: remove CONFIG_ARM920T defines

Quoted 7 lines · Masahiro Yamada

CONFIG_CPU_ARM920T was introduced into Kconfig by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs).
This commit removes all the defines of CONFIG_ARM920T and replaces the only reference in drivers/usb/host/ohci-hcd.c with CONFIG_CPU_ARM920T.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141124/a2b090c1/attachment.pgp>

Masahiro Yamada

author

2014-11-06 05:59 UTC #8 lore raw

PATCH 4/5 ARM: remove CONFIG_ARM926EJS defines

In reply to Masahiro Yamada

CONFIG_CPU_ARM926EJS was introduced into Kconfig by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs).

This commit removes all the defines of CONFIG_ARM926EJS and replaces the only reference in arch/arm/lib/cache.c with CONFIG_CPU_ARM926EJS.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/arm/include/asm/arch-armada100/config.h | 1 -
 arch/arm/include/asm/arch-at91/at91sam9260.h | 1 -
 arch/arm/include/asm/arch-at91/at91sam9261.h | 1 -
 arch/arm/include/asm/arch-at91/at91sam9263.h | 1 -
 arch/arm/include/asm/arch-at91/at91sam9g45.h | 1 -
 arch/arm/include/asm/arch-at91/at91sam9rl.h  | 1 -
 arch/arm/include/asm/arch-at91/at91sam9x5.h  | 1 -
 arch/arm/include/asm/arch-kirkwood/config.h  | 1 -
 arch/arm/include/asm/arch-lpc32xx/config.h   | 1 -
 arch/arm/include/asm/arch-pantheon/config.h  | 1 -
 arch/arm/lib/cache.c                         | 4 ++--
 include/configs/apf27.h                      | 3 +--
 include/configs/calimain.h                   | 1 -
 include/configs/cam_enc_4xx.h                | 1 -
 include/configs/da830evm.h                   | 1 -
 include/configs/da850evm.h                   | 1 -
 include/configs/davinci_dm355evm.h           | 1 -
 include/configs/davinci_dm355leopard.h       | 1 -
 include/configs/davinci_dm365evm.h           | 1 -
 include/configs/davinci_dm6467evm.h          | 1 -
 include/configs/davinci_dvevm.h              | 1 -
 include/configs/davinci_schmoogie.h          | 1 -
 include/configs/davinci_sffsdr.h             | 1 -
 include/configs/davinci_sonata.h             | 1 -
 include/configs/ea20.h                       | 1 -
 include/configs/edminiv2.h                   | 1 -
 include/configs/enbw_cmc.h                   | 1 -
 include/configs/hawkboard.h                  | 1 -
 include/configs/imx27lite-common.h           | 1 -
 include/configs/ipam390.h                    | 1 -
 include/configs/jadecpu.h                    | 1 -
 include/configs/nhk8815.h                    | 1 -
 include/configs/versatile.h                  | 3 +--
 include/configs/zmx25.h                      | 1 -
 34 files changed, 4 insertions(+), 37 deletions(-)

arch/arm/include/asm/arch-armada100/config.h +0 -1

index 532411e..e062da1 100644
@@ -16,7 +16,6 @@
 #define _ARMD1_CONFIG_H
 
 #include <asm/arch/armada100.h>
-#define CONFIG_ARM926EJS	1	/* Basic Architecture */
 /* default Dcache Line length for armada100 */
 #define CONFIG_SYS_CACHELINE_SIZE       32

arch/arm/include/asm/arch-at91/at91sam9260.h +0 -1

index 2e902ee..95ce8bd 100644
@@ -21,7 +21,6 @@
 /*
  * defines to be used in other places
  */
-#define CONFIG_ARM926EJS	/* ARM926EJS Core */
 #define CONFIG_AT91FAMILY	/* it's a member of AT91 */
 
 /*

arch/arm/include/asm/arch-at91/at91sam9261.h +0 -1

index f7ad113..6dfcf4c 100644
@@ -21,7 +21,6 @@
 /*
  * defines to be used in other places
  */
-#define CONFIG_ARM926EJS	/* ARM926EJS Core */
 #define CONFIG_AT91FAMILY	/* it's a member of AT91 */
 
 /*

arch/arm/include/asm/arch-at91/at91sam9263.h +0 -1

index 3206af8..64a3888 100644
@@ -17,7 +17,6 @@
 /*
  * defines to be used in other places
  */
-#define CONFIG_ARM926EJS	/* ARM926EJS Core */
 #define CONFIG_AT91FAMILY	/* it's a member of AT91 */
 
 /*

arch/arm/include/asm/arch-at91/at91sam9g45.h +0 -1

index 9cbfc27..6df8cdb 100644
@@ -15,7 +15,6 @@
 /*
  * defines to be used in other places
  */
-#define CONFIG_ARM926EJS	/* ARM926EJS Core */
 #define CONFIG_AT91FAMILY	/* it's a member of AT91 */
 
 /*

arch/arm/include/asm/arch-at91/at91sam9rl.h +0 -1

index 00b6aa4..3a8e6d6 100644
@@ -17,7 +17,6 @@
 /*
  * defines to be used in other places
  */
-#define CONFIG_ARM926EJS	/* ARM926EJS Core */
 #define CONFIG_AT91FAMILY	/* it's a member of AT91 */
 
 /*

arch/arm/include/asm/arch-at91/at91sam9x5.h +0 -1

index d49c184..36a5cdf 100644
@@ -12,7 +12,6 @@
 #ifndef __AT91SAM9X5_H__
 #define __AT91SAM9X5_H__
 
-#define CONFIG_ARM926EJS	/* ARM926EJS Core */
 #define CONFIG_AT91FAMILY	/* it's a member of AT91 family */
 
 /*

arch/arm/include/asm/arch-kirkwood/config.h +0 -1

index ccc8e4e..e77ac40 100644
@@ -24,7 +24,6 @@
 #endif /* CONFIG_KW88F6281 */
 
 #include <asm/arch/soc.h>
-#define CONFIG_ARM926EJS	1	/* Basic Architecture */
 #define CONFIG_SYS_CACHELINE_SIZE	32
 				/* default Dcache Line length for kirkwood */
 #define CONFIG_MD5	/* get_random_hex on krikwood needs MD5 support */

arch/arm/include/asm/arch-lpc32xx/config.h +0 -1

index c985401..8f6426b 100644
@@ -10,7 +10,6 @@
 #define _LPC32XX_CONFIG_H
 
 /* Basic CPU architecture */
-#define CONFIG_ARM926EJS
 #define CONFIG_ARCH_CPU_INIT
 
 #define CONFIG_NR_DRAM_BANKS_MAX	2

arch/arm/include/asm/arch-pantheon/config.h +0 -1

index fdccd22..1eed7b1 100644
@@ -11,7 +11,6 @@
 
 #include <asm/arch/pantheon.h>
 
-#define CONFIG_ARM926EJS	1	/* Basic Architecture */
 /* default Dcache Line length for pantheon */
 #define CONFIG_SYS_CACHELINE_SIZE	32

arch/arm/lib/cache.c +2 -2

index 4e597a4..d0863da 100644
@@ -23,12 +23,12 @@ __weak void flush_cache(unsigned long start, unsigned long size)
 
 #endif /* CONFIG_ARM1136 */
 
-#ifdef CONFIG_ARM926EJS
+#ifdef CONFIG_CPU_ARM926EJS
 	/* test and clean, page 2-23 of arm926ejs manual */
 	asm("0: mrc p15, 0, r15, c7, c10, 3\n\t" "bne 0b\n" : : : "memory");
 	/* disable write buffer as well (page 2-22) */
 	asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
-#endif /* CONFIG_ARM926EJS */
+#endif /* CONFIG_CPU_ARM926EJS */
 	return;
 }

include/configs/apf27.h +1 -2

index 4424c30..403692d 100644
@@ -18,8 +18,7 @@
 /*
  * SoC configurations
  */
-#define CONFIG_ARM926EJS		/* this is an ARM926EJS CPU */
-#define CONFIG_MX27			/* in a Freescale i.MX27 Chip */
+#define CONFIG_MX27			/* This is a Freescale i.MX27 Chip */
 #define CONFIG_MACH_TYPE	1698	/* APF27 */
 #define CONFIG_SYS_GENERIC_BOARD

include/configs/calimain.h +0 -1

index b27f973..44c947f 100644
@@ -24,7 +24,6 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_CALIMAIN
-#define CONFIG_ARM926EJS		/* arm926ejs CPU core */
 #define CONFIG_SOC_DA8XX		/* TI DA8xx SoC */
 #define CONFIG_SOC_DA850		/* TI DA850 SoC */
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH

include/configs/cam_enc_4xx.h +0 -1

index 5f30279..f8785db 100644
@@ -14,7 +14,6 @@
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /* SoC Configuration */
-#define CONFIG_ARM926EJS				/* arm926ejs CPU */
 #define CONFIG_SYS_TIMERBASE		0x01c21400	/* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK		24000000	/* timer0 freq */
 #define CONFIG_SOC_DM365

include/configs/da830evm.h +0 -1

index 2717195..0bdcef7 100644
@@ -21,7 +21,6 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA830_EVM
-#define CONFIG_ARM926EJS		/* arm926ejs CPU core */
 #define CONFIG_SOC_DA8XX		/* TI DA8xx SoC */
 #define CONFIG_SOC_DA830		/* TI DA830 SoC */
 #define CONFIG_SYS_CLK_FREQ		clk_get(DAVINCI_ARM_CLKID)

include/configs/da850evm.h +0 -1

index 5f85755..e5f8afe 100644
@@ -25,7 +25,6 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA850_EVM
-#define CONFIG_ARM926EJS		/* arm926ejs CPU core */
 #define CONFIG_SOC_DA8XX		/* TI DA8xx SoC */
 #define CONFIG_SOC_DA850		/* TI DA850 SoC */
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH

include/configs/davinci_dm355evm.h +0 -1

index c2e187e..16b901b 100644
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /* SoC Configuration */
-#define CONFIG_ARM926EJS				/* arm926ejs CPU */
 #define CONFIG_SYS_TIMERBASE		0x01c21400	/* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK		24000000	/* timer0 freq */
 #define CONFIG_SOC_DM355

include/configs/davinci_dm355leopard.h +0 -1

index 5188fdf..4eed722 100644
@@ -14,7 +14,6 @@
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /* SoC Configuration */
-#define CONFIG_ARM926EJS				/* arm926ejs CPU */
 #define CONFIG_SYS_TIMERBASE		0x01c21400	/* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK		24000000	/* timer0 freq */
 #define CONFIG_SOC_DM355				/* DM355 based board */

include/configs/davinci_dm365evm.h +0 -1

index c4fccfd..c50c059 100644
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /* SoC Configuration */
-#define CONFIG_ARM926EJS				/* arm926ejs CPU */
 #define CONFIG_SYS_TIMERBASE		0x01c21400	/* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK		24000000	/* timer0 freq */
 #define CONFIG_SOC_DM365

include/configs/davinci_dm6467evm.h +0 -1

index b1b18ad..2c5a837 100644
@@ -15,7 +15,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
 /* SoC Configuration */
-#define CONFIG_ARM926EJS				/* arm926ejs CPU */
 
 /* Clock rates detection */
 #ifndef __ASSEMBLY__

include/configs/davinci_dvevm.h +0 -1

index 9b3d0fe..2467f70 100644
@@ -41,7 +41,6 @@
 /*===================*/
 /* SoC Configuration */
 /*===================*/
-#define CONFIG_ARM926EJS			/* arm926ejs CPU core */
 #define CONFIG_SYS_TIMERBASE		0x01c21400	/* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK		27000000	/* Timer Input clock freq */
 #define CONFIG_SOC_DM644X

include/configs/davinci_schmoogie.h +0 -1

index 96c8fe2..2505465 100644
@@ -19,7 +19,6 @@
 /*===================*/
 /* SoC Configuration */
 /*===================*/
-#define CONFIG_ARM926EJS			/* arm926ejs CPU core */
 #define CONFIG_SYS_TIMERBASE		0x01c21400	/* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK		27000000	/* Timer Input clock freq */
 #define CONFIG_SOC_DM644X

include/configs/davinci_sffsdr.h +0 -1

index 6e07cce..e773835 100644
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_USE_NAND
 #define CONFIG_SYS_USE_DSPLINK		/* don't power up the DSP. */
 /* SoC Configuration */
-#define CONFIG_ARM926EJS			/* arm926ejs CPU core */
 #define CONFIG_SYS_TIMERBASE		0x01c21400	/* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK		27000000	/* Timer Input clock freq */
 #define CONFIG_SOC_DM644X

include/configs/davinci_sonata.h +0 -1

index cd23aaca..dae37cd 100644
@@ -43,7 +43,6 @@
 /*===================*/
 /* SoC Configuration */
 /*===================*/
-#define CONFIG_ARM926EJS			/* arm926ejs CPU core */
 #define CONFIG_SYS_TIMERBASE		0x01c21400	/* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK		27000000	/* Timer Input clock freq */
 #define CONFIG_SOC_DM644X

include/configs/ea20.h +0 -1

index 1d50a37..ae89368 100644
@@ -28,7 +28,6 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA850_EVM
-#define CONFIG_ARM926EJS		/* arm926ejs CPU core */
 #define CONFIG_SOC_DA8XX		/* TI DA8xx SoC */
 #define CONFIG_SOC_DA850		/* TI DA850 SoC */
 #define CONFIG_SYS_CLK_FREQ		clk_get(DAVINCI_ARM_CLKID)

include/configs/edminiv2.h +0 -1

index 1df4fc1..70a698a 100644
@@ -23,7 +23,6 @@
  */
 
 #define CONFIG_MARVELL		1
-#define CONFIG_ARM926EJS	1	/* Basic Architecture */
 #define CONFIG_FEROCEON		1	/* CPU Core subversion */
 #define CONFIG_88F5182		1	/* SOC Name */
 #define CONFIG_MACH_EDMINIV2	1	/* Machine type */

include/configs/enbw_cmc.h +0 -1

index 30ca95f..cdea4a8 100644
@@ -25,7 +25,6 @@
 /*
  * SoC Configuration
  */
-#define CONFIG_ARM926EJS		/* arm926ejs CPU core */
 #define CONFIG_SOC_DA8XX		/* TI DA8xx SoC */
 #define CONFIG_SOC_DA850		/* TI DA850 SoC */
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH

include/configs/hawkboard.h +0 -1

index 8188c7b..1d78e72 100644
@@ -20,7 +20,6 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_HAWK
-#define CONFIG_ARM926EJS		/* arm926ejs CPU core */
 #define CONFIG_SOC_DA8XX		/* TI DA8xx SoC */
 #define CONFIG_SOC_DA850		/* TI DA850 SoC */
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH

include/configs/imx27lite-common.h +0 -1

index 9c25efe..386dbd8 100644
@@ -13,7 +13,6 @@
 /*
  * SoC Configuration
  */
-#define CONFIG_ARM926EJS			/* arm926ejs CPU core */
 #define CONFIG_MX27
 #define CONFIG_MX27_CLK32	32768		/* OSC32K frequency */

include/configs/ipam390.h +0 -1

index 98e819b..310d5e2 100644
@@ -25,7 +25,6 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA850_EVM
-#define CONFIG_ARM926EJS		/* arm926ejs CPU core */
 #define CONFIG_SOC_DA8XX		/* TI DA8xx SoC */
 #define CONFIG_SOC_DA850		/* TI DA850 SoC */
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH

include/configs/jadecpu.h +0 -1

index 759e112..8175621 100644
@@ -14,7 +14,6 @@
 #define CONFIG_MB86R0x_IOCLK	get_bus_freq(0)
 #define CONFIG_SYS_TEXT_BASE	0x10000000
 
-#define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
 
 #define CONFIG_USE_ARCH_MEMCPY
 #define CONFIG_USE_ARCH_MEMSET

include/configs/nhk8815.h +0 -1

index 5419f55..52cde41 100644
@@ -12,7 +12,6 @@
 
 #include <nomadik.h>
 
-#define CONFIG_ARM926EJS
 #define CONFIG_NOMADIK_8815	/* cpu variant */
 
 #define CONFIG_SKIP_LOWLEVEL_INIT /* we have already been loaded to RAM */

include/configs/versatile.h +1 -2

index 29c32fe..900b89c 100644
@@ -19,8 +19,7 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_ARM926EJS	1	/* This is an arm926ejs CPU core */
-#define CONFIG_VERSATILE	1	/* in Versatile Platform Board	*/
+#define CONFIG_VERSATILE	1	/* This is Versatile Platform Board	*/
 #define CONFIG_ARCH_VERSATILE	1	/* Specifically, a Versatile	*/
 
 #define CONFIG_SYS_MEMTEST_START	0x100000

include/configs/zmx25.h +0 -1

index 8ffe6f1..356ac88 100644
@@ -12,7 +12,6 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_ARM926EJS			/* arm926ejs CPU core */
 #define CONFIG_MX25
 #define CONFIG_SYS_TEXT_BASE		0xA0000000

Signature · 1 line

1.9.1

Tom Rini

2014-11-24 22:10 UTC #9 lore raw

PATCH 4/5 ARM: remove CONFIG_ARM926EJS defines

Quoted 7 lines · Masahiro Yamada

CONFIG_CPU_ARM926EJS was introduced into Kconfig by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs).
This commit removes all the defines of CONFIG_ARM926EJS and replaces the only reference in arch/arm/lib/cache.c with CONFIG_CPU_ARM926EJS.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141124/29ddd481/attachment.pgp>

Masahiro Yamada

author

2014-11-06 05:59 UTC #10 lore raw

PATCH 5/5 ARM: remove CONFIG_ARM1136 defines

In reply to Masahiro Yamada

CONFIG_CPU_ARM1136 was introduced into Kconfig by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs).

This commit removes all the defines of CONFIG_ARM1136 and replaces the only reference in arch/arm/lib/cache.c with CONFIG_CPU_ARM1136.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/arm/lib/cache.c              | 4 ++--
 include/configs/flea3.h           | 1 -
 include/configs/imx31_litekit.h   | 3 +--
 include/configs/imx31_phycore.h   | 3 +--
 include/configs/mx31ads.h         | 3 +--
 include/configs/mx31pdk.h         | 3 +--
 include/configs/mx35pdk.h         | 1 -
 include/configs/qong.h            | 3 +--
 include/configs/tt01.h            | 1 -
 include/configs/woodburn_common.h | 1 -
 10 files changed, 7 insertions(+), 16 deletions(-)

arch/arm/lib/cache.c +2 -2

index d0863da..f1c0792 100644
@@ -11,7 +11,7 @@
 
 __weak void flush_cache(unsigned long start, unsigned long size)
 {
-#if defined(CONFIG_ARM1136)
+#if defined(CONFIG_CPU_ARM1136)
 
 #if !defined(CONFIG_SYS_ICACHE_OFF)
 	asm("mcr p15, 0, r1, c7, c5, 0"); /* invalidate I cache */

@@ -21,7 +21,7 @@ __weak void flush_cache(unsigned long start, unsigned long size)
 	asm("mcr p15, 0, r1, c7, c14, 0"); /* Clean+invalidate D cache */
 #endif
 
-#endif /* CONFIG_ARM1136 */
+#endif /* CONFIG_CPU_ARM1136 */
 
 #ifdef CONFIG_CPU_ARM926EJS
 	/* test and clean, page 2-23 of arm926ejs manual */

include/configs/flea3.h +0 -1

index 8417567..bf02829 100644
@@ -16,7 +16,6 @@
 #include <asm/arch/imx-regs.h>
 
  /* High Level Configuration Options */
-#define CONFIG_ARM1136	/* This is an arm1136 CPU core */
 #define CONFIG_MX35
 
 #define CONFIG_SYS_DCACHE_OFF

include/configs/imx31_litekit.h +1 -2

index 8428d84..0f22032 100644
@@ -15,8 +15,7 @@
 #include <asm/arch/imx-regs.h>
 
  /* High Level Configuration Options */
-#define CONFIG_ARM1136		1    /* This is an arm1136 CPU core */
-#define CONFIG_MX31		1    /* in a mx31 */
+#define CONFIG_MX31		1    /* This is a mx31 */
 #define CONFIG_MX31_CLK32	32000
 
 #define CONFIG_DISPLAY_CPUINFO

include/configs/imx31_phycore.h +1 -2

index ffb67c2..4195fa3 100644
@@ -15,8 +15,7 @@
 #include <asm/arch/imx-regs.h>
 
 /* High Level Configuration Options */
-#define CONFIG_ARM1136			/* This is an arm1136 CPU core */
-#define CONFIG_MX31			/* in a mx31 */
+#define CONFIG_MX31			/* This is a mx31 */
 #define CONFIG_MX31_CLK32	32000
 
 #define CONFIG_DISPLAY_CPUINFO

include/configs/mx31ads.h +1 -2

index 51b1a14..0f4bd91 100644
@@ -12,8 +12,7 @@
 #include <asm/arch/imx-regs.h>
 
  /* High Level Configuration Options */
-#define CONFIG_ARM1136		1		/* This is an arm1136 CPU core */
-#define CONFIG_MX31		1		/* in a mx31 */
+#define CONFIG_MX31		1		/* This is a mx31 */
 
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/mx31pdk.h +1 -2

index bc4583b..2a3e53c 100644
@@ -17,8 +17,7 @@
 #include <asm/arch/imx-regs.h>
 
 /* High Level Configuration Options */
-#define CONFIG_ARM1136			/* This is an arm1136 CPU core */
-#define CONFIG_MX31			/* in a mx31 */
+#define CONFIG_MX31			/* This is a mx31 */
 
 #define CONFIG_SYS_GENERIC_BOARD

include/configs/mx35pdk.h +0 -1

index ab48144..a145f08 100644
@@ -16,7 +16,6 @@
 #include <asm/arch/imx-regs.h>
 
  /* High Level Configuration Options */
-#define CONFIG_ARM1136	/* This is an arm1136 CPU core */
 #define CONFIG_MX35
 
 #define CONFIG_DISPLAY_CPUINFO

include/configs/qong.h +1 -2

index f9d6642..d383fe8 100644
@@ -12,8 +12,7 @@
 #include <asm/arch/imx-regs.h>
 
 /* High Level Configuration Options */
-#define CONFIG_ARM1136			/* This is an arm1136 CPU core */
-#define CONFIG_MX31			/* in a mx31 */
+#define CONFIG_MX31			/* This is a mx31 */
 #define CONFIG_QONG
 
 #define CONFIG_DISPLAY_CPUINFO

include/configs/tt01.h +0 -1

index 0937653..cf169a4 100644
@@ -13,7 +13,6 @@
 #include <asm/arch/imx-regs.h>
 
 /* High Level Configuration Options */
-#define CONFIG_ARM1136
 #define CONFIG_MX31
 
 #define CONFIG_DISPLAY_CPUINFO

include/configs/woodburn_common.h +0 -1

index d3d3e69..c7a17f7 100644
@@ -14,7 +14,6 @@
 #include <asm/arch/imx-regs.h>
 
  /* High Level Configuration Options */
-#define CONFIG_ARM1136	/* This is an arm1136 CPU core */
 #define CONFIG_MX35
 #define CONFIG_MX35_HCLK_FREQ	24000000

Signature · 1 line

1.9.1

Tom Rini

2014-11-24 22:10 UTC #11 lore raw

PATCH 5/5 ARM: remove CONFIG_ARM1136 defines

Quoted 7 lines · Masahiro Yamada

CONFIG_CPU_ARM1136 was introduced into Kconfig by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs).
This commit removes all the defines of CONFIG_ARM1136 and replaces the only reference in arch/arm/lib/cache.c with CONFIG_CPU_ARM1136.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141124/2c031e29/attachment.pgp>