Delete board specific Kconfig entries for DISPLAY_BOARDINFO and create a common entry. Select it for all TI SoCs and the boards that already has Kconfig entry.
Signed-off-by: Lokesh Vutla lokeshvutla@ti.com --- arch/arm/cpu/armv7/am33xx/Kconfig | 11 +++++++++++ arch/arm/cpu/armv7/omap3/Kconfig | 8 ++++++++ arch/arm/cpu/armv7/omap5/Kconfig | 4 ++++ arch/arm/mach-keystone/Kconfig | 4 ++++ arch/powerpc/cpu/ppc4xx/Kconfig | 14 ++++++++++++++ board/amcc/acadia/Kconfig | 4 ---- board/amcc/bamboo/Kconfig | 4 ---- board/amcc/bubinga/Kconfig | 4 ---- board/amcc/canyonlands/Kconfig | 4 ---- board/amcc/katmai/Kconfig | 4 ---- board/amcc/kilauea/Kconfig | 4 ---- board/amcc/luan/Kconfig | 4 ---- board/amcc/makalu/Kconfig | 4 ---- board/amcc/redwood/Kconfig | 4 ---- board/amcc/sequoia/Kconfig | 4 ---- board/amcc/walnut/Kconfig | 4 ---- board/amcc/yosemite/Kconfig | 4 ---- board/amcc/yucca/Kconfig | 4 ---- board/liebherr/lwmon5/Kconfig | 4 ---- common/Kconfig | 8 ++++++++ include/configs/ti_omap4_common.h | 1 - include/configs/ti_omap5_common.h | 2 -- 22 files changed, 49 insertions(+), 59 deletions(-)
diff --git a/arch/arm/cpu/armv7/am33xx/Kconfig b/arch/arm/cpu/armv7/am33xx/Kconfig index e57e6fb..394db1a 100644 --- a/arch/arm/cpu/armv7/am33xx/Kconfig +++ b/arch/arm/cpu/armv7/am33xx/Kconfig @@ -10,6 +10,7 @@ config TARGET_AM335X_EVM select DM_SERIAL select DM_GPIO select TI_I2C_BOARD_DETECT + select DISPLAY_BOARDINFO help This option specifies support for the AM335x GP and HS EVM development platforms. The AM335x @@ -23,28 +24,33 @@ config TARGET_AM335X_BALTOS select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_AM335X_IGEP0033 bool "Support am335x_igep0033" select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_AM335X_SHC bool "Support am335x based shc board from bosch" select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_AM335X_SL50 bool "Support am335x_sl50" select DM select DM_SERIAL + select DISPLAY_BOARDINFO
config TARGET_BAV335X bool "Support bav335x" select DM select DM_SERIAL + select DISPLAY_BOARDINFO help The BAV335x OEM Network Processor integrates all the functions of an embedded network computer in a small, easy to use SODIMM module which @@ -59,24 +65,28 @@ config TARGET_CM_T335 select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_PCM051 bool "Support pcm051" select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_PENGWYN bool "Support pengwyn" select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_PEPPER bool "Support pepper" select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
endchoice
@@ -86,6 +96,7 @@ if AM43XX config TARGET_AM43XX_EVM bool "Support am43xx_evm" select TI_I2C_BOARD_DETECT + select DISPLAY_BOARDINFO help This option specifies support for the AM43xx GP and HS EVM development platforms.The AM437x diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig index 99a25f9..c4f1808 100644 --- a/arch/arm/cpu/armv7/omap3/Kconfig +++ b/arch/arm/cpu/armv7/omap3/Kconfig @@ -15,6 +15,7 @@ config TARGET_OMAP3_BEAGLE select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_CM_T35 bool "CompuLab CM-T3530 and CM-T3730 boards" @@ -27,6 +28,7 @@ config TARGET_DEVKIT8000 select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_OMAP3_EVM bool "TI OMAP3 EVM" @@ -36,18 +38,21 @@ config TARGET_OMAP3_IGEP00X0 select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_OMAP3_OVERO bool "OMAP35xx Gumstix Overo" select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_OMAP3_ZOOM1 bool "TI Zoom1" select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_AM3517_CRANE bool "am3517_crane" @@ -69,6 +74,7 @@ config TARGET_OMAP3_LOGIC select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_NOKIA_RX51 bool "Nokia RX51" @@ -84,12 +90,14 @@ config TARGET_OMAP3_CAIRO select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
config TARGET_SNIPER bool "LG Optimus Black" select DM select DM_SERIAL select DM_GPIO + select DISPLAY_BOARDINFO
endchoice
diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig index a8600b1..b9ff86c 100644 --- a/arch/arm/cpu/armv7/omap5/Kconfig +++ b/arch/arm/cpu/armv7/omap5/Kconfig @@ -6,18 +6,22 @@ choice
config TARGET_CM_T54 bool "CompuLab CM-T54" + select DISPLAY_BOARDINFO
config TARGET_OMAP5_UEVM bool "TI OMAP5 uEVM board" + select DISPLAY_BOARDINFO
config TARGET_DRA7XX_EVM bool "TI DRA7XX" select TI_I2C_BOARD_DETECT select PHYS_64BIT + select DISPLAY_BOARDINFO
config TARGET_AM57XX_EVM bool "AM57XX" select TI_I2C_BOARD_DETECT + select DISPLAY_BOARDINFO
endchoice
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig index e1962c7..cd00f1a 100644 --- a/arch/arm/mach-keystone/Kconfig +++ b/arch/arm/mach-keystone/Kconfig @@ -6,15 +6,19 @@ choice
config TARGET_K2HK_EVM bool "TI Keystone 2 Kepler/Hawking EVM" + select DISPLAY_BOARDINFO
config TARGET_K2E_EVM bool "TI Keystone 2 Edison EVM" + select DISPLAY_BOARDINFO
config TARGET_K2L_EVM bool "TI Keystone 2 Lamar EVM" + select DISPLAY_BOARDINFO
config TARGET_K2G_EVM bool "TI Keystone 2 Galileo EVM" + select DISPLAY_BOARDINFO
endchoice
diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index 92a330d..bf7a988 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -10,51 +10,65 @@ choice
config TARGET_LWMON5 bool "Support lwmon5" + select DISPLAY_BOARDINFO
config TARGET_T3CORP bool "Support t3corp"
config TARGET_ACADIA bool "Support acadia" + select DISPLAY_BOARDINFO
config TARGET_BAMBOO bool "Support bamboo" + select DISPLAY_BOARDINFO
config TARGET_BUBINGA bool "Support bubinga" + select DISPLAY_BOARDINFO
config TARGET_CANYONLANDS bool "Support canyonlands" select DM select DM_SERIAL + select DISPLAY_BOARDINFO
config TARGET_KATMAI bool "Support katmai" select PHYS_64BIT + select DISPLAY_BOARDINFO
config TARGET_KILAUEA bool "Support kilauea" + select DISPLAY_BOARDINFO
config TARGET_LUAN bool "Support luan" + select DISPLAY_BOARDINFO
config TARGET_MAKALU bool "Support makalu" + select DISPLAY_BOARDINFO
config TARGET_REDWOOD bool "Support redwood" + select DISPLAY_BOARDINFO
config TARGET_SEQUOIA bool "Support sequoia" + select DISPLAY_BOARDINFO
config TARGET_WALNUT bool "Support walnut" + select DISPLAY_BOARDINFO
config TARGET_YOSEMITE bool "Support yosemite" + select DISPLAY_BOARDINFO
config TARGET_YUCCA bool "Support yucca" + select DISPLAY_BOARDINFO
config TARGET_CPCI2DP bool "Support CPCI2DP" diff --git a/board/amcc/acadia/Kconfig b/board/amcc/acadia/Kconfig index 7c0ef53..033deaf 100644 --- a/board/amcc/acadia/Kconfig +++ b/board/amcc/acadia/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "acadia"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/bamboo/Kconfig b/board/amcc/bamboo/Kconfig index d44a36a..c0bd40a 100644 --- a/board/amcc/bamboo/Kconfig +++ b/board/amcc/bamboo/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "bamboo"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/bubinga/Kconfig b/board/amcc/bubinga/Kconfig index fc40f6e..540d9b6 100644 --- a/board/amcc/bubinga/Kconfig +++ b/board/amcc/bubinga/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "bubinga"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig index a655dbc..cea6009 100644 --- a/board/amcc/canyonlands/Kconfig +++ b/board/amcc/canyonlands/Kconfig @@ -30,8 +30,4 @@ config ARCHES
endchoice
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/katmai/Kconfig b/board/amcc/katmai/Kconfig index 59d3ef5..fc606cf 100644 --- a/board/amcc/katmai/Kconfig +++ b/board/amcc/katmai/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "katmai"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/kilauea/Kconfig b/board/amcc/kilauea/Kconfig index 5dfd9eb..3f2f434 100644 --- a/board/amcc/kilauea/Kconfig +++ b/board/amcc/kilauea/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kilauea"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/luan/Kconfig b/board/amcc/luan/Kconfig index 36b44ff..3df90af 100644 --- a/board/amcc/luan/Kconfig +++ b/board/amcc/luan/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "luan"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/makalu/Kconfig b/board/amcc/makalu/Kconfig index 7f8498a..31ce5f1 100644 --- a/board/amcc/makalu/Kconfig +++ b/board/amcc/makalu/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "makalu"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/redwood/Kconfig b/board/amcc/redwood/Kconfig index fee6441..d710590 100644 --- a/board/amcc/redwood/Kconfig +++ b/board/amcc/redwood/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "redwood"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/sequoia/Kconfig b/board/amcc/sequoia/Kconfig index 6e6e408..67ee3ca 100644 --- a/board/amcc/sequoia/Kconfig +++ b/board/amcc/sequoia/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "sequoia"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/walnut/Kconfig b/board/amcc/walnut/Kconfig index d4c451d..94e3dc9 100644 --- a/board/amcc/walnut/Kconfig +++ b/board/amcc/walnut/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "walnut"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/yosemite/Kconfig b/board/amcc/yosemite/Kconfig index ec51236..dfa1068 100644 --- a/board/amcc/yosemite/Kconfig +++ b/board/amcc/yosemite/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "yosemite"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/amcc/yucca/Kconfig b/board/amcc/yucca/Kconfig index 338b6a9..61d9589 100644 --- a/board/amcc/yucca/Kconfig +++ b/board/amcc/yucca/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "yucca"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/board/liebherr/lwmon5/Kconfig b/board/liebherr/lwmon5/Kconfig index 7f1bb40..ec8349d 100644 --- a/board/liebherr/lwmon5/Kconfig +++ b/board/liebherr/lwmon5/Kconfig @@ -9,8 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "lwmon5"
-config DISPLAY_BOARDINFO - bool - default y - endif diff --git a/common/Kconfig b/common/Kconfig index 041c493..8181152 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -211,3 +211,11 @@ config DISPLAY_CPUINFO Display information about the CPU that U-Boot is running on when U-Boot starts up. The function print_cpuinfo() is called to do this. + +config DISPLAY_BOARDINFO + bool + default n + 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. diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 5c2360d..24d4c83 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -17,7 +17,6 @@ */ #define CONFIG_OMAP4430 1 /* which is in a 4430 */ #define CONFIG_MISC_INIT_R -#define CONFIG_DISPLAY_BOARDINFO 1
#define CONFIG_SYS_THUMB_BUILD
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 98031a2..2d859e1 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -17,8 +17,6 @@ #ifndef __CONFIG_TI_OMAP5_COMMON_H #define __CONFIG_TI_OMAP5_COMMON_H
-#define CONFIG_DISPLAY_BOARDINFO - /* Common ARM Erratas */ #define CONFIG_ARM_ERRATA_798870