diff options
author | Tom Rini <trini@konsulko.com> | 2023-05-11 08:40:33 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-05-11 08:40:33 -0400 |
commit | e94fbdd2729fdcd570035d43f67adda8e0dfc115 (patch) | |
tree | fc4d5d6f989618994e0af5bb61f9918e4c8a7478 /drivers/sysreset/sysreset_x86.c | |
parent | 0a9a4384c1483a88776bca38e28f09be51161034 (diff) | |
parent | b982f89c583c6c03f4d1f94d29991ccf691a0f7c (diff) |
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- Various fixes for Google chromebooks
- Various minor enhancements for coreboot
Diffstat (limited to 'drivers/sysreset/sysreset_x86.c')
-rw-r--r-- | drivers/sysreset/sysreset_x86.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c index 8042f3994fe..4936fdb76c7 100644 --- a/drivers/sysreset/sysreset_x86.c +++ b/drivers/sysreset/sysreset_x86.c @@ -129,8 +129,13 @@ static int x86_sysreset_probe(struct udevice *dev) { struct x86_sysreset_plat *plat = dev_get_plat(dev); - /* Locate the PCH if there is one. It isn't essential */ - uclass_first_device(UCLASS_PCH, &plat->pch); + /* + * Locate the PCH if there is one. It isn't essential. Avoid this before + * relocation as we shouldn't need reset then and it needs a lot of + * memory for PCI enumeration. + */ + if (gd->flags & GD_FLG_RELOC) + uclass_first_device(UCLASS_PCH, &plat->pch); return 0; } |