GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-27 17:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"

Browse source 
This reverts commit c0434407b5.

It turns out commit c0434407b5 broke some boards which have DM CPU
driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail
to boot when print_cpuinfo() is called during boot.

Fixes are already sent to ML and in u-boot-dm/next, however since
we are getting close to the v2018.11 release, it's safer we revert
the original commit.

This commit should be reverted after v2018.11 release.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2018-11-07 03:50:34 -08:00 • committed by Tom Rini
parent f63f65e489
commit 5764ea2df4
2 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
common/board_f.c
View file

@ -11,7 +11,6 @@
#include <common.h> #include <common.h>
#include <console.h> #include <console.h>
#include <cpu.h>
#include <dm.h> #include <dm.h>
#include <environment.h> #include <environment.h>
#include <fdtdec.h> #include <fdtdec.h>
@ -166,33 +165,6 @@ static int print_resetinfo(void)
} }
#endif #endif
#if defined(CONFIG_DISPLAY_CPUINFO) && CONFIG_IS_ENABLED(CPU)
static int print_cpuinfo(void)
{
struct udevice *dev;
char desc[512];
int ret;
ret = uclass_first_device_err(UCLASS_CPU, &dev);
if (ret) {
debug("%s: Could not get CPU device (err = %d)\n",
__func__, ret);
return ret;
}
ret = cpu_get_desc(dev, desc, sizeof(desc));
if (ret) {
debug("%s: Could not get CPU description (err = %d)\n",
dev->name, ret);
return ret;
}
printf("%s", desc);
return 0;
}
#endif
static int announce_dram_init(void) static int announce_dram_init(void)
{ {
puts("DRAM: "); puts("DRAM: ");

7
include/init.h
View file

@ -109,14 +109,7 @@ int arch_reserve_stacks(void);
*/ */
int init_cache_f_r(void); int init_cache_f_r(void);
#if !CONFIG_IS_ENABLED(CPU)
/**
* print_cpuinfo() - Display information about the CPU
*
* Return: 0 if OK, -ve on error
*/
int print_cpuinfo(void); int print_cpuinfo(void);
#endif
int timer_init(void); int timer_init(void);
int reserve_mmu(void); int reserve_mmu(void);
int misc_init_f(void); int misc_init_f(void);