diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-23 18:42:53 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-23 18:42:53 -0400 |
| commit | 694e9008674c2008b9ccdc25a9bb3ac078e20911 (patch) | |
| tree | 8ab2a2636dc86ebb2ccb312512d5f402cf2b3e7e /arch/x86/include/asm/u-boot-x86.h | |
| parent | 4057d64fae78e1e9bf8a5a87a823f188a1339917 (diff) | |
| parent | 236f73962718511e801f4ec9562075e86f737ec4 (diff) | |
Merge branch '2022-09-23-4gb-ddr-in-32bit-ppc' into next
To quote the author, for the first 9 patches:
This patch series fixes U-Boot code to correctly handle RAM size larger
than 2 GB and then fixes fsl ddr driver to do not crash U-Boot when 4 GB
DDR module is detected when U-Boot operates in 32-bit mode (as opposite
of the 36-bit mode).
With this patch series it is possible to boot 32-bit U-Boot with 4 GB
SODIMM DDR3 module without crashes. U-Boot will still use just
CONFIG_MAX_MEM_MAPPED amount of RAM, but it is better than crashing due
to the truncating of 4GB value to 32-bit number (which is zero).
I tested this patch series on powerpc P2020 based board but only with
U-Boot v2022.04 because U-Boot master branch is still broken on P2020.
And then the final two patches here are (in my mind at least) related
clean-ups.
Diffstat (limited to 'arch/x86/include/asm/u-boot-x86.h')
| -rw-r--r-- | arch/x86/include/asm/u-boot-x86.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index a1655e1cea..4cf41e9354 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -77,7 +77,7 @@ int x86_cleanup_before_linux(void); void x86_enable_caches(void); void x86_disable_caches(void); int x86_init_cache(void); -ulong board_get_usable_ram_top(ulong total_size); +phys_size_t board_get_usable_ram_top(phys_size_t total_size); int default_print_cpuinfo(void); /* Set up a UART which can be used with printch(), printhex8(), etc. */ |