diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-24 22:08:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-24 22:08:00 -0500 |
| commit | a3f77c810b1a57853e4d5fee3014ac8cbbd03a9a (patch) | |
| tree | 838815d1747e9a5a70b8627bc7fa7820d92a6c2d /common | |
| parent | fb4413295c765aa8c013650984dc2d908964c81d (diff) | |
| parent | b9153fe3088a4ea295d6cd23dd44bed51224679a (diff) | |
| download | u-boot-a3f77c810b1a57853e4d5fee3014ac8cbbd03a9a.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 2 | ||||
| -rw-r--r-- | common/board_f.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/common/Kconfig b/common/Kconfig index 4da095a4fd..21e067c858 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -533,7 +533,7 @@ config BOARD_LATE_INIT config DISPLAY_CPUINFO bool "Display information about the CPU during start up" - default y if ARM || NIOS2 || X86 || XTENSA + default y if ARM || NIOS2 || X86 || XTENSA || M68K help Display information about the CPU that U-Boot is running on when U-Boot starts up. The function print_cpuinfo() is called diff --git a/common/board_f.c b/common/board_f.c index 7f594d9eaf..1965bda191 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -787,8 +787,7 @@ static const init_fnc_t init_sequence_f[] = { console_init_f, /* stage 1 init of console */ display_options, /* say that we are here */ display_text_info, /* show debugging info if required */ -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SH) || \ - defined(CONFIG_X86) +#if defined(CONFIG_PPC) || defined(CONFIG_SH) || defined(CONFIG_X86) checkcpu, #endif #if defined(CONFIG_DISPLAY_CPUINFO) |