diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-09 20:17:34 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-09 20:17:34 +0300 |
| commit | ec58228830a1f68e8e65099387cf12c5a91c9e72 (patch) | |
| tree | 391ed6ad5f3fddcb88c976b0d413fa3912e68c40 /arch/x86/lib/physmem.c | |
| parent | f26eda936bfb49c99d3c7829d416809013b95d3f (diff) | |
| parent | 9234b77b9d42ebd77585091a072b4ab958ba83ed (diff) | |
| download | u-boot-ec58228830a1f68e8e65099387cf12c5a91c9e72.tar.xz | |
Merge tag 'x86-pull-20230809' of https://source.denx.de/u-boot/custodians/u-boot-x86
- x86: Fixes for distro booting
- x86: Move some boards to text environment
Diffstat (limited to 'arch/x86/lib/physmem.c')
| -rw-r--r-- | arch/x86/lib/physmem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c index 1eb97ac5bb..382f768149 100644 --- a/arch/x86/lib/physmem.c +++ b/arch/x86/lib/physmem.c @@ -14,6 +14,7 @@ #include <asm/cpu.h> #include <asm/global_data.h> #include <linux/compiler.h> +#include <linux/sizes.h> DECLARE_GLOBAL_DATA_PTR; @@ -144,7 +145,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 - CFG_SYS_STACK_SIZE); + gd->relocaddr - CONFIG_SYS_MALLOC_LEN - SZ_32K); /* 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); |