2022.01 RC4

2021-12-20 19:55:40 +00:00 · 2021-12-20 19:55:40 +00:00 · d98cfa77d6
parent c08df485fa
commit d98cfa77d6
4 changed files with 10 additions and 196 deletions
--- a/0001-Fix-BeagleAI-detection.patch
+++ b/0001-Fix-BeagleAI-detection.patch
@ -1,29 +0,0 @@
-From 1849ef423238aeb1732eb3b8e67eb46bc21401c7 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 10 Sep 2020 14:24:12 +0100
-Subject: [PATCH] Fix BeagleAI detection
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
- board/ti/am57xx/board.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
-index 7809875510..3232812a97 100644
--- a/board/ti/am57xx/board.c
-+++ b/board/ti/am57xx/board.c
-@@ -527,8 +527,10 @@ void do_board_detect(void)
- 
- 	rc = ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS,
- 				  CONFIG_EEPROM_CHIP_ADDRESS);
-	if (rc)
-+	if (rc) {
- 		printf("ti_i2c_eeprom_init failed %d\n", rc);
-+		ti_i2c_eeprom_am_set("BBONE-AI", "A");
-+	}
- 
- #ifdef CONFIG_SUPPORT_EMMC_BOOT
- 	rc = board_bootmode_has_emmc();
-- 
-2.26.2
-
--- a/0001-enable-hs400-and-sdma-support.patch
+++ b/0001-enable-hs400-and-sdma-support.patch
@ -1,158 +0,0 @@
-From 42aa88db46fa88db52bbb5a96fc0eaebe695110e Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Mon, 30 Aug 2021 18:20:39 +0100
-Subject: [PATCH] enable hs400 and sdma support
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
- configs/firefly-rk3399_defconfig       | 2 ++
- configs/nanopc-t4-rk3399_defconfig     | 2 ++
- configs/nanopi-m4-2gb-rk3399_defconfig | 2 ++
- configs/nanopi-m4-rk3399_defconfig     | 2 ++
- configs/nanopi-m4b-rk3399_defconfig    | 2 ++
- configs/nanopi-neo4-rk3399_defconfig   | 2 ++
- configs/nanopi-r4s-rk3399_defconfig    | 2 ++
- configs/pinebook-pro-rk3399_defconfig  | 1 +
- configs/rock960-rk3399_defconfig       | 1 +
- configs/rockpro64-rk3399_defconfig     | 2 ++
- 10 files changed, 18 insertions(+)
-
-diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
-index 2ca2ac35e4..84ee690a2d 100644
--- a/configs/firefly-rk3399_defconfig
-+++ b/configs/firefly-rk3399_defconfig
-@@ -33,7 +33,9 @@ CONFIG_MISC=y
- CONFIG_ROCKCHIP_EFUSE=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_HS400_SUPPORT=y
- CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
- CONFIG_SF_DEFAULT_SPEED=20000000
- CONFIG_DM_ETH=y
-diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
-index a94f428def..722377803e 100644
--- a/configs/nanopc-t4-rk3399_defconfig
-+++ b/configs/nanopc-t4-rk3399_defconfig
-@@ -30,7 +30,9 @@ CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_HS400_SUPPORT=y
- CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
- CONFIG_DM_ETH=y
- CONFIG_ETH_DESIGNWARE=y
-diff --git a/configs/nanopi-m4-2gb-rk3399_defconfig b/configs/nanopi-m4-2gb-rk3399_defconfig
-index c9833fdb85..384d7da80c 100644
--- a/configs/nanopi-m4-2gb-rk3399_defconfig
-+++ b/configs/nanopi-m4-2gb-rk3399_defconfig
-@@ -29,7 +29,9 @@ CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_HS400_SUPPORT=y
- CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
- CONFIG_DM_ETH=y
- CONFIG_ETH_DESIGNWARE=y
-diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
-index 2b2fcac366..b6b8ca8d3a 100644
--- a/configs/nanopi-m4-rk3399_defconfig
-+++ b/configs/nanopi-m4-rk3399_defconfig
-@@ -29,7 +29,9 @@ CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_HS400_SUPPORT=y
- CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
- CONFIG_DM_ETH=y
- CONFIG_ETH_DESIGNWARE=y
-diff --git a/configs/nanopi-m4b-rk3399_defconfig b/configs/nanopi-m4b-rk3399_defconfig
-index 6d3afe1b63..3f83877e0a 100644
--- a/configs/nanopi-m4b-rk3399_defconfig
-+++ b/configs/nanopi-m4b-rk3399_defconfig
-@@ -29,7 +29,9 @@ CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_HS400_SUPPORT=y
- CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
- CONFIG_DM_ETH=y
- CONFIG_ETH_DESIGNWARE=y
-diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
-index 1bf5d1d095..6412cb2d7e 100644
--- a/configs/nanopi-neo4-rk3399_defconfig
-+++ b/configs/nanopi-neo4-rk3399_defconfig
-@@ -29,7 +29,9 @@ CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_HS400_SUPPORT=y
- CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
- CONFIG_DM_ETH=y
- CONFIG_ETH_DESIGNWARE=y
-diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig
-index 351d2eb553..7b527d47fa 100644
--- a/configs/nanopi-r4s-rk3399_defconfig
-+++ b/configs/nanopi-r4s-rk3399_defconfig
-@@ -29,7 +29,9 @@ CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_HS400_SUPPORT=y
- CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
- CONFIG_DM_ETH=y
- CONFIG_ETH_DESIGNWARE=y
-diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
-index f97d5e872b..b0e68c9591 100644
--- a/configs/pinebook-pro-rk3399_defconfig
-+++ b/configs/pinebook-pro-rk3399_defconfig
-@@ -46,6 +46,7 @@ CONFIG_MISC=y
- CONFIG_ROCKCHIP_EFUSE=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_HS400_SUPPORT=y
- CONFIG_MMC_SDHCI=y
- CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
-diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
-index 0233e0ea52..624d718f9f 100644
--- a/configs/rock960-rk3399_defconfig
-+++ b/configs/rock960-rk3399_defconfig
-@@ -36,6 +36,7 @@ CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_HS400_SUPPORT=y
- CONFIG_MMC_SDHCI=y
- CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
-diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
-index ae11a8f5eb..b4e7e9700a 100644
--- a/configs/rockpro64-rk3399_defconfig
-+++ b/configs/rockpro64-rk3399_defconfig
-@@ -39,7 +39,9 @@ CONFIG_MISC=y
- CONFIG_ROCKCHIP_EFUSE=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_HS400_SUPPORT=y
- CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
- CONFIG_SF_DEFAULT_BUS=1
- CONFIG_SPI_FLASH_GIGADEVICE=y
-- 
-2.31.1
-
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (u-boot-2022.01-rc2.tar.bz2) = 1caaff097270ee205cf63cca0d66c6161ff03d927275dc7f757b39d59a52a21e7d81d5391570e649a196d9ba114536539cef688cdc43690a2e53d321f22fec43
+SHA512 (u-boot-2022.01-rc4.tar.bz2) = 2b07f52794056926125ca0327999c06939c19c9bbcfa2b3ea6809a2298adee1323f22f142aed57297be07541662f1d909af23393f78d7718ff6963d0552119b7
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@ -1,8 +1,8 @@
-%global candidate rc2
+%global candidate rc4

 Name:     uboot-tools
 Version:  2022.01
-Release:  0.1%{?candidate:.%{candidate}}%{?dist}
+Release:  0.2%{?candidate:.%{candidate}}%{?dist}
 Summary:  U-Boot utilities
 License:  GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
 URL:      http://www.denx.de/wiki/U-Boot
@ -15,18 +15,16 @@ Source2:  aarch64-boards
 # Fedoraisms patches
 # Needed to find DT on boot partition that's not the first partition
 Patch1:   uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
+
 # Board fixes and enablement
 # RPi - uses RPI firmware device tree for HAT support
 Patch2:   rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
 Patch3:   rpi-fallback-to-max-clock-for-mmc.patch
 Patch4:   rpi-bcm2835_sdhost-firmware-managed-clock.patch
-# TI fixes
-Patch11:  0001-Fix-BeagleAI-detection.patch
 # Rockchips improvements
-Patch12:  phy-rockchip-inno-usb2-fix-hang-when-multiple-controllers-exit.patch
-Patch13:  0001-Revert-spi-spi-uclass-Add-support-to-manually-reloca.patch
-Patch14:  0001-enable-hs400-and-sdma-support.patch
-Patch15:  dts-rockchip-rk3399-enable-emmc-phy-for-spl.patch
+Patch5:  phy-rockchip-inno-usb2-fix-hang-when-multiple-controllers-exit.patch
+Patch6:  dts-rockchip-rk3399-enable-emmc-phy-for-spl.patch
+Patch7:  0001-Revert-spi-spi-uclass-Add-support-to-manually-reloca.patch

 BuildRequires:  bc
 BuildRequires:  dtc
@ -252,6 +250,9 @@ cp -p board/warp7/README builds/docs/README.warp7
 %endif

 %changelog
+* Mon Dec 20 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.01-0.2.rc4
+- Update to 2022.01 RC4
+
 * Mon Nov 15 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.01-0.1.rc2
 - Update to 2022.01 RC2