diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-01 12:38:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-01 12:38:15 -0500 |
| commit | dffa6d0210f57793f1e4e1e209d91ca5642e4d05 (patch) | |
| tree | 350cb07a9c0fc71a5a149c9fba70bc13ec5195d9 /arch | |
| parent | 2b28c3b871cd5d55b19f0a86cef970139f8ab952 (diff) | |
| parent | e266d2731145681a55d862360f1b61690b0c6820 (diff) | |
Merge tag 'dm-next-1124' of https://source.denx.de/u-boot/custodians/u-boot-dm into next
support propagating supernode properties with bootph schema
align bloblist with v0.9 of Firmware Handoff spec
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/dts/chromebook_coral.dts | 6 | ||||
| -rw-r--r-- | arch/x86/lib/tables.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts index 8bfb2c0d19..2412801302 100644 --- a/arch/x86/dts/chromebook_coral.dts +++ b/arch/x86/dts/chromebook_coral.dts @@ -369,12 +369,14 @@ rw-mrc-cache { label = "rw-mrc-cache"; reg = <0x008e0000 0x00010000>; - bootph-all; + bootph-some-ram; + bootph-pre-ram; }; rw-var-mrc-cache { label = "rw-mrc-cache"; reg = <0x008f0000 0x0001000>; - bootph-all; + bootph-some-ram; + bootph-pre-ram; }; }; }; diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index 5b5070f7ca..d43e77d373 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -16,6 +16,7 @@ #include <asm/mpspec.h> #include <asm/tables.h> #include <asm/coreboot_tables.h> +#include <linux/log2.h> DECLARE_GLOBAL_DATA_PTR; @@ -104,7 +105,7 @@ int write_tables(void) if (!gd->arch.table_end) gd->arch.table_end = rom_addr; rom_addr = (ulong)bloblist_add(table->tag, size, - table->align); + ilog2(table->align)); if (!rom_addr) return log_msg_ret("bloblist", -ENOBUFS); |