diff options
| author | Tom Rini <[email protected]> | 2023-05-11 08:40:33 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-05-11 08:40:33 -0400 |
| commit | e94fbdd2729fdcd570035d43f67adda8e0dfc115 (patch) | |
| tree | fc4d5d6f989618994e0af5bb61f9918e4c8a7478 /drivers/core | |
| 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/core')
| -rw-r--r-- | drivers/core/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/core/root.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 0f755aa702e..f0d848f45d8 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -448,6 +448,7 @@ config OFNODE_MULTI_TREE_MAX config ACPIGEN bool "Support ACPI table generation in driver model" + depends on ACPI default y if SANDBOX || (GENERATE_ACPI_TABLE && !QEMU) select LIB_UUID help diff --git a/drivers/core/root.c b/drivers/core/root.c index c4fb48548bb..6775fb0b657 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -436,8 +436,8 @@ int dm_init_and_scan(bool pre_reloc_only) return ret; } } - if (CONFIG_IS_ENABLED(DM_EVENT)) { - ret = event_notify_null(EVT_DM_POST_INIT); + if (CONFIG_IS_ENABLED(DM_EVENT) && !(gd->flags & GD_FLG_RELOC)) { + ret = event_notify_null(EVT_DM_POST_INIT_F); if (ret) return log_msg_ret("ev", ret); } |