Commit f39abbbc authored by Tom Rini's avatar Tom Rini
Browse files

Merge tag 'rpi-next-2020.01.2' of https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi

- fix DRAM bank detection for unified binary
- fix 32bit RPi4 config
parents 3031cded e5167465
...@@ -272,14 +272,17 @@ int dram_init(void) ...@@ -272,14 +272,17 @@ int dram_init(void)
} }
#ifdef CONFIG_OF_BOARD #ifdef CONFIG_OF_BOARD
#ifdef CONFIG_BCM2711
int dram_init_banksize(void) int dram_init_banksize(void)
{ {
return fdtdec_decode_ram_size(gd->fdt_blob, NULL, 0, NULL, int ret;
(phys_size_t *)&gd->ram_size, gd->bd);
ret = fdtdec_setup_memory_banksize();
if (ret)
return ret;
return fdtdec_setup_mem_size_base();
} }
#endif #endif
#endif
static void set_fdtfile(void) static void set_fdtfile(void)
{ {
......
...@@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00008000 ...@@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00008000
CONFIG_TARGET_RPI_4_32B=y CONFIG_TARGET_RPI_4_32B=y
CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=2
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment