ARM: OMAP: Add CONFIG_OMAP_COMMON

Adding a new CONFIG_OMAP_COMMON which is included by all boards
that needs to build cpu/armv7/omap-common folder.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

diff --git a/Makefile b/Makefile
index 7206abac1f3dc1d65fc0eda03fdd5a8a96506cee..5461a21b5a06528056b1980bc33887248214e9cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -322,7 +322,7 @@ LIBS-y += api/libapi.o
 LIBS-y += post/libpost.o
 LIBS-y += test/libtest.o
 
-ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),)
+ifneq ($(CONFIG_OMAP_COMMON),)
 LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
 endif
 

diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 540a1192c25bc405f20357ceeaba407d67410e8e..ce3903ba9f5edea75e06ae53efc847309dfa0e1e 100644 (file)
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -8,7 +8,7 @@
 CROSS_COMPILE ?= arm-linux-
 
 ifndef CONFIG_STANDALONE_LOAD_ADDR
-ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),)
+ifneq ($(CONFIG_OMAP_COMMON),)
 CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
 else
 CONFIG_STANDALONE_LOAD_ADDR = 0xc100000

diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 98f29d466b3d554ecbbd67ebe68974c970f02b2c..75b3753260c33782b2a548d9c35f30518a46a6cb 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -21,7 +21,7 @@ COBJS += vc.o
 COBJS  += abb.o
 endif
 
-ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),)
+ifeq ($(CONFIG_OMAP34XX),)
 COBJS  += boot-common.o
 SOBJS  += lowlevel_init.o
 endif

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index e32066d786500b9953dc6ec1ddf4ec9e10a7814f..dcc3d68b485d92f25d4f2e7ab19344a7f0cce766 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -18,6 +18,7 @@
 
 #define CONFIG_AM33XX
 #define CONFIG_OMAP
+#define CONFIG_OMAP_COMMON
 
 #include <asm/arch/omap.h>
 

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 9bf283aba345b6c5e807d03a807c7c42f98a83fa..1fd2508fe976be7004cb196e98c2c7d872012db0 100644 (file)
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -19,6 +19,7 @@
 #define CONFIG_OMAP            1       /* in a TI OMAP core */
 #define CONFIG_OMAP34XX                1       /* which is a 34XX */
 #define CONFIG_OMAP3_AM3517CRANE       1       /* working with CRANEBOARD */
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_EMIF4   /* The chip has EMIF4 controller */
 

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 5c6169771c1a7eaeb40a9397a974d848a5e52e04..65008781216ccb246b636cb3052fbf23ac65b5e1 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -19,6 +19,7 @@
 #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 */
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_EMIF4   /* The chip has EMIF4 controller */
 

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 39a216e8352e1b226115216b5baa110d36280a7f..bc5b66c6dc7c2ec668c7f2e00a86df8a98d47ade 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -24,6 +24,7 @@
 #define CONFIG_OMAP34XX        /* which is a 34XX */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_CM_T3X  /* working with CM-T35 and CM-T3730 */
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SYS_TEXT_BASE   0x80008000
 

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 513121ae6429c7da3e3bd4ab719da5ad29e8a218..cb79b4ef43b53b5f4e028edbc137510b653d27f2 100644 (file)
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -21,6 +21,7 @@
 #define CONFIG_OMAP3_DEVKIT8000        1       /* working with DevKit8000 */
 #define CONFIG_MACH_TYPE       MACH_TYPE_DEVKIT8000
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 /*
  * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM

diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index bf91625079bdaddb3b2c9e81d8de73010d599b82..30e39087c7643425ebd0afb62018e3dbf0e71d62 100644 (file)
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -30,6 +30,7 @@
 #define CONFIG_OMAP            /* in a TI OMAP core */
 #define CONFIG_OMAP34XX                /* which is a 34XX */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SYS_TEXT_BASE   0x80008000
 

diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h
index 12f28f82a8f7718ba0cdc9a223171f25942800d1..240ad780fc8aedd23e7bf6871062673098a2c5a1 100644 (file)
--- a/include/configs/igep0033.h
+++ b/include/configs/igep0033.h
@@ -16,6 +16,7 @@
 
 #define CONFIG_AM33XX
 #define CONFIG_OMAP
+#define CONFIG_OMAP_COMMON
 
 #include <asm/arch/omap.h>
 

diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h
index c17267e3adfa2d9c2119d2f1a1c00aaadb202666..a2e70ffef2e27a44caf26e44d728b3d963e21210 100644 (file)
--- a/include/configs/igep00x0.h
+++ b/include/configs/igep00x0.h
@@ -18,6 +18,7 @@
 #define CONFIG_OMAP            1       /* in a TI OMAP core */
 #define CONFIG_OMAP34XX                1       /* which is a 34XX */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SDRC    /* The chip has SDRC controller */
 

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index c2b16316f11dd666de039b8c4598c22a8d06be20..85ae016e0cac0db9aeff8708165ea15ac1e8a8e3 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -16,6 +16,7 @@
 #define CONFIG_OMAP34XX                        /* which is a 34XX */
 #define CONFIG_OMAP3_MCX               /* working with mcx */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define MACH_TYPE_MCX                  3656
 #define CONFIG_MACH_TYPE       MACH_TYPE_MCX

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 36c6800c566332ca9af93f986e18fafa7bae4755..cfc5f1205e12ada2522309172ff4f5843e8144da 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -28,6 +28,7 @@
 #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
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_NOKIA_RX51
 

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 4487451acd4a46c665318e92cc86fbfc85edfac0..c1245e7b841e1c633b217ba0daf933abe363df0f 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -19,6 +19,7 @@
 #define CONFIG_OMAP34XX                1       /* which is a 34XX */
 #define CONFIG_OMAP3_BEAGLE    1       /* working with BEAGLE */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SDRC    /* The chip has SDRC controller */
 

diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 3b3e25ad8424165f3f004a16e4fd887b2b2a1297..edf65434430bca65e41f098eadd57aa750268b97 100644 (file)
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -15,6 +15,7 @@
 #define CONFIG_OMAP                    /* This is TI OMAP core */
 #define CONFIG_OMAP34XX                        /* belonging to 34XX family */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SDRC                    /* The chip has SDRC controller */
 

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 3dd6d32965677301e7580b99a29c2c5417cc40da..ee6db51274ca9f73e25b502c733afb3e93d266d0 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -18,6 +18,7 @@
 #define CONFIG_OMAP34XX                        /* which is a 34XX */
 #define CONFIG_OMAP3_LOGIC             /* working with Logic OMAP boards */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SYS_TEXT_BASE   0x80400000
 

diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index 5526b4314f03d2708045793bf4e4b200908f7df6..0c88419f245eff14a7b8cd2b3244fec6d05fc088 100644 (file)
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -24,6 +24,7 @@
 #define CONFIG_MVBLX           1       /* working with mvBlueLYNX-X */
 #define CONFIG_MACH_TYPE       MACH_TYPE_MVBLX
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SDRC    /* The chip has SDRC controller */
 

diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 3e018c00e8b09feb9bbcff70939cbf87eccb438a..88380a42c60c86f0484f6f0363915a625fce8b3c 100644 (file)
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -14,6 +14,7 @@
 #define CONFIG_OMAP34XX                                /* which is a 34XX */
 #define CONFIG_OMAP3_OVERO                     /* working with overo */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SDRC                            /* The chip has SDRC controller */
 

diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 3e8bd67d27fb1bf3d18221243c19def4756f9633..91a25684c7a69126ed4c0eca1e85ff469969a6d3 100644 (file)
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -17,6 +17,7 @@
 #define CONFIG_OMAP34XX                1       /* which is a 34XX */
 #define CONFIG_OMAP3_PANDORA   1       /* working with pandora */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SDRC    /* The chip has SDRC controller */
 

diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index 836a3d847d1c86c40bc0153e5b5b6e63b91e8a5d..a5e469ce32594b792e4b07e9bca8543746e87e81 100644 (file)
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -23,6 +23,7 @@
 #define CONFIG_OMAP            1       /* in a TI OMAP core */
 #define CONFIG_OMAP34XX                1       /* which is a 34XX */
 #define CONFIG_OMAP3_3430SDP   1       /* working with SDP Rev2 */
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SDRC    /* The chip has SDRC controller */
 

diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 36870459ef5f329ec1a6e7e5b36d377fba5d26f9..c747d5247b9e50f4f6689b5a65171b4442b3af7c 100644 (file)
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -19,6 +19,7 @@
 #define CONFIG_OMAP            1       /* in a TI OMAP core */
 #define CONFIG_OMAP34XX                1       /* which is a 34XX */
 #define CONFIG_OMAP3_ZOOM1     1       /* working with Zoom MDK Rev1 */
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SDRC    /* The chip has SDRC controller */
 

diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index c57df8edb5c8b59ec67bca7307c94e156332524e..cb8c7ec6f0667a3e7e307901826199538fa4d314 100644 (file)
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -21,6 +21,7 @@
 #define CONFIG_OMAP34XX                1       /* which is a 34XX */
 #define CONFIG_OMAP3_ZOOM2     1       /* working with Zoom II */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SDRC    /* The chip has SDRC controller */
 

diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 719cb83d9a9e0b6712bdebca08a57ae83f2a5d0b..e9f2383f7c8116e59f3fea69742cd12bdd90c1b0 100644 (file)
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -20,6 +20,7 @@
 #define CONFIG_OMAP44XX                1       /* which is a 44XX */
 #define CONFIG_OMAP4430                1       /* which is in a 4430 */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 /* Get CPU defs */
 #include <asm/arch/cpu.h>

diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
index 7dd56cfa787c66376ed6e8201e1db0cee028c30b..7662e2e7496e712b4425371ee3d54d8d20999b78 100644 (file)
--- a/include/configs/omap5_common.h
+++ b/include/configs/omap5_common.h
@@ -20,6 +20,7 @@
 #define CONFIG_OMAP    /* in a TI OMAP core */
 #define CONFIG_OMAP54XX        /* which is a 54XX */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 /* Get CPU defs */
 #include <asm/arch/cpu.h>

diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index 9b16c47820fb1bf24caacb06a25e776e4a67deea..07af32bb94f746840ff988e92fe5594ecc148687 100644 (file)
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -21,6 +21,7 @@
 
 #define CONFIG_AM33XX
 #define CONFIG_OMAP
+#define CONFIG_OMAP_COMMON
 
 #include <asm/arch/omap.h>
 

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index c297827d80c4efbd723007cb2a221fdf7d268c52..c215f0b92522057d28bee64a1b600d67af7d4371 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -16,6 +16,7 @@
 #define CONFIG_OMAP            /* in a TI OMAP core */
 #define CONFIG_OMAP34XX                /* which is a 34XX */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SYS_TEXT_BASE 0x80008000
 

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index eac5ad02434af3cc99b5cabff17bb22284a20aad..c31f4d8a3309355a0480f1df2d11b6da18c4a467 100644 (file)
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -20,6 +20,7 @@
 #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/tricorder.h b/include/configs/tricorder.h
index 4e2cb65b0a3e4b8fc4fe0dc905d7a11995fb6898..a9b271464a3026c44b9a5f67046360b0bb97977a 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -19,6 +19,7 @@
 /* High Level Configuration Options */
 #define CONFIG_OMAP                    /* in a TI OMAP core */
 #define CONFIG_OMAP34XX                        /* which is a 34XX */
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_TRICORDER
 /*

diff --git a/spl/Makefile b/spl/Makefile
index 6e5299bef16566b3a7cabc244f5919c007275d33..28ebc96060f8b6b6709b4b55b16a1b641c79b887 100644 (file)
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -83,7 +83,7 @@ LIBS-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/phy/libphy.o
 LIBS-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/libusb_musb-new.o
 LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/libusb_gadget.o
 
-ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),)
+ifneq ($(CONFIG_OMAP_COMMON),)
 LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
 endif