[PATCH 10/10] Convert CONFIG_BOARD_EARLY_INIT_F et al to Kconfig
Tom Rini
trini at konsulko.com
Sun Oct 31 04:03:57 CET 2021
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 at konsulko.com>
---
configs/apalis-imx8_defconfig | 1 +
configs/cgtqmx8_defconfig | 1 +
configs/colibri-imx8x_defconfig | 1 +
configs/imx8ulp_evk_defconfig | 2 ++
configs/r2dplus_defconfig | 1 +
configs/stm32f746-disco_defconfig | 1 -
configs/stm32f769-disco_defconfig | 1 -
configs/x530_defconfig | 1 +
include/configs/apalis-imx8.h | 2 --
include/configs/apalis_imx6.h | 2 --
include/configs/cgtqmx8.h | 2 --
include/configs/colibri-imx8x.h | 2 --
include/configs/colibri_imx6.h | 2 --
include/configs/imx8ulp_evk.h | 3 ---
include/configs/r2dplus.h | 2 --
include/configs/stm32f746-disco.h | 2 --
include/configs/topic_miami.h | 1 -
include/configs/x530.h | 2 --
18 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig
index a92204a9f95a..92ec9c6dd321 100644
--- 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 4abe29e1d229..3c86663f2755 100644
--- 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 ea0679602647..76da33e80364 100644
--- 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 23afbbb914dd..2a627f9df055 100644
--- 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 16a24c30b214..ff7dc8560d8d 100644
--- 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 e5e7ef798c39..864ea871041f 100644
--- 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 bb122d691d56..aa04fe3dfbcc 100644
--- 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 6ba7ee2131e4..6f73eacfe9de 100644
--- 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 b4411654880e..27007c57b3cd 100644
--- 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 23fca1e447be..dfed1615b9be 100644
--- 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 7ddd731a53fd..d9b59b98cdf8 100644
--- 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 03c363858669..82926afbdf60 100644
--- 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 44135b2f2147..b103186bf463 100644
--- 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 919eb5fff241..3d506ba37f3d 100644
--- 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 36930fa3f1a7..58ca6c28b53f 100644
--- 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 493699e9507e..2f2a349dcdcd 100644
--- 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 cbb5c6dea032..88bb4a8fd5ed 100644
--- 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 f4d64495ffaf..e78e249e41ae 100644
--- 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
*/
--
2.25.1
More information about the U-Boot
mailing list