Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2019-12-16 15:21:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot" Mon Dec 16 15:21:10 2019 rev:118 rq:757313 version:2019.10 Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot.changes 2019-12-05 17:39:30.141349132 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.4691/u-boot.changes 2019-12-16 15:21:48.963102996 +0100 @@ -1,0 +2,10 @@ +Fri Dec 13 15:57:44 UTC 2019 - Matthias Brugger <[email protected]> + +Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2019.10 +* Fix bsc#1158357 by: +* Patches added: + 0024-rpi-fix-dram-bank-initialization.patch + 0025-rpi-Enable-DRAM-bank-initialization.patch + 0026-ARM-defconfig-Fix-32bit-config-for-.patch + +------------------------------------------------------------------- New: ---- 0024-rpi-fix-dram-bank-initialization.patch 0025-rpi-Enable-DRAM-bank-initialization.patch 0026-ARM-defconfig-Fix-32bit-config-for-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.qn9CVD/_old 2019-12-16 15:21:50.783102238 +0100 +++ /var/tmp/diff_new_pack.qn9CVD/_new 2019-12-16 15:21:50.787102237 +0100 @@ -215,6 +215,10 @@ Patch0021: 0021-ARM-bcm283x-Set-memory-map-at-run-t.patch Patch0022: 0022-ARM-defconfig-add-unified-config-fo.patch Patch0023: 0023-boo-1144161-Remove-nand-mtd-spi-dfu.patch +Patch0024: 0024-rpi-fix-dram-bank-initialization.patch +Patch0025: 0025-rpi-Enable-DRAM-bank-initialization.patch +Patch0026: 0026-ARM-defconfig-Fix-32bit-config-for-.patch +# Patches: end BuildRequires: bc BuildRequires: bison # Arndale board needs DTC >= 1.4 @@ -225,7 +229,6 @@ BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: swig -# Patches: end BuildRequires: pkgconfig(sdl) Conflicts: u-boot-loader Provides: u-boot-loader ++++++ 0024-rpi-fix-dram-bank-initialization.patch ++++++ >From 6903bb74d467121c2d2c99b4272fe4363e8f2f64 Mon Sep 17 00:00:00 2001 From: Matthias Brugger <[email protected]> Date: Thu, 5 Dec 2019 18:53:13 +0100 Subject: [PATCH] rpi: fix dram bank initialization To update the dram bank information from device-tree we use fdtdec_decode_ram_size() which expectes the the size-cells and address-cells to be defined in the memory node. For normal system RAM these values are defined in the root node. When the values differ from the default values defined in the spec, we can end up with wrong RAM bank information. Switch to the "standard" way to update the RAM bank information to avoid this. Fixes: 9de5b89e4c ("rpi4: enable dram bank initialization") Signed-off-by: Matthias Brugger <[email protected]> (cherry picked from commit e19cfcc07ac5da8b3a04e21875ec542d994865d4) --- board/raspberrypi/rpi/rpi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 3d4afaf653..76f1c55b65 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -274,8 +274,13 @@ int dram_init(void) #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 ++++++ 0025-rpi-Enable-DRAM-bank-initialization.patch ++++++ >From 8dcbd1a138d5accd339ec990750070bef537cd45 Mon Sep 17 00:00:00 2001 From: Matthias Brugger <[email protected]> Date: Thu, 5 Dec 2019 18:53:14 +0100 Subject: [PATCH] rpi: Enable DRAM bank initialization on arm64 Up to now we only update the DRAM banks when we are define CONFIG_BCM2711. But our one binary approach uses a config that supports BCM2837 and BCM2711. As a result we only see one gibibyte of RAM on Raspberry Pi 4, even if it has more RAM. Fix this by calling dram_init_banksize. Fixes: 5694090670 ("ARM: defconfig: add unified config for RPi3 and RPi4") Signed-off-by: Matthias Brugger <[email protected]> (cherry picked from commit a63f81c242090682ea4907fa6475d8057208cb05) --- board/raspberrypi/rpi/rpi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 76f1c55b65..17d463e16f 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -271,7 +271,6 @@ int dram_init(void) } #ifdef CONFIG_OF_BOARD -#ifdef CONFIG_BCM2711 int dram_init_banksize(void) { int ret; @@ -283,7 +282,6 @@ int dram_init_banksize(void) return fdtdec_setup_mem_size_base(); } #endif -#endif static void set_fdtfile(void) { ++++++ 0026-ARM-defconfig-Fix-32bit-config-for-.patch ++++++ >From 25da6429ff2aeb00119b2ba43cc59149d7e07b5a Mon Sep 17 00:00:00 2001 From: Matthias Brugger <[email protected]> Date: Thu, 5 Dec 2019 18:53:15 +0100 Subject: [PATCH] ARM: defconfig: Fix 32bit config for RPi4 The rpi_4_32b_defconfig states that only one DRAM bank is present. This leads to a wrong configuration of the available DRAM. Fix this by setting the DRAM bank config accordingly. Fixes: 193279d784 ("RPI: Add defconfigs for rpi4 (32/64)") Signed-off-by: Matthias Brugger <[email protected]> (cherry picked from commit e5167465a1740f0cac05be44f3e2a4e334eb527a) --- configs/rpi_4_32b_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig index dc696906fd..ec7330a98d 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_BCM283X=y CONFIG_SYS_TEXT_BASE=0x00008000 CONFIG_TARGET_RPI_4_32B=y CONFIG_SYS_MALLOC_F_LEN=0x2000 -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
