diff --git a/0026-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch b/0026-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch new file mode 100644 index 0000000..0e00843 --- /dev/null +++ b/0026-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch @@ -0,0 +1,56 @@ +From 48529fd9c115753681dadb215af891cc860c5d29 Mon Sep 17 00:00:00 2001 +From: Matthias Brugger +Date: Fri, 29 May 2020 16:42:22 +0200 +Subject: [PATCH] configs: rpi: set NR_DRAM_BANKS to four + +With the new RPi4 which has 8 GB of RAM, we can have up to four DRAM +banks. Bump up the configuration files to detect all the memory in +U-Boot. + +Signed-off-by: Matthias Brugger +(cherry picked from commit a61cf765f7e3a4ba80453150e16acaaecbd913ac) +--- + configs/rpi_4_32b_defconfig | 2 +- + configs/rpi_4_defconfig | 2 +- + configs/rpi_arm64_defconfig | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig +index 2c5539102e..6a9fa49e3d 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=2 ++CONFIG_NR_DRAM_BANKS=4 + CONFIG_DISTRO_DEFAULTS=y + CONFIG_OF_BOARD_SETUP=y + # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig +index 6f34ae9fbd..137c03e4d8 100644 +--- a/configs/rpi_4_defconfig ++++ b/configs/rpi_4_defconfig +@@ -4,7 +4,7 @@ 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 +diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig +index f12d1e340c..ea73bee5ac 100644 +--- a/configs/rpi_arm64_defconfig ++++ b/configs/rpi_arm64_defconfig +@@ -3,7 +3,7 @@ CONFIG_ARCH_BCM283X=y + CONFIG_SYS_TEXT_BASE=0x00080000 + CONFIG_TARGET_RPI_ARM64=y + CONFIG_SYS_MALLOC_F_LEN=0x2000 +-CONFIG_NR_DRAM_BANKS=2 ++CONFIG_NR_DRAM_BANKS=4 + CONFIG_DISTRO_DEFAULTS=y + CONFIG_OF_BOARD_SETUP=y + CONFIG_USE_PREBOOT=y diff --git a/u-boot.changes b/u-boot.changes index 3af81b7..9cd632b 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 2 06:54:36 UTC 2020 - Matthias Brugger + +- Fix RAM discovery for 8GB devices (bsc#1172371) +Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.04 +* Patches added: + 0026-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch + ------------------------------------------------------------------- Mon May 11 13:40:32 UTC 2020 - Matthias Brugger diff --git a/u-boot.spec b/u-boot.spec index 52644ba..d08dc51 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -228,6 +228,7 @@ Patch0022: 0022-config-Enable-support-for-the-XHCI-.patch Patch0023: 0023-arm-rpi-Add-function-to-trigger-VL8.patch Patch0024: 0024-usb-xhci-Load-Raspberry-Pi-4-VL805-.patch Patch0025: 0025-config-Enable-USB-Keyboard-support-.patch +Patch0026: 0026-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch # Patches: end BuildRequires: bc BuildRequires: bison