From 47855a5c3bf8aa2ad2bd48016d48c89bc1e2641c Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 13 Jul 2016 00:25:40 -0700 Subject: [PATCH] mx7_common: Put display board info config into board file CONFIG_DISPLAY_BOARDINFO should not be placed in mx7_common because some boards might need a different config such as CONFIG_DISPLAY_BOARDINFO_LATE. Move it to the board file instead. Signed-off-by: Stefan Agner --- include/configs/mx7_common.h | 1 - include/configs/mx7dsabresd.h | 2 ++ include/configs/warp7.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index bc2833c4ff..5dd6207f69 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -31,7 +31,6 @@ #define CONFIG_ARCH_MISC_INIT #define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_LOADADDR 0x80800000 #define CONFIG_SYS_TEXT_BASE 0x87800000 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index cfaf59bbe9..822d81f3dc 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -22,6 +22,8 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT +#define CONFIG_DISPLAY_BOARDINFO + /* Uncomment to enable secure boot support */ /* #define CONFIG_SECURE_BOOT */ #define CONFIG_CSF_SIZE 0x4000 diff --git a/include/configs/warp7.h b/include/configs/warp7.h index af39817b23..4c6e23cebf 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -21,6 +21,8 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT +#define CONFIG_DISPLAY_BOARDINFO + /* MMC Config*/ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR #define CONFIG_SUPPORT_EMMC_BOOT -- 2.25.1