imx6: move generic imx6 options to mx6_common.h

All boards define CONFIG_MX6, CONFIG_DISPLAY_BOARDINFO, CONFIG_DISPLAY_CPUINFO
and CONFIG_SYS_GENERIC_BOARD so define them in mx6_common

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

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index e9a0d46bc83d3ccf4dd4d18b62ba26807890f1f4..00e2908f2b23d6e4404459dc52bd72b7b37bd021 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -13,19 +13,12 @@
 #ifndef __ARISTAINETOS_COMMON_CONFIG_H
 #define __ARISTAINETOS_COMMON_CONFIG_H
 
-#define CONFIG_MX6
-
 #include "mx6_common.h"
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MACH_TYPE       4501
 #define CONFIG_MMCROOT         "/dev/mmcblk0p1"
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (64 * SZ_1M)
 

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index f8e5e57772da6de75e274c8d204be4521143359a..211e75f8697bd7866bd5c044a0184752bd7c5926 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -13,13 +13,8 @@
 #ifndef __CONFIG_CGTQMX6EVAL_H
 #define __CONFIG_CGTQMX6EVAL_H
 
-#define CONFIG_MX6
-
 #include "mx6_common.h"
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MACH_TYPE       4122
 
 #define CONFIG_CMDLINE_TAG

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 529e5ab956fec23fd97bce9fa49fdd8f74ee68e0..aae3044cff3059b80caa5e06d63cdeab00880654 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -14,7 +14,6 @@
 #include "mx6_common.h"
 
 /* Machine config */
-#define CONFIG_MX6
 #define CONFIG_SYS_LITTLE_ENDIAN
 #define CONFIG_MACH_TYPE               4273
 
@@ -22,11 +21,6 @@
 #define CONFIG_CMD_GPIO
 #endif
 
-/* Display information on boot */
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_TIMESTAMP
-
 /* CMD */
 #define CONFIG_CMD_GREPENV
 #undef CONFIG_CMD_LOADB
@@ -271,7 +265,6 @@
 #define CONFIG_SERIAL_TAG
 
 /* misc */
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_STACKSIZE                       (128 * 1024)
 #define CONFIG_SYS_MALLOC_LEN                  (10 * 1024 * 1024)
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     800 /* 400 KB */

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index b3ebb84261ae3cac111ae32160cf6b9f392a52fa..a033a630159228719e5a298254728eae3e24e8bd 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -15,19 +15,12 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_MXC_UART_BASE           UART2_BASE
 #define CONFIG_CONSOLE_DEV             "ttymxc1"
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"
 
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
-#define CONFIG_MX6
-
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 14b6ad9c02a68bd9c053710d0e4fa9995218843f..41f9c9c9e4253132b074dcf928e568806975766a 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -33,9 +33,6 @@
 
 #include "imx6_spl.h"                  /* common IMX6 SPL configuration */
 #include "mx6_common.h"
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO         /* display cpu info */
-#define CONFIG_DISPLAY_BOARDINFO_LATE  /* display board info (after reloc) */
 
 #define CONFIG_MACH_TYPE       4520   /* Gateworks Ventana Platform */
 
@@ -46,8 +43,6 @@
 #define CONFIG_SERIAL_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* 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 85bf03943aed307a77e013fe61fb689be7a9c4fc..0e5706b892a39a4b8a9088aee75534ac29276e0b 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -38,4 +38,12 @@
 #include <asm/imx-common/gpio.h>
 #include <config_cmd_default.h>
 
+#ifndef CONFIG_MX6
+#define CONFIG_MX6
+#endif
+
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_SYS_GENERIC_BOARD
+
 #endif

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 9f260bba872b53acae72d742c23018953ca2de55..c434fa2b1bc06ee05197c0111476bfc5290bab9b 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -10,19 +10,15 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_MMC_SUPPORT
 #include "imx6_spl.h"
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 #define CONFIG_IMX6_THERMAL
-#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
 #define CONFIG_BOARD_EARLY_INIT_F

diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 6233b125b78042d177872faf81a5f7eac1acc661..22ddbb8fa027b0095b0437cdfd3378c3707c402f 100644 (file)
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -9,19 +9,12 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MX6
-
 #include "mx6_common.h"
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* 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 9b80af5390f366291ead963871006083c88c43e4..aed399d47204de15738b26d8d6a65012408c1d54 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -9,13 +9,8 @@
 #ifndef __MX6QSABRE_COMMON_CONFIG_H
 #define __MX6QSABRE_COMMON_CONFIG_H
 
-#define CONFIG_MX6
-
 #include "mx6_common.h"
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
@@ -23,8 +18,6 @@
 
 #define CONFIG_IMX6_THERMAL
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
 

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 36430eba6a98a10a7cd6013caedf24481cf32dfe..6fe71ffc433f11bfa6f2aeb76ca64e026ec81927 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -11,10 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define MACH_TYPE_MX6SLEVK             4307
 #define CONFIG_MACH_TYPE               MACH_TYPE_MX6SLEVK
 
@@ -23,8 +19,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* 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 7c800d0aded25fa13abdaafe4fef866ea5cef94d..5e4a406313352139cf54aad69b54ac01b1c65214 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -12,10 +12,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #ifdef CONFIG_SPL
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_MMC_SUPPORT
@@ -26,7 +22,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD
 
 /* 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 1432b866b441e3bb50c526ed352a22730ab4475d..0106c7aef7bcdce4ec2ea2240a5e2e1b27f7961c 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -11,9 +11,6 @@
 #define __CONFIG_H
 
 #include "mx6_common.h"
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_MACH_TYPE       3769
 
@@ -21,7 +18,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD
 
 /* 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 c2e8ae0af1c6a08fdd3a1e5b171bde35f88444ea..0138af81a26eaf50c0b96543218e4c0691ea9799 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -10,19 +10,15 @@
 #define __CONFIG_H
 
 /* System configurations */
-#define CONFIG_MX6
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MISC_INIT_R
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_FIT
 #define CONFIG_KEYBOARD
 #define CONFIG_MXC_GPIO
 #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD
 
 #include "mx6_common.h"
 

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 15c49d97b49c08b4e559292b9754e00040380f20..1596ad839ebdfeacf4f16a822383ee2bc7eda69f 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -9,15 +9,11 @@
 #define __CONFIG_H
 
 #include "mx6_common.h"
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD
 
 /* 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 15f619bbaf491058dfa892e86327a9873a25e0e4..de885abb234ea0132456d7d4b268419ba4fae71c 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -7,8 +7,6 @@
 #ifndef __PLATINUM_CONFIG_H__
 #define __PLATINUM_CONFIG_H__
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* SPL */
 #define CONFIG_SPL_NAND_SUPPORT
 #define CONFIG_SPL_MMC_SUPPORT
@@ -146,10 +144,6 @@
  * U-Boot configuration
  */
 
-/* Console boot messages */
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 /* Tag config */
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS

diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h
index 4590df5a9e9f68574ea7bbb0bcc294c66c13a9d4..f5b476f462e1c19275a52e48c2a5a6f4eade8059 100644 (file)
--- a/include/configs/platinum_picon.h
+++ b/include/configs/platinum_picon.h
@@ -12,8 +12,6 @@
 #define CONFIG_PLATINUM_PROJECT                        "picon"
 #define CONFIG_PLATINUM_CPU                    "imx6dl"
 
-#define CONFIG_MX6
-
 #include <configs/platinum.h>
 
 #define CONFIG_FEC_XCV_TYPE                    RMII

diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h
index 678965505f630ee2fb375bec66c3f11ee7c50c2d..9bca10fdf91553a243b4329b75d7057d544c41c1 100644 (file)
--- a/include/configs/platinum_titanium.h
+++ b/include/configs/platinum_titanium.h
@@ -12,8 +12,6 @@
 #define CONFIG_PLATINUM_PROJECT                        "titanium"
 #define CONFIG_PLATINUM_CPU                    "imx6q"
 
-#define CONFIG_MX6
-
 #define PHYS_SDRAM_SIZE                                (512 << 20)
 #define CONFIG_SYS_NAND_MAX_CHIPS              1
 

diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index b779d78693ede454cee622fcf7dc3136f5abb45c..227dd77e1a16fe489ff08e679e9e04b8c1c3d3b3 100644 (file)
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -11,10 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 1fed6d8c6a9c710974a87b12b8944934093b25ec..2dbb2eedd2641244a53049605e3583f1ea57b736 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -12,9 +12,6 @@
 #include "mx6_common.h"
 
 /* General configuration */
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO_LATE
 #define CONFIG_SYS_THUMB_BUILD
 
 #define CONFIG_MACH_TYPE               3980
@@ -23,7 +20,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MXC_GPIO

diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 74cb78b83f377d7f3208b691893c9f7338456802..1b409f69c12d485bb9068a4320d6f399e4cf1663 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -15,10 +15,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
 #define CONFIG_MX6Q
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
 
 #define MACH_TYPE_TITANIUM             3769
 #define CONFIG_MACH_TYPE               MACH_TYPE_TITANIUM

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 7ba6b5fc6465a87e0585e40b01f3bebc3d930eb1..f7dc1dc2e70566fc34ad991bd03c54af69fc6ee0 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -9,8 +9,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MX6
-
 /* SPL */
 /* #if defined(CONFIG_SPL_BUILD) */
 
@@ -32,10 +30,6 @@
 #define PHYS_SDRAM_SIZE                        (1024u * SZ_1M)
 #endif
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 7741f688a3974e644a1c7aa29480410b1137cc51..1da5d21a329832ee5bd12fe19648898bfd6766b9 100644 (file)
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -11,10 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define MACH_TYPE_UDOO         4800
 #define CONFIG_MACH_TYPE       MACH_TYPE_UDOO
 
@@ -23,8 +19,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* 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 4609f3e709023dbfd7e2c728264a037f93900706..d903c98245d562515e7706e9a8bb8711f176e024 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -15,10 +15,6 @@
 #define CONFIG_SPL_MMC_SUPPORT
 #include "imx6_spl.h"
 
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define MACH_TYPE_WANDBOARD            4412
 #define CONFIG_MACH_TYPE               MACH_TYPE_WANDBOARD
 
@@ -27,8 +23,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* 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 c066fc55bfe8a2770dc6a1bb9ab151c19b8d9065..874e8d17421e5408141205f880e3e781f2cabc37 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -15,11 +15,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG