diff options
author | Tom Rini <trini@konsulko.com> | 2022-12-05 21:04:24 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-12-05 21:04:24 -0500 |
commit | d2ad92927ea91ab8cece92a308350602c594dd3e (patch) | |
tree | 23ec41dc6f0aff10b800c69396a32ac5ac926817 /arch/x86/lib/physmem.c | |
parent | 1c470f32f74248ff4aa145bf033fb6524dc7fc2e (diff) | |
parent | 7102d324f6b41741ee74587d43d77b302b1bbd96 (diff) |
Merge branch '2022-12-05-Kconfig-migrations-and-renames' into next
- First batch of the patches that end up with
scripts/config_whitelist.tx being empty. Mostly migrations and a
little bit of code removal and CFG renaming.
Diffstat (limited to 'arch/x86/lib/physmem.c')
-rw-r--r-- | arch/x86/lib/physmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c index c11101b44ec..1eb97ac5bb1 100644 --- a/arch/x86/lib/physmem.c +++ b/arch/x86/lib/physmem.c @@ -144,7 +144,7 @@ static void x86_phys_memset_page(phys_addr_t map_addr, uintptr_t offset, int c, /* Make sure the window is below U-Boot. */ assert(window + LARGE_PAGE_SIZE < - gd->relocaddr - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_STACK_SIZE); + gd->relocaddr - CONFIG_SYS_MALLOC_LEN - CFG_SYS_STACK_SIZE); /* Map the page into the window and then memset the appropriate part. */ x86_phys_map_page(window, map_addr, 1); memset((void *)(window + offset), c, size); |