TI: Remove CONFIG_OMAP_COMMON in favor of CONFIG_ARCH_OMAP2

With the move to arch/arm/mach-omap2 there are now very few uses of CONFIG_OMAP_COMMON and further they can all be replaced with CONFIG_ARCH_OMAP2, so do so. Signed-off-by: Tom Rini <trini@konsulko.com>
8 years ago · 187f9dc3f7
parent 983e37007d
commit 187f9dc3f7
21 changed files with 3 additions and 22 deletions
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@ -6,7 +6,7 @@
 #

 ifndef CONFIG_STANDALONE_LOAD_ADDR
-ifneq ($(CONFIG_OMAP_COMMON),)
+ifneq ($(CONFIG_ARCH_OMAP2),)
 CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
 else
 CONFIG_STANDALONE_LOAD_ADDR = 0xc100000
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@ -60,7 +60,7 @@ struct arch_global_data {
 	unsigned long tlb_allocated;
 #endif

-#ifdef CONFIG_OMAP_COMMON
+#ifdef CONFIG_ARCH_OMAP2
 	u32 omap_boot_device;
 	u32 omap_boot_mode;
 	u8 omap_ch_flags;
--- a/arch/arm/include/asm/ti-common/sys_proto.h
+++ b/arch/arm/include/asm/ti-common/sys_proto.h
@ -9,7 +9,7 @@

 DECLARE_GLOBAL_DATA_PTR;

-#ifdef CONFIG_OMAP_COMMON
+#ifdef CONFIG_ARCH_OMAP2
 #define TI_ARMV7_DRAM_ADDR_SPACE_START	0x80000000
 #define TI_ARMV7_DRAM_ADDR_SPACE_END	0xFFFFFFFF

--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@ -18,7 +18,6 @@
 */
 #define CONFIG_OMAP		1	/* in a TI OMAP core */
 #define CONFIG_OMAP3_AM3517CRANE	1	/* working with CRANEBOARD */
-#define CONFIG_OMAP_COMMON
 /* Common ARM Erratas */
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@ -16,7 +16,6 @@
 /* High Level Configuration Options */

 #define CONFIG_OMAP
-#define CONFIG_OMAP_COMMON

 #define CONFIG_SYS_NO_FLASH

--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@ -14,7 +14,6 @@
 /* ------------------------------------------------------------------------- */
 #define CONFIG_AM33XX
 #define CONFIG_OMAP
-#define CONFIG_OMAP_COMMON
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */

 /* Timer information */
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@ -25,8 +25,6 @@
 #undef CONFIG_MAX_RAM_BANK_SIZE
 #define CONFIG_MAX_RAM_BANK_SIZE	(512 << 20)	/* 512MB */

-#define CONFIG_OMAP_COMMON
-
 #define MACH_TYPE_CM_T335		4586	/* Until the next sync */
 #define CONFIG_MACH_TYPE		MACH_TYPE_CM_T335

--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@ -25,7 +25,6 @@
 #define CONFIG_OMAP	/* in a TI OMAP core */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_CM_T3X	/* working with CM-T35 and CM-T3730 */
-#define CONFIG_OMAP_COMMON
 /* Common ARM Erratas */
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@ -15,7 +15,6 @@
 */
 #define CONFIG_OMAP	/* in a TI OMAP core */
 #define CONFIG_CM_T3517	/* working with CM-T3517 */
-#define CONFIG_OMAP_COMMON
 /* Common ARM Erratas */
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@ -31,7 +31,6 @@

 #define CONFIG_OMAP
 #define CONFIG_OMAP4430
-#define CONFIG_OMAP_COMMON

 /*
 * Board
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@ -15,7 +15,6 @@
 #define CONFIG_OMAP			/* in a TI OMAP core */
 #define CONFIG_OMAP3_MCX		/* working with mcx */
 #define CONFIG_OMAP_GPIO
-#define CONFIG_OMAP_COMMON
 /* Common ARM Erratas */
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@ -27,7 +27,6 @@
 #define CONFIG_OMAP3430			/* which is in a 3430 */
 #define CONFIG_OMAP3_RX51		/* working with RX51 */
 #define CONFIG_SYS_L2CACHE_OFF		/* pretend there is no L2 CACHE */
-#define CONFIG_OMAP_COMMON
 /* Common ARM Erratas */
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@ -92,7 +92,6 @@
 */
 #define CONFIG_OMAP			/* This is TI OMAP core */
 #define CONFIG_OMAP_GPIO
-#define CONFIG_OMAP_COMMON
 /* Common ARM Erratas */
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@ -16,7 +16,6 @@

 #define CONFIG_AM33XX
 #define CONFIG_OMAP
-#define CONFIG_OMAP_COMMON

 #include <asm/arch/omap.h>

--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@ -26,7 +26,6 @@
 */

 #define CONFIG_OMAP
-#define CONFIG_OMAP_COMMON

 /*
 * Board
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@ -15,7 +15,6 @@
 */
 #define CONFIG_OMAP		/* in a TI OMAP core */
 #define CONFIG_OMAP_GPIO
-#define CONFIG_OMAP_COMMON
 /* Common ARM Erratas */
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@ -19,7 +19,6 @@
 #define CONFIG_OMAP			/* in a TI OMAP core */

 #define CONFIG_OMAP_GPIO
-#define CONFIG_OMAP_COMMON
 /* Common ARM Erratas */
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@ -20,7 +20,6 @@
 #define CONFIG_TI814X
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_OMAP
-#define CONFIG_OMAP_COMMON

 #include <asm/arch/omap.h>

--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@ -14,7 +14,6 @@
 #define CONFIG_TI816X
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_OMAP
-#define CONFIG_OMAP_COMMON

 #define CONFIG_ARCH_CPU_INIT

--- a/include/configs/ti_armv7_omap.h
+++ b/include/configs/ti_armv7_omap.h
@ -14,7 +14,6 @@

 /* Common defines for all OMAP architecture based SoCs */
 #define CONFIG_OMAP
-#define CONFIG_OMAP_COMMON

 /* I2C IP block */
 #define CONFIG_SYS_OMAP24_I2C_SPEED	100000
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@ -19,7 +19,6 @@
 /* High Level Configuration Options */
 #define CONFIG_SYS_THUMB_BUILD
 #define CONFIG_OMAP			/* in a TI OMAP core */
-#define CONFIG_OMAP_COMMON
 /* Common ARM Erratas */
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973