[U-Boot] [PATCH 4/7] treewide: Migrate CONFIG_DISPLAY_BOARDINFO_LATE to Kconfig
Mario Six
mario.six at gdsys.cc
Wed Mar 28 12:38:17 UTC 2018
Migrate the CONFIG_DISPLAY_BOARDINFO_LATE option to Kconfig.
Signed-off-by: Mario Six <mario.six at gdsys.cc>
---
common/Kconfig | 9 ++++++++-
include/configs/10m50_devboard.h | 1 -
include/configs/3c120_devboard.h | 1 -
include/configs/apalis-tk1.h | 1 -
include/configs/apalis_imx6.h | 1 -
include/configs/apalis_t30.h | 1 -
include/configs/clearfog.h | 2 --
include/configs/colibri_imx6.h | 1 -
include/configs/colibri_imx7.h | 2 --
include/configs/colibri_pxa270.h | 2 --
include/configs/colibri_t20.h | 1 -
include/configs/colibri_t30.h | 1 -
include/configs/colibri_vf.h | 2 --
include/configs/controlcenterdc.h | 1 -
include/configs/db-88f6720.h | 1 -
include/configs/db-88f6820-amc.h | 2 --
include/configs/db-88f6820-gp.h | 2 --
include/configs/db-mv784mp-gp.h | 2 --
include/configs/ds414.h | 1 -
include/configs/gw_ventana.h | 1 -
include/configs/ls1012a_common.h | 2 --
include/configs/ls1088aqds.h | 3 ---
include/configs/ls1088ardb.h | 4 ----
include/configs/maxbcm.h | 1 -
include/configs/mvebu_armada-37xx.h | 1 -
include/configs/mvebu_armada-8k.h | 2 --
include/configs/nyan-big.h | 2 --
include/configs/pcm058.h | 1 -
include/configs/pfla02.h | 1 -
include/configs/rockchip-common.h | 2 --
include/configs/sandbox.h | 1 -
include/configs/socfpga_common.h | 1 -
include/configs/theadorable.h | 1 -
include/configs/turris_omnia.h | 1 -
include/configs/wandboard.h | 1 -
include/configs/x86-common.h | 1 -
36 files changed, 8 insertions(+), 52 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig
index 5c90ce4629..03eeeb2402 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -561,13 +561,20 @@ config DISPLAY_CPUINFO
to do this.
config DISPLAY_BOARDINFO
- bool "Display information about the board during start up"
+ bool "Display information about the board during early start up"
default y if ARM || M68K || MIPS || PPC || SANDBOX || XTENSA
help
Display information about the board that U-Boot is running on
when U-Boot starts up. The board function checkboard() is called
to do this.
+config DISPLAY_BOARDINFO_LATE
+ bool "Display information about the board during late start up"
+ help
+ Display information about the board that U-Boot is running on after
+ the relocation phase. The board function checkboard() is called to do
+ this.
+
menu "Start-up hooks"
config ARCH_EARLY_INIT_R
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index c9742f37f4..b737e461c7 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -12,7 +12,6 @@
/*
* BOARD/CPU
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/*
* SERIAL
diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index afd6488e10..e64f6d8503 100644
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -12,7 +12,6 @@
/*
* BOARD/CPU
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/*
* SERIAL
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 5f53a52511..f9970b81dc 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -16,7 +16,6 @@
#define CONFIG_ARCH_MISC_INIT
/* High-level configuration options */
-#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 9beeb4ae8d..9ebd9e58ad 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -12,7 +12,6 @@
#include "mx6_common.h"
#undef CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
#define CONFIG_MACH_TYPE 4886
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 16dce4af9e..9d59e69cba 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -14,7 +14,6 @@
#include "tegra30-common.h"
/* High-level configuration options */
-#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index fd2659b592..c5bd2ed336 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -11,8 +11,6 @@
* High Level Configuration Options (easy to change)
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
* for DDR ECC byte filling in the SPL before loading the main
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index f13b54a1fd..061df71a03 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -12,7 +12,6 @@
#include "mx6_common.h"
#undef CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
#define CONFIG_SYS_GENERIC_BOARD
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 27f44acde6..6f97c1e065 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -17,8 +17,6 @@
/*#define CONFIG_DBG_MONITOR*/
#define PHYS_SDRAM_SIZE SZ_512M
-#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
-
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
/* Size of malloc() pool */
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 484483da58..2588731215 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -20,8 +20,6 @@
/* We will never enable dcache because we have to setup MMU first */
#define CONFIG_SYS_DCACHE_OFF
-#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
-
/*
* Environment settings
*/
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index e7f9405111..4bd825eedb 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -12,7 +12,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 8a4ab6a3e8..3ec91d6b9c 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -14,7 +14,6 @@
#include "tegra30-common.h"
/* High-level configuration options */
-#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 1078480f09..995cb86e54 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -16,8 +16,6 @@
#define CONFIG_SYS_FSL_CLK
-#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
-
#define CONFIG_SKIP_LOWLEVEL_INIT
#ifdef CONFIG_CMD_FUSE
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 30a9e853ed..2b7dc7c2cf 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -14,7 +14,6 @@
#define CONFIG_CUSTOMER_BOARD_SUPPORT
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
-#define CONFIG_DISPLAY_BOARDINFO_LATE
#define CONFIG_BOARD_LATE_INIT
/*
diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index b1296d3c13..066b7def0e 100644
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -10,7 +10,6 @@
/*
* High Level Configuration Options (easy to change)
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index e6c040cb52..915432ae26 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -11,8 +11,6 @@
* High Level Configuration Options (easy to change)
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
* for DDR ECC byte filling in the SPL before loading the main
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index ec500e7c83..bcc919d86d 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -11,8 +11,6 @@
* High Level Configuration Options (easy to change)
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
* for DDR ECC byte filling in the SPL before loading the main
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 5dc0a45983..f886591159 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -12,8 +12,6 @@
*/
#define CONFIG_DB_784MP_GP /* Board target name for DDR training */
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
* for DDR ECC byte filling in the SPL before loading the main
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index a47cd6431a..e137c0fd2a 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -10,7 +10,6 @@
/*
* High Level Configuration Options (easy to change)
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 4845c9fce5..a470bd8f4c 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -24,7 +24,6 @@
#include "imx6_spl.h" /* common IMX6 SPL configuration */
#include "mx6_common.h"
-#define CONFIG_DISPLAY_BOARDINFO_LATE
#define CONFIG_MACH_TYPE 4520 /* Gateworks Ventana Platform */
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 0f8033f5b4..91e6da03b1 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -13,8 +13,6 @@
#include <asm/arch/config.h>
#include <asm/arch/stream_id_lsch2.h>
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
#define CONFIG_SYS_CLK_FREQ 125000000
#define CONFIG_SKIP_LOWLEVEL_INIT
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 34f991caa5..10785222af 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -10,9 +10,6 @@
#include "ls1088a_common.h"
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
-
#ifndef __ASSEMBLY__
unsigned long get_board_sys_clk(void);
unsigned long get_board_ddr_clk(void);
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 3f2a00820a..22ec47ecdd 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -9,10 +9,6 @@
#include "ls1088a_common.h"
-#ifndef SPL_NO_BOARDINFO
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-#endif
-
#define CONFIG_MISC_INIT_R
#if defined(CONFIG_QSPI_BOOT)
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index d4c7b06494..93597db236 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -10,7 +10,6 @@
/*
* High Level Configuration Options (easy to change)
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index ad5a449653..f4647b0b03 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -10,7 +10,6 @@
/*
* High Level Configuration Options (easy to change)
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/* additions for new ARM relocation support */
#define CONFIG_SYS_SDRAM_BASE 0x00000000
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 3385afd72a..723866cec3 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -12,8 +12,6 @@
*/
#define CONFIG_SYS_TCLK 250000000 /* 250MHz */
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
/* additions for new ARM relocation support */
#define CONFIG_SYS_SDRAM_BASE 0x00000000
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 3b673827bd..ddc36df4cd 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -19,8 +19,6 @@
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
/* I2C */
#define CONFIG_SYS_I2C_TEGRA
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 0bd19b6657..9481e5b5c5 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -27,7 +27,6 @@
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
/* Early setup */
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/* Size of malloc() pool */
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index 86d875dccf..e3c1191817 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -25,7 +25,6 @@
#define CONSOLE_DEV "ttymxc3"
/* Early setup */
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/* Size of malloc() pool */
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 26d41b5075..2c94319d78 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -58,6 +58,4 @@
#endif
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
#endif /* _ROCKCHIP_COMMON_H_ */
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 2b902310f5..4961301765 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -34,7 +34,6 @@
#define CONFIG_SYS_MALLOC_LEN (32 << 20) /* 32MB */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/* turn on command-line edit/c/auto */
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 7833f17cf4..6385357b22 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -12,7 +12,6 @@
/*
* High level configuration
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
#define CONFIG_CLOCKS
#define CONFIG_SYS_BOOTMAPSZ (64 * 1024 * 1024)
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 433ee14e2f..3c2691f952 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -10,7 +10,6 @@
/*
* High Level Configuration Options (easy to change)
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 9ca47f46cc..27ce047f7d 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -13,7 +13,6 @@
*/
#define CONFIG_MISC_INIT_R
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 487cb1f5df..bc2d269070 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -12,7 +12,6 @@
#include "mx6_common.h"
#include "imx6_spl.h"
-#define CONFIG_DISPLAY_BOARDINFO_LATE
#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 3f559b168a..7cf5c2731f 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -17,7 +17,6 @@
*/
#define CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_PHYSMEM
-#define CONFIG_DISPLAY_BOARDINFO_LATE
#define CONFIG_NR_DRAM_BANKS 8
#define CONFIG_LMB
--
2.16.1
More information about the U-Boot
mailing list