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>

diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 27914a95b964f61cfbe287a092d8f0a72b931aaf..008da39a6c02d11b5b8aa02a34363d9cc3b187e0 100644 (file)
--- 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

diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index 10550174df4bddc9f73e32ea89e8fd66e49f9d78..aee87cdcbf9e1b0c81a287475131476bc7ae01fc 100644 (file)
--- 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;

diff --git a/arch/arm/include/asm/ti-common/sys_proto.h b/arch/arm/include/asm/ti-common/sys_proto.h
index 2bdb71cfe8e593eded89661b87cecb4cedbb50e6..60d1160459bb86569a84bab60b8ffc7fa73b15a4 100644 (file)
--- 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
 

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 2dbbd7a7757dde5a65abbb04d5ab78235ec14a61..07ef9e98e9002f101c2ddb7a66ca4069292e01b3 100644 (file)
--- 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

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 2178c8a68f41fcfc659627e2e1ccfbafc2e84434..ad56d240c1e60401e313967354432199ee636f0d 100644 (file)
--- 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
 

diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 90698614d9a900ecf4ac964d0b0d9976cccca271..7afffa2ec647948cfa6a51465b56dbde6a441b99 100644 (file)
--- 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 */

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index ae4f287e4d48af030515a1c8d7123def0d6a878d..8f24174a21e723ce8fc2354edb55a633013e9a06 100644 (file)
--- 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
 

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index cbb0d0b8f3312089904e374862779309b904adf9..da5a4b3fb8a3d9dd464bb86a88052f24e98b5439 100644 (file)
--- 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

diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index edb52be5a83cc48ef0369ba81737a3ec59a254ac..1e2a47702756613e1d3d3f908bece74e1fb0f603 100644 (file)
--- 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

diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index a66d462706b2776d86019e580460610e023d09be..76f2b8b7b4a08f9856d9f9a63e36c1f7b340ccc9 100644 (file)
--- 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

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index d5b7dfb391d28f39859969df70a1f8bd08c2d8d5..0c6b1e89fc1116ebd22a9826b03268881f70b82d 100644 (file)
--- 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

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index d1230a56f41bed320bd55368a2ad19d926e73768..4d5265f5409a620a9128b51090d748ef652eb879 100644 (file)
--- 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

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index a5065e209d7511b5d95d4263267658f1c01df00e..6388a9ccaf6a891bbde92c44d5a0811879103459 100644 (file)
--- 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

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 066c24136c4d218312457e9adde5318d3146da1f..456429694e7fc2a91734b8e051ba2c694726a23f 100644 (file)
--- 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>
 

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 264279fc4241d31f63330ba40177ed341dc0698b..e12b101333920a83e26a7d4b318e1946361afe60 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -26,7 +26,6 @@
  */
 
 #define CONFIG_OMAP
-#define CONFIG_OMAP_COMMON
 
 /*
  * Board

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 6f58a97d33daf5e3c25771374422df374b38cb6f..ff0c60d01cf37daec0b72589e2686fa2cca24cc6 100644 (file)
--- 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

diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 6219a44595eda3bea8f5b8076cc2ed7d347147b9..a873e7b553d0536a05005540c10ee230b1473285 100644 (file)
--- 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

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 9a9faebc6088c0668415687cdea7e9259bede019..6a5ed196bf16dac21b803f52162a2f5fe44e9b9c 100644 (file)
--- 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>
 

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 14c254296f24729e5c30696a25401954f1e16234..5db4c605466a564fd1334691b5844728287aab95 100644 (file)
--- 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
 

diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h
index 7548170afcf7e3c0349894cc51324415c76d6da6..6d9d4b2d97abf479bd1308287620032ccfda40e9 100644 (file)
--- 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

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 9a3d224e39e3c6fe7830c4e6953dbc323aa0a08e..07a92ebcf8cf183e447b5e46c6853a0660b8061a 100644 (file)
--- 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