aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAKASHI Takahiro <takahiro.akashi@linaro.org>2019-08-27 17:17:03 +0900
committerSimon Glass <sjg@chromium.org>2019-10-15 08:40:02 -0600
commit073e6d65d138edd015ece4d94dcfe2a3e00dccde (patch)
treee5788c1988f7531f0af471e37c8c3d0971cd14e6
parent2cde3ea1d01f4b72770b7c0c812a7377be15ea43 (diff)
downloadu-boot-073e6d65d138edd015ece4d94dcfe2a3e00dccde.zip
u-boot-073e6d65d138edd015ece4d94dcfe2a3e00dccde.tar.gz
u-boot-073e6d65d138edd015ece4d94dcfe2a3e00dccde.tar.bz2
sandbox: fix cpu property in test.dts for pytest
When I tried to run some new efi tests with pytest, efi_smbios_register() triggered a segmentation fault. Here is the location where it happened: efi_init_obj_list() efi_smbios_register() write_smbios_table() smbios_write_type4() smbios_write_type4_dm() where dev_get_parent_platdata() should return a pointer to struct cpu_platdata, but it is actually NULL because any cpu device on sandbox is attached to "root_driver." With this patch, this issue will be fixed by moving all the definitions of cpus under "cpus" node so that they have a "cpu_bus" parent. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/sandbox/dts/test.dts24
1 files changed, 13 insertions, 11 deletions
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 5d9ab37..42b41fb 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -393,19 +393,21 @@
mbox-names = "other", "test";
};
- cpu-test1 {
- compatible = "sandbox,cpu_sandbox";
- u-boot,dm-pre-reloc;
- };
+ cpus {
+ cpu-test1 {
+ compatible = "sandbox,cpu_sandbox";
+ u-boot,dm-pre-reloc;
+ };
- cpu-test2 {
- compatible = "sandbox,cpu_sandbox";
- u-boot,dm-pre-reloc;
- };
+ cpu-test2 {
+ compatible = "sandbox,cpu_sandbox";
+ u-boot,dm-pre-reloc;
+ };
- cpu-test3 {
- compatible = "sandbox,cpu_sandbox";
- u-boot,dm-pre-reloc;
+ cpu-test3 {
+ compatible = "sandbox,cpu_sandbox";
+ u-boot,dm-pre-reloc;
+ };
};
i2s: i2s {