diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-01 11:42:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-01 11:42:47 -0400 |
| commit | b5d54d26ea1354fede1121671a7ca3b9b44b5b5c (patch) | |
| tree | c05affcd52184c88d8172f5dd8cc9fd4afb66266 | |
| parent | 42c8a112d2e90598f0933d085ab4e47b41ab2aba (diff) | |
| parent | a61cf765f7e3a4ba80453150e16acaaecbd913ac (diff) | |
Merge tag 'rpi-next-2020.07.2' of https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi
rpi4:
- set ARCH_FIXUP_FDT_MEMORY
- bump NR_DRAM_BANKS to four to enable 8 GB of RAM
| -rw-r--r-- | configs/rpi_4_32b_defconfig | 4 | ||||
| -rw-r--r-- | configs/rpi_4_defconfig | 4 | ||||
| -rw-r--r-- | configs/rpi_arm64_defconfig | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig index 52bdd0ab02..f369bb93bd 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig @@ -4,10 +4,10 @@ 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=2 +CONFIG_NR_DRAM_BANKS=4 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_ARCH_FIXUP_FDT_MEMORY=y CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index 2ce1b6b6ec..d4b586cf3a 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -4,10 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x00080000 CONFIG_TARGET_RPI_4=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x4000 -CONFIG_NR_DRAM_BANKS=2 +CONFIG_NR_DRAM_BANKS=4 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_ARCH_FIXUP_FDT_MEMORY=y CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig index 66c4a5368c..f8a369f8f1 100644 --- a/configs/rpi_arm64_defconfig +++ b/configs/rpi_arm64_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00080000 CONFIG_TARGET_RPI_ARM64=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x4000 -CONFIG_NR_DRAM_BANKS=2 +CONFIG_NR_DRAM_BANKS=4 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y |