Add silicon ID code for AM437x silicon. This can be used to print the cpu info using CONFIG_DISPLAY_CPUINFO. Also printing "CPU :" along with cpu name in order to be consistent with other OMAP platforms.

Signed-off-by: Lokesh Vutla lokeshvutla@ti.com --- arch/arm/cpu/armv7/am33xx/sys_info.c | 5 ++++- arch/arm/include/asm/arch-am33xx/cpu.h | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/cpu/armv7/am33xx/sys_info.c b/arch/arm/cpu/armv7/am33xx/sys_info.c index 52a6824..808faf4 100644 --- a/arch/arm/cpu/armv7/am33xx/sys_info.c +++ b/arch/arm/cpu/armv7/am33xx/sys_info.c @@ -97,6 +97,9 @@ int print_cpuinfo(void) case TI81XX: cpu_s = "TI81XX"; break; + case AM437X: + cpu_s = "AM437X"; + break; default: cpu_s = "Unknown CPU type"; break; @@ -112,7 +115,7 @@ int print_cpuinfo(void) else sec_s = "?";

- printf("%s-%s rev %s\n", cpu_s, sec_s, rev_s); + printf("CPU : %s-%s rev %s\n", cpu_s, sec_s, rev_s);

return 0; } diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h index 62bca8c..4a0dce9 100644 --- a/arch/arm/include/asm/arch-am33xx/cpu.h +++ b/arch/arm/include/asm/arch-am33xx/cpu.h @@ -43,7 +43,8 @@ #define HS_DEVICE 0x2 #define GP_DEVICE 0x3

-/* cpu-id for AM33XX and TI81XX family */ +/* cpu-id for AM43XX AM33XX and TI81XX family */ +#define AM437X 0xB98C #define AM335X 0xB944 #define TI81XX 0xB81E #define DEVICE_ID (CTRL_BASE + 0x0600)

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 */

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