From ddef8ae524874836e53c29e97d3980131de61dd8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 21 May 2020 11:08:21 +0100 Subject: [PATCH] Fix for RPi4 booting as ARMv7 --- rpi4-enable-ARCH_FIXUP_FDT_MEMORY.patch | 40 +++++++++++++++++++++++++ uboot-tools.spec | 7 ++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 rpi4-enable-ARCH_FIXUP_FDT_MEMORY.patch diff --git a/rpi4-enable-ARCH_FIXUP_FDT_MEMORY.patch b/rpi4-enable-ARCH_FIXUP_FDT_MEMORY.patch new file mode 100644 index 0000000..a9c00c3 --- /dev/null +++ b/rpi4-enable-ARCH_FIXUP_FDT_MEMORY.patch @@ -0,0 +1,40 @@ +From c9a14b02aea84a37407df7d295e0f76eb529f472 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Tue, 12 May 2020 11:29:00 +0100 +Subject: [PATCH] rpi4: enable ARCH_FIXUP_FDT_MEMORY + +Signed-off-by: Peter Robinson +--- + configs/rpi_4_32b_defconfig | 2 +- + configs/rpi_4_defconfig | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig +index dd7da1cf06..9a0437d376 100644 +--- a/configs/rpi_4_32b_defconfig ++++ b/configs/rpi_4_32b_defconfig +@@ -7,7 +7,7 @@ + CONFIG_NR_DRAM_BANKS=2 + 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 6eeec4592e..b3e7037bf5 100644 +--- a/configs/rpi_4_defconfig ++++ b/configs/rpi_4_defconfig +@@ -7,7 +7,7 @@ + CONFIG_NR_DRAM_BANKS=2 + 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 +-- +2.26.2 + diff --git a/uboot-tools.spec b/uboot-tools.spec index 71db9e9..61bbe05 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2020.04 -Release: 3%{?candidate:.%{candidate}}%{?dist} +Release: 4%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -39,6 +39,8 @@ Patch16: initial-support-for-the-Pinebook-Pro-laptop-from.patch Patch17: rockpro64-limit-speed-on-mSD-slot.patch # AllWinner improvements Patch18: AllWinner-Pine64-bits.patch +# RPi +Patch19: rpi4-enable-ARCH_FIXUP_FDT_MEMORY.patch BuildRequires: bc BuildRequires: dtc @@ -252,6 +254,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Thu May 21 2020 Peter Robinson - 2020.04-4 +- Fix for RPi4 booting as ARMv7 + * Tue Apr 21 2020 Peter Robinson - 2020.04-3 - Ship u-boot-rockchip.bin for SPI flash