Commit 5764ea2df4efadd1ef0576ec45f33e137ce5aad8
Committed by
Tom Rini
Tom Rini
1 parent
f63f65e489
Exists in
smarc_8mq_lf_v2020.04
and in
11 other branches
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 <bmeng.cn@gmail.com> Acked-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Showing 2 changed files with 0 additions and 35 deletions Side-by-side Diff
common/board_f.c
| ... | ... | @@ -11,7 +11,6 @@ |
| 11 | 11 | |
| 12 | 12 | #include <common.h> |
| 13 | 13 | #include <console.h> |
| 14 | -#include <cpu.h> | |
| 15 | 14 | #include <dm.h> |
| 16 | 15 | #include <environment.h> |
| 17 | 16 | #include <fdtdec.h> |
| ... | ... | @@ -161,33 +160,6 @@ |
| 161 | 160 | |
| 162 | 161 | if (!sysreset_get_status(dev, status, sizeof(status))) |
| 163 | 162 | printf("%s", status); |
| 164 | - | |
| 165 | - return 0; | |
| 166 | -} | |
| 167 | -#endif | |
| 168 | - | |
| 169 | -#if defined(CONFIG_DISPLAY_CPUINFO) && CONFIG_IS_ENABLED(CPU) | |
| 170 | -static int print_cpuinfo(void) | |
| 171 | -{ | |
| 172 | - struct udevice *dev; | |
| 173 | - char desc[512]; | |
| 174 | - int ret; | |
| 175 | - | |
| 176 | - ret = uclass_first_device_err(UCLASS_CPU, &dev); | |
| 177 | - if (ret) { | |
| 178 | - debug("%s: Could not get CPU device (err = %d)\n", | |
| 179 | - __func__, ret); | |
| 180 | - return ret; | |
| 181 | - } | |
| 182 | - | |
| 183 | - ret = cpu_get_desc(dev, desc, sizeof(desc)); | |
| 184 | - if (ret) { | |
| 185 | - debug("%s: Could not get CPU description (err = %d)\n", | |
| 186 | - dev->name, ret); | |
| 187 | - return ret; | |
| 188 | - } | |
| 189 | - | |
| 190 | - printf("%s", desc); | |
| 191 | 163 | |
| 192 | 164 | return 0; |
| 193 | 165 | } |
include/init.h
| ... | ... | @@ -109,14 +109,7 @@ |
| 109 | 109 | */ |
| 110 | 110 | int init_cache_f_r(void); |
| 111 | 111 | |
| 112 | -#if !CONFIG_IS_ENABLED(CPU) | |
| 113 | -/** | |
| 114 | - * print_cpuinfo() - Display information about the CPU | |
| 115 | - * | |
| 116 | - * Return: 0 if OK, -ve on error | |
| 117 | - */ | |
| 118 | 112 | int print_cpuinfo(void); |
| 119 | -#endif | |
| 120 | 113 | int timer_init(void); |
| 121 | 114 | int reserve_mmu(void); |
| 122 | 115 | int misc_init_f(void); |