diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-11 09:29:39 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-11 09:29:39 -0500 |
| commit | f39abbbc531eb7b246d83dbb765e65afcc0989f8 (patch) | |
| tree | 71b59e28f2b7d1234515268276a56e3b0ef2844f | |
| parent | 3031cdede17f5311a0c1cc4279ea22fd3d02ce73 (diff) | |
| parent | e5167465a1740f0cac05be44f3e2a4e334eb527a (diff) | |
| download | u-boot-f39abbbc531eb7b246d83dbb765e65afcc0989f8.zip u-boot-f39abbbc531eb7b246d83dbb765e65afcc0989f8.tar.gz u-boot-f39abbbc531eb7b246d83dbb765e65afcc0989f8.tar.bz2 | |
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
| -rw-r--r-- | board/raspberrypi/rpi/rpi.c | 11 | ||||
| -rw-r--r-- | configs/rpi_4_32b_defconfig | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 5f120ea..e367ba3 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -272,14 +272,17 @@ int dram_init(void) } #ifdef CONFIG_OF_BOARD -#ifdef CONFIG_BCM2711 int dram_init_banksize(void) { - return fdtdec_decode_ram_size(gd->fdt_blob, NULL, 0, NULL, - (phys_size_t *)&gd->ram_size, gd->bd); + int ret; + + ret = fdtdec_setup_memory_banksize(); + if (ret) + return ret; + + return fdtdec_setup_mem_size_base(); } #endif -#endif static void set_fdtfile(void) { diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig index f21745b..00f80f7 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00008000 CONFIG_TARGET_RPI_4_32B=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x4000 -CONFIG_NR_DRAM_BANKS=1 +CONFIG_NR_DRAM_BANKS=2 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set |