From 5764ea2df4efadd1ef0576ec45f33e137ce5aad8 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Wed, 7 Nov 2018 03:50:34 -0800 Subject: Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active" This reverts commit c0434407b595f785fc7401237896c48c791b45fd. It turns out commit c0434407b595 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 Acked-by: Peng Fan Reviewed-by: Simon Glass --- common/board_f.c | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index 213d0440667..afafec5e4d0 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -11,7 +11,6 @@ #include #include -#include #include #include #include @@ -166,33 +165,6 @@ static int print_resetinfo(void) } #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) { puts("DRAM: "); -- cgit v1.2.3