Convert CONFIG_BOARD_EARLY_INIT_F et al to Kconfig

This converts the following to Kconfig:
   CONFIG_BOARD_EARLY_INIT_F
   CONFIG_BOARD_LATE_INIT
   CONFIG_DISPLAY_BOARDINFO
   CONFIG_DISPLAY_BOARDINFO_LATE

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig
index ad8840e6d1cbc7271bb238150fca49d46caf5242..45e0670da1a51cd306c6ed4e3af4d9039be1b18b 100644 (file)
--- a/configs/apalis-imx8_defconfig
+++ b/configs/apalis-imx8_defconfig
@@ -17,6 +17,7 @@ CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CMD_CPU=y
 # CONFIG_BOOTM_NETBSD is not set

diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig
index 1cfcbbf3aa7d62807bd3fdfaf6c4b5f2eb2813e2..3d1c438e8ba320e124146a8dc2451a56bbd14ef3 100644 (file)
--- a/configs/cgtqmx8_defconfig
+++ b/configs/cgtqmx8_defconfig
@@ -23,6 +23,7 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_BOOTDELAY=3
 CONFIG_LOG=y
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=0

diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig
index 6b260c1365374d1131eb8cfa501707c78da080fb..22bed95324adf739b6196c35c1562a8ec740b712 100644 (file)
--- a/configs/colibri-imx8x_defconfig
+++ b/configs/colibri-imx8x_defconfig
@@ -16,6 +16,7 @@ CONFIG_SYS_LOAD_ADDR=0x80280000
 CONFIG_FIT=y
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CMD_CPU=y
 # CONFIG_BOOTM_NETBSD is not set

diff --git a/configs/imx8ulp_evk_defconfig b/configs/imx8ulp_evk_defconfig
index 12c0e5eb6a57c99eef49957b6d80c71777dea1bf..b8f18c0a06d6470c04632957b0743ee87fa374c2 100644 (file)
--- a/configs/imx8ulp_evk_defconfig
+++ b/configs/imx8ulp_evk_defconfig
@@ -25,6 +25,8 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=0
 CONFIG_BOOTCOMMAND="run distro_bootcmd;run bsp_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx8ulp-evk"
+CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_BOOTROM_SUPPORT=y
 CONFIG_SPL_SEPARATE_BSS=y

diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index 62f8446bcb7b3711a44eca4e6f5f884fee789a47..7d06dea72135e210e3c02fb5c594835220124a5b 100644 (file)
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -11,6 +11,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC0,115200"
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="pci enum"
+CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_DM=y

diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig
index 888c56bda0234dcb29290338a76b4e2596de4890..352a3d430bab97245d70271bb83dfd6e934325e3 100644 (file)
--- a/configs/stm32f746-disco_defconfig
+++ b/configs/stm32f746-disco_defconfig
@@ -19,7 +19,6 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
 # CONFIG_USE_BOOTCOMMAND is not set
 # CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_CMD_GPT=y

diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig
index bf08aa23ce31888533e9b7aacf0708067ecd12c9..07ec261ba6c9fc23e01a1227448b4e25bf6969a2 100644 (file)
--- a/configs/stm32f769-disco_defconfig
+++ b/configs/stm32f769-disco_defconfig
@@ -19,7 +19,6 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
 # CONFIG_USE_BOOTCOMMAND is not set
 # CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_CMD_GPT=y
 # CONFIG_RANDOM_UUID is not set

diff --git a/configs/x530_defconfig b/configs/x530_defconfig
index dafe7859a86eb0e3edb42f8ab2e743a04e467ad6..b12f4922ece37cb31a3cb3757870a235853ff183 100644 (file)
--- a/configs/x530_defconfig
+++ b/configs/x530_defconfig
@@ -24,6 +24,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_SILENT_CONSOLE=y
 CONFIG_SILENT_U_BOOT_ONLY=y
 CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC=y
+CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_MISC_INIT_R=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_WATCHDOG=y

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index b4411654880e649322b8ea5d02910819f83212b2..27007c57b3cd70b5ed913596be40a28b451684a4 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -11,8 +11,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define USDHC1_BASE_ADDR               0x5b010000
 #define USDHC2_BASE_ADDR               0x5b020000

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 23fca1e447be59b06687040d74fa400d1786a8e6..dfed1615b9be88f2adb852f94abba3b7bd3a126f 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -12,8 +12,6 @@
 
 #include "mx6_common.h"
 
-#undef CONFIG_DISPLAY_BOARDINFO
-
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 

diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 7ddd731a53fd8e162dcbde20166fd03d2966c1de..d9b59b98cdf870582ea1a17da4241d5be93391bf 100644 (file)
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -32,8 +32,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* Flat Device Tree Definitions */
 #define CONFIG_OF_BOARD_SETUP
 

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 03c36385866940e76d6aa0ea23277ac9dd47b627..82926afbdf60192cabc6540f7430bbdfa923c466 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -12,8 +12,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define USDHC1_BASE_ADDR               0x5b010000
 #define USDHC2_BASE_ADDR               0x5b020000

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 44135b2f2147a8f223e0fa89706df1cfdffac945..b103186bf46328acf6b093615af105df21e035eb 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -12,8 +12,6 @@
 
 #include "mx6_common.h"
 
-#undef CONFIG_DISPLAY_BOARDINFO
-
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 

diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 919eb5fff241823d2d082cd3657689150fba5eff..3d506ba37f3dc49e8e92fba943dc6ad00423ddb8 100644 (file)
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -32,9 +32,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-
 /* ENET Config */
 #if defined(CONFIG_FEC_MXC)
 #define CONFIG_ETHPRIME                 "FEC"

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 36930fa3f1a735eb5e9d1c1326f42ba1cfd14785..58ca6c28b53f58953a95ed9e9160fa263dd42f52 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -4,8 +4,6 @@
 #define CONFIG_CPU_SH7751      1
 #define __LITTLE_ENDIAN__      1
 
-#define CONFIG_DISPLAY_BOARDINFO
-
 /* SCIF */
 #define CONFIG_CONS_SCIF1      1
 

diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 493699e9507e477aaafb6e374ad91e45e8f20dca..2f2a349dcdcd9bbf0665bad7031eaabc381f31be 100644 (file)
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -42,8 +42,6 @@
                        "ramdisk_addr_r=0xC0438000\0"           \
                        BOOTENV
 
-#define CONFIG_DISPLAY_BOARDINFO
-
 /* For SPL */
 #ifdef CONFIG_SUPPORT_SPL
 #define CONFIG_SPL_STACK               CONFIG_SYS_INIT_SP_ADDR

diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index cbb5c6dea032cba891731816568301a48b29dd3c..88bb4a8fd5ed7a86fd49fd43ae0bfe0ca33ad58c 100644 (file)
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -98,6 +98,5 @@
 #define CONFIG_BOOTCOMMAND     "if mmcinfo; then " \
        "if fatload mmc 0 0x1900000 ${bootscript}; then source 0x1900000; " \
        "fi; fi; run $modeboot"
-#undef CONFIG_DISPLAY_BOARDINFO
 
 #endif /* __CONFIG_TOPIC_MIAMI_H */

diff --git a/include/configs/x530.h b/include/configs/x530.h
index f4d64495ffafba8a10a324031f55dadc6b24f7d2..e78e249e41ae7184b653fa1ef60ff3958c38d0c8 100644 (file)
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -10,8 +10,6 @@
  * High Level Configuration Options (easy to change)
  */
 
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
 /*
  * NS16550 Configuration
  */