2021.01 RC4, new rpi-400 patch

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>

arm-add-BOOTENV_EFI_SET_FDTFILE_FALLBACK-for-tegra186-be.patch

@@ -1,55 +0,0 @@
-From a63eb1bdcd25246b2c637c7846917dc6dc607725 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 18 Apr 2019 15:44:59 +0100
-Subject: [PATCH] add BOOTENV_EFI_SET_FDTFILE_FALLBACK for tegra186 because tx2
- variants
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
----
- include/config_distro_bootcmd.h   | 2 ++
- include/configs/tegra186-common.h | 7 ++++++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-index fc0935fa21..fd1c5f5afa 100644
---- a/include/config_distro_bootcmd.h
-+++ b/include/config_distro_bootcmd.h
-@@ -118,8 +118,10 @@
- 	  "setenv efi_fdtfile ${soc}-${board}${boardver}.dtb; "           \
- 	"fi; "
- #else
-+#ifndef BOOTENV_EFI_SET_FDTFILE_FALLBACK
- #define BOOTENV_EFI_SET_FDTFILE_FALLBACK
- #endif
-+#endif
- 
- 
- #define BOOTENV_SHARED_EFI                                                \
-diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h
-index 5c3ad35c76..d5f21e0907 100644
---- a/include/configs/tegra186-common.h
-+++ b/include/configs/tegra186-common.h
-@@ -20,6 +20,12 @@
- /* Generic Interrupt Controller */
- #define CONFIG_GICV2
- 
-+#undef FDTFILE
-+#define BOOTENV_EFI_SET_FDTFILE_FALLBACK                                  \
-+        "if test -z \"${fdtfile}\" -a -n \"${soc}\"; then "               \
-+          "setenv efi_fdtfile ${vendor}/${soc}-${board}${boardver}.dtb; "           \
-+        "fi; "
-+
- /*
-  * Memory layout for where various images get loaded by boot scripts:
-  *
-@@ -49,7 +55,6 @@
- 	"scriptaddr=0x90000000\0" \
- 	"pxefile_addr_r=0x90100000\0" \
- 	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
--	"fdtfile=" FDTFILE "\0" \
- 	"fdt_addr_r=0x82000000\0" \
- 	"ramdisk_addr_r=0x82100000\0"
- 
--- 
-2.26.0
-

arm-tegra-define-fdtfile-option-for-distro-boot.patch

@@ -1,113 +0,0 @@
-From c3332b102d2ddae01710ae8f4393a2a18a3a1bb3 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Tue, 12 May 2020 08:19:48 +0100
-Subject: [PATCH] arm: tegra: define fdtfile option for distro boot
-
-For booting via UEFI we need to define the fdtfile option so
-bootefi has the option to load a fdtfile from disk. For arm64
-the kernel dtb is located in a vendor directory so we define
-that as nvidia for that architecture.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
----
- include/configs/tegra-common.h    | 6 ++++++
- include/configs/tegra114-common.h | 1 +
- include/configs/tegra124-common.h | 1 +
- include/configs/tegra186-common.h | 1 +
- include/configs/tegra20-common.h  | 1 +
- include/configs/tegra210-common.h | 1 +
- include/configs/tegra30-common.h  | 1 +
- 7 files changed, 12 insertions(+)
-
-diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
-index 175c55c613..8026f4b32e 100644
---- a/include/configs/tegra-common.h
-+++ b/include/configs/tegra-common.h
-@@ -52,6 +52,12 @@
- /* Boot Argument Buffer Size */
- #define CONFIG_SYS_BARGSIZE		(CONFIG_SYS_CBSIZE)
- 
-+#ifdef CONFIG_ARM64
-+#define FDTFILE "nvidia/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
-+#else
-+#define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
-+#endif
-+
- /*-----------------------------------------------------------------------
-  * Physical Memory Map
-  */
-diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h
-index d3a7045697..9d751b6740 100644
---- a/include/configs/tegra114-common.h
-+++ b/include/configs/tegra114-common.h
-@@ -50,6 +50,7 @@
- 	"scriptaddr=0x90000000\0" \
- 	"pxefile_addr_r=0x90100000\0" \
- 	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-+	"fdtfile=" FDTFILE "\0" \
- 	"fdt_addr_r=0x83000000\0" \
- 	"ramdisk_addr_r=0x83100000\0"
- 
-diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
-index 522993b958..0eb8f92809 100644
---- a/include/configs/tegra124-common.h
-+++ b/include/configs/tegra124-common.h
-@@ -52,6 +52,7 @@
- 	"scriptaddr=0x90000000\0" \
- 	"pxefile_addr_r=0x90100000\0" \
- 	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-+	"fdtfile=" FDTFILE "\0" \
- 	"fdt_addr_r=0x83000000\0" \
- 	"ramdisk_addr_r=0x83100000\0"
- 
-diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h
-index b4936cc731..5c3ad35c76 100644
---- a/include/configs/tegra186-common.h
-+++ b/include/configs/tegra186-common.h
-@@ -49,6 +49,7 @@
- 	"scriptaddr=0x90000000\0" \
- 	"pxefile_addr_r=0x90100000\0" \
- 	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-+	"fdtfile=" FDTFILE "\0" \
- 	"fdt_addr_r=0x82000000\0" \
- 	"ramdisk_addr_r=0x82100000\0"
- 
-diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
-index 1e31d82574..fdd8996955 100644
---- a/include/configs/tegra20-common.h
-+++ b/include/configs/tegra20-common.h
-@@ -51,6 +51,7 @@
- 	"scriptaddr=0x10000000\0" \
- 	"pxefile_addr_r=0x10100000\0" \
- 	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-+	"fdtfile=" FDTFILE "\0" \
- 	"fdt_addr_r=0x03000000\0" \
- 	"ramdisk_addr_r=0x03100000\0"
- 
-diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h
-index 1b8e94b60c..2226effe16 100644
---- a/include/configs/tegra210-common.h
-+++ b/include/configs/tegra210-common.h
-@@ -46,6 +46,7 @@
- 	"scriptaddr=0x90000000\0" \
- 	"pxefile_addr_r=0x90100000\0" \
- 	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-+	"fdtfile=" FDTFILE "\0" \
- 	"fdt_addr_r=0x83000000\0" \
- 	"ramdisk_addr_r=0x83200000\0"
- 
-diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
-index 54bc6756ab..6c5dc24b26 100644
---- a/include/configs/tegra30-common.h
-+++ b/include/configs/tegra30-common.h
-@@ -47,6 +47,7 @@
- 	"scriptaddr=0x90000000\0" \
- 	"pxefile_addr_r=0x90100000\0" \
- 	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-+	"fdtfile=" FDTFILE "\0" \
- 	"fdt_addr_r=0x83000000\0" \
- 	"ramdisk_addr_r=0x83100000\0"
- 
--- 
-2.26.2
-

sources

@@ -1 +1 @@
-SHA512 (u-boot-2021.01-rc3.tar.bz2) = 4c88bbdeb1e39e52bb069c4bf65c9829290a51da9a21de8e60d50b62c74ae98a35d22a235fdc0a86467aedc34f85dff5d63b874af247323d0d5bdcb2e82cd4a3
+SHA512 (u-boot-2021.01-rc4.tar.bz2) = 6de2c60d02276f4eed31b5baf2d8239ad0af30c9d341339a4cd7fa0786068cb5faa1ab8bd0b4155e536962e1a4869906f60f1d2a1e50b0ed15e98c2e84d6a97b

uboot-tools.spec

@@ -1,8 +1,8 @@
-%global candidate rc3
+%global candidate rc4
 
 Name:     uboot-tools
 Version:  2021.01
-Release:  0.3%{?candidate:.%{candidate}}%{?dist}
+Release:  0.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
@@ -18,19 +18,17 @@ Source4:  aarch64-chromebooks
 Patch1:   uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
 # Needed due to issues with shim
 Patch2:   uefi-use-Fedora-specific-path-name.patch
-#Patch3:   rockchip-spl-u-boot-itb-offset.patch
+# RPi - uses RPI firmware device tree for HAT support
+Patch3:   rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
+# Ajust the U-Boot offsets in SPL to take less space
+#Patch4:   rockchip-spl-u-boot-itb-offset.patch
 
 # Board fixes and enablement
-# RPi - uses RPI firmware device tree for HAT support
-Patch4:   rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
 Patch5:   Raspberry-Pi-400-Compute-Module-4-support.patch
-# Tegra improvements
-Patch6:   arm-tegra-define-fdtfile-option-for-distro-boot.patch
-Patch7:   arm-add-BOOTENV_EFI_SET_FDTFILE_FALLBACK-for-tegra186-be.patch
 # AllWinner improvements
 Patch10:  AllWinner-PineTab.patch
-Patch11:  0001-Fixes-for-AllWinner-ethernet-network-interfaces.patch
+Patch11:  sunxi-add-PineCube-board.patch
-Patch12:  sunxi-add-PineCube-board.patch
+Patch12:  0001-Fixes-for-AllWinner-ethernet-network-interfaces.patch
 # TI fixes
 Patch13:  0001-Fix-BeagleAI-detection.patch
 # Rockchips improvements
@@ -236,6 +234,10 @@ cp -p board/warp7/README builds/docs/README.warp7
 %endif
 
 %changelog
+* Sun Dec 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.4.rc4
+- Update to 2021.01 RC4
+- Latest RPi-400/CM4 support patch
+
 * Tue Dec 15 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.3.rc3
 - Update to 2021.01 RC3
 - Latest RPi-400/CM4 support patch