[U-Boot] [PATCH v2 2/3] ARM: TI: Enable DISPLAY_CPUINFO on all SoCs

Lokesh Vutla
2016-08-30T05:31:33Z

Create a common Kconfig entry for DISPLAY_CPUINFO and select it for all
TI SoCs.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
arch/arm/Kconfig | 6 ++++++
common/Kconfig | 8 ++++++++
include/configs/ti_armv7_keystone2.h | 1 -
include/configs/ti_omap4_common.h | 1 -
include/configs/ti_omap5_common.h | 1 -
5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 26d7707..7b030ab 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -419,6 +419,7 @@ config ARCH_KEYSTONE
select CPU_V7
select SUPPORT_SPL
select CMD_POWEROFF
+ select DISPLAY_CPUINFO

config ARCH_MESON
bool "Amlogic Meson"
@@ -469,22 +470,26 @@ config OMAP34XX
select CPU_V7
select SUPPORT_SPL
select USE_TINY_PRINTF
+ select DISPLAY_CPUINFO

config OMAP44XX
bool "OMAP44XX SoC"
select CPU_V7
select SUPPORT_SPL
select USE_TINY_PRINTF
+ select DISPLAY_CPUINFO

config OMAP54XX
bool "OMAP54XX SoC"
select CPU_V7
select SUPPORT_SPL
+ select DISPLAY_CPUINFO

config AM43XX
bool "AM43XX SoC"
select CPU_V7
select SUPPORT_SPL
+ select DISPLAY_CPUINFO
help
Support for AM43xx SOC from Texas Instruments.
The AM43xx high performance SOC features a Cortex-A9
@@ -496,6 +501,7 @@ config AM33XX
bool "AM33XX SoC"
select CPU_V7
select SUPPORT_SPL
+ select DISPLAY_CPUINFO
help
Support for AM335x SOC from Texas Instruments.
The AM335x high performance SOC features a Cortex-A8
diff --git a/common/Kconfig b/common/Kconfig
index 46e7173..041c493 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -203,3 +203,11 @@ config SYS_NO_FLASH
default n
help
This option is used to disable support for parallel NOR flash.
+
+config DISPLAY_CPUINFO
+ bool
+ default n
+ help
+ 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.
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 4aa262e..9241323 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -15,7 +15,6 @@
/* U-Boot Build Configuration */
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage loader */
#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_DISPLAY_CPUINFO

/* SoC Configuration */
#define CONFIG_ARCH_CPU_INIT
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 5fad3c1..5c2360d 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_CPUINFO 1
#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 3589cdc..98031a2 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -17,7 +17,6 @@
#ifndef __CONFIG_TI_OMAP5_COMMON_H
#define __CONFIG_TI_OMAP5_COMMON_H

-#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO

/* Common ARM Erratas */
--
2.9.3