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
--- include/configs/aristainetos.h | 7 ------- include/configs/cgtqmx6eval.h | 5 ----- include/configs/cm_fx6.h | 7 ------- include/configs/embestmx6boards.h | 7 ------- include/configs/gw_ventana.h | 5 ----- include/configs/hummingboard.h | 6 ------ include/configs/mx6_common.h | 5 +++++ include/configs/mx6cuboxi.h | 4 ---- include/configs/mx6qarm2.h | 7 ------- include/configs/mx6sabre_common.h | 7 ------- include/configs/mx6slevk.h | 6 ------ include/configs/mx6sxsabresd.h | 5 ----- include/configs/nitrogen6x.h | 4 ---- include/configs/novena.h | 4 ---- include/configs/ot1200.h | 4 ---- include/configs/platinum.h | 6 ------ include/configs/platinum_picon.h | 2 -- include/configs/platinum_titanium.h | 2 -- include/configs/secomx6quq7.h | 4 ---- include/configs/tbs2910.h | 4 ---- include/configs/titanium.h | 3 --- include/configs/tqma6.h | 6 ------ include/configs/udoo.h | 6 ------ include/configs/wandboard.h | 6 ------ include/configs/warp.h | 5 ----- 25 files changed, 5 insertions(+), 122 deletions(-)
diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index 7bac18c..2865ef6 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -13,20 +13,13 @@ #ifndef __ARISTAINETOS_CONFIG_H #define __ARISTAINETOS_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 CONFIG_HOSTNAME aristainetos #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 d6018fd..fff950e 100644 --- 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 8fd6350..c0607a4 100644 --- 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_FLASH @@ -274,7 +268,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 c327e9b..90ba948 100644 --- 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 7e33f9d..fcdc7fd 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -19,9 +19,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 */
@@ -32,8 +29,6 @@ #define CONFIG_SERIAL_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/hummingboard.h b/include/configs/hummingboard.h index 089472e..d24c257 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -13,10 +13,6 @@
#include "mx6_common.h"
-#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO - #define CONFIG_MACH_TYPE 4773
#define CONFIG_CMDLINE_TAG @@ -24,8 +20,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/mx6_common.h b/include/configs/mx6_common.h index edaa4f6..d6cebec 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -36,4 +36,9 @@ #include <asm/imx-common/gpio.h> #include <config_cmd_default.h>
+#define CONFIG_MX6 +#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 f1f997f..c52874e 100644 --- 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 (2 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index dbb23ab..8d81abb 100644 --- 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 fde36c9..8415ee4 100644 --- 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 a87cb6d..f6cdb97 100644 --- 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 d660ac3..57796b7 100644 --- 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 73262c3..ad970c3 100644 --- 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 75e26bc..15c129a 100644 --- 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 #define CONFIG_SYS_NO_FLASH
#include "mx6_common.h" diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index a371e0c..30c0345 100644 --- 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 80a1e64..ddaad42 100644 --- 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 @@ -150,10 +148,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 4590df5..f5b476f 100644 --- 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 6789655..9bca10f 100644 --- 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 bc8b011..8475021 100644 --- 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 6a9dfb4..6f673b0 100644 --- 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 81f3a1b..08e1de8 100644 --- 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 ee41cd3..a85e2e8 100644 --- 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 51b7582..b4438c0 100644 --- 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 984630b..384654f 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -11,10 +11,6 @@
#include "mx6_common.h"
-#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO - #define MACH_TYPE_WANDBOARD 4412 #define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD
@@ -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 (10 * SZ_1M)
diff --git a/include/configs/warp.h b/include/configs/warp.h index b085c72..3bfce05 100644 --- 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