aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Meng2018-10-14 03:07:19 -0500
committerSimon Glass2018-11-14 11:16:28 -0600
commitc337e1afd3bd00622a102b4dda10b109d898281f (patch)
treeb096503107b3e357ccdf643be0e098d86ffa939e
parent1a6bd4717fe68ca212abca21a0e08af186fdb442 (diff)
downloadu-boot-c337e1afd3bd00622a102b4dda10b109d898281f.tar.gz
u-boot-c337e1afd3bd00622a102b4dda10b109d898281f.tar.xz
u-boot-c337e1afd3bd00622a102b4dda10b109d898281f.zip
cpu: Add DM_FLAG_PRE_RELOC flag to various cpu drivers
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: c0434407b595 ("board_f: Use static print_cpuinfo if CONFIG_CPU is active") Reported-by: Stefan Roese <sr@denx.de> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Tested-by: Stefan Roese <sr@denx.de>
-rw-r--r--arch/x86/cpu/baytrail/cpu.c1
-rw-r--r--arch/x86/cpu/broadwell/cpu.c1
-rw-r--r--arch/x86/cpu/cpu_x86.c1
-rw-r--r--arch/x86/cpu/ivybridge/model_206ax.c1
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c
index 56e98131d7..2eb917283b 100644
--- a/arch/x86/cpu/baytrail/cpu.c
+++ b/arch/x86/cpu/baytrail/cpu.c
@@ -203,4 +203,5 @@ U_BOOT_DRIVER(cpu_x86_baytrail_drv) = {
203 .bind = cpu_x86_bind, 203 .bind = cpu_x86_bind,
204 .probe = cpu_x86_baytrail_probe, 204 .probe = cpu_x86_baytrail_probe,
205 .ops = &cpu_x86_baytrail_ops, 205 .ops = &cpu_x86_baytrail_ops,
206 .flags = DM_FLAG_PRE_RELOC,
206}; 207};
diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index 02b3169cf5..232fa40eb5 100644
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -764,4 +764,5 @@ U_BOOT_DRIVER(cpu_x86_broadwell_drv) = {
764 .probe = cpu_x86_broadwell_probe, 764 .probe = cpu_x86_broadwell_probe,
765 .ops = &cpu_x86_broadwell_ops, 765 .ops = &cpu_x86_broadwell_ops,
766 .priv_auto_alloc_size = sizeof(struct cpu_broadwell_priv), 766 .priv_auto_alloc_size = sizeof(struct cpu_broadwell_priv),
767 .flags = DM_FLAG_PRE_RELOC,
767}; 768};
diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c
index 2b6cc9f22d..1aaf851bb4 100644
--- a/arch/x86/cpu/cpu_x86.c
+++ b/arch/x86/cpu/cpu_x86.c
@@ -94,4 +94,5 @@ U_BOOT_DRIVER(cpu_x86_drv) = {
94 .of_match = cpu_x86_ids, 94 .of_match = cpu_x86_ids,
95 .bind = cpu_x86_bind, 95 .bind = cpu_x86_bind,
96 .ops = &cpu_x86_ops, 96 .ops = &cpu_x86_ops,
97 .flags = DM_FLAG_PRE_RELOC,
97}; 98};
diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index 33e5c6263d..6edc3e233c 100644
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -478,4 +478,5 @@ U_BOOT_DRIVER(cpu_x86_model_206ax_drv) = {
478 .bind = cpu_x86_bind, 478 .bind = cpu_x86_bind,
479 .probe = cpu_x86_model_206ax_probe, 479 .probe = cpu_x86_model_206ax_probe,
480 .ops = &cpu_x86_model_206ax_ops, 480 .ops = &cpu_x86_model_206ax_ops,
481 .flags = DM_FLAG_PRE_RELOC,
481}; 482};