imx6: move standard ATAG configs to mx6_common.h

Define the standard ATAG consfigs in mx6_common.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Tom Rini <trini at konsulko.com>

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 211e75f8697bd7866bd5c044a0184752bd7c5926..ba30cfcfde045e3af0d17679ffbc3938034047f5 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -17,11 +17,6 @@
 
 #define CONFIG_MACH_TYPE       4122
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (10 * 1024 * 1024)
 

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index aae3044cff3059b80caa5e06d63cdeab00880654..8b89278cefac370e804e2c64c9b4fb2ce228eea8 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -257,11 +257,7 @@
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_LOADADDR                        0x10800000
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-#define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
 #define CONFIG_SERIAL_TAG
 
 /* misc */

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index a033a630159228719e5a298254728eae3e24e8bd..e86c831d04b997f5502c90fadb9cd6fef38994bf 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -21,10 +21,6 @@
 
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
 #define CONFIG_IMX6_THERMAL
 
 /* Size of malloc() pool */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 41f9c9c9e4253132b074dcf928e568806975766a..89c9c844d67ed7bdc2a6f4726682ca4ee68a5d06 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -36,12 +36,8 @@
 
 #define CONFIG_MACH_TYPE       4520   /* Gateworks Ventana Platform */
 
-/* ATAGs */
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
+/* Serial ATAG */
 #define CONFIG_SERIAL_TAG
-#define CONFIG_REVISION_TAG
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 0e5706b892a39a4b8a9088aee75534ac29276e0b..33c6203397473cd98f2facaf34016f692f0604ec 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -46,4 +46,10 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_SYS_GENERIC_BOARD
 
+/* ATAGs */
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+#define CONFIG_REVISION_TAG
+
 #endif

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index c434fa2b1bc06ee05197c0111476bfc5290bab9b..5fc7a8c8f477d01423634ec821a447fad618decc 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -14,10 +14,6 @@
 #define CONFIG_SPL_MMC_SUPPORT
 #include "imx6_spl.h"
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
 #define CONFIG_IMX6_THERMAL
 
 #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)

diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 22ddbb8fa027b0095b0437cdfd3378c3707c402f..7a124e0f2031d52e8e435be6286a6a2389610e64 100644 (file)
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -11,10 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
 

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index aed399d47204de15738b26d8d6a65012408c1d54..ad288f4a650d9c61b6babcf900aa6de1edeb25f5 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -11,11 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 #define CONFIG_IMX6_THERMAL
 
 /* Size of malloc() pool */

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 6fe71ffc433f11bfa6f2aeb76ca64e026ec81927..2fbb0df4fdb24ba0e58b2e0547928e7fe5850d8b 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -14,11 +14,6 @@
 #define MACH_TYPE_MX6SLEVK             4307
 #define CONFIG_MACH_TYPE               MACH_TYPE_MX6SLEVK
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (3 * SZ_1M)
 

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 5e4a406313352139cf54aad69b54ac01b1c65214..e1abbcfdbabbfc103f11d2cbb2456b4d3f6ed4d6 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -18,11 +18,6 @@
 #include "imx6_spl.h"
 #endif
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (3 * SZ_1M)
 

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 0106c7aef7bcdce4ec2ea2240a5e2e1b27f7961c..ecfc3930a0a62924ce66a090fefddacdcee02e40 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -14,11 +14,6 @@
 
 #define CONFIG_MACH_TYPE       3769
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (10 * 1024 * 1024)
 

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 0138af81a26eaf50c0b96543218e4c0691ea9799..841edac0cb91817348163db00c25c1dcca808321 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -110,11 +110,6 @@
 #define CONFIG_SPL_MMC_SUPPORT
 #include "imx6_spl.h"                  /* common IMX6 SPL configuration */
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Ethernet Configuration */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_FEC_MXC

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 1596ad839ebdfeacf4f16a822383ee2bc7eda69f..afd9385226ef4fbadd44deb30b789095c7346bcb 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -10,11 +10,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN           (10 * 1024 * 1024)
 

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index de885abb234ea0132456d7d4b268419ba4fae71c..75d459fb9bcf0d84b703cb1b3d17f9e3e03eda25 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -144,12 +144,6 @@
  * U-Boot configuration
  */
 
-/* Tag config */
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Board startup config */
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R

diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index 227dd77e1a16fe489ff08e679e9e04b8c1c3d3b3..60d84164cd9585e6181808947fc711d46c3689a4 100644 (file)
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -11,10 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
 #define CONFIG_BOARD_REVISION_TAG
 
 /* Size of malloc() pool */

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 2dbb2eedd2641244a53049605e3583f1ea57b736..0abb092fa8a497513ea005702250b684b7e39938 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -16,11 +16,6 @@
 
 #define CONFIG_MACH_TYPE               3980
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MXC_GPIO
 #define CONFIG_CMD_GPIO

diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 1b409f69c12d485bb9068a4320d6f399e4cf1663..f09ad8bd842ed6a67713ee0efbb43d33941c771b 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -20,11 +20,6 @@
 #define MACH_TYPE_TITANIUM             3769
 #define CONFIG_MACH_TYPE               MACH_TYPE_TITANIUM
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (2 * 1024 * 1024)
 

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index f7dc1dc2e70566fc34ad991bd03c54af69fc6ee0..b929d8db13e53dea9ab2cd281e40229fc2e060fb 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -30,11 +30,6 @@
 #define PHYS_SDRAM_SIZE                        (1024u * SZ_1M)
 #endif
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
 

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 1da5d21a329832ee5bd12fe19648898bfd6766b9..c51e05ac5d6d99043a443b7431468083130719c8 100644 (file)
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -14,11 +14,6 @@
 #define MACH_TYPE_UDOO         4800
 #define CONFIG_MACH_TYPE       MACH_TYPE_UDOO
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (2 * SZ_1M)
 

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index d903c98245d562515e7706e9a8bb8711f176e024..1ec23eea3e5110396e335df1867e225824cc9f67 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -18,11 +18,6 @@
 #define MACH_TYPE_WANDBOARD            4412
 #define CONFIG_MACH_TYPE               MACH_TYPE_WANDBOARD
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
 

diff --git a/include/configs/warp.h b/include/configs/warp.h
index 874e8d17421e5408141205f880e3e781f2cabc37..83afc7f93f39cc4e4b670b0dabb28f029a0f4720 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -15,11 +15,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (35 * SZ_1M) /* Increase due to DFU */