From e006fd503572c5ceb996723d77af92f898a09c09 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 16 Aug 2021 20:03:59 +0100 Subject: [PATCH] 2021.10 RC2 --- ...class-Add-support-to-manually-reloca.patch | 53 ----------------- rockchip-fix-mmc-numbering.patch | 57 ------------------- sources | 2 +- uboot-tools.spec | 9 +-- 4 files changed, 6 insertions(+), 115 deletions(-) delete mode 100644 0001-Revert-spi-spi-uclass-Add-support-to-manually-reloca.patch delete mode 100644 rockchip-fix-mmc-numbering.patch diff --git a/0001-Revert-spi-spi-uclass-Add-support-to-manually-reloca.patch b/0001-Revert-spi-spi-uclass-Add-support-to-manually-reloca.patch deleted file mode 100644 index 5dd7695..0000000 --- a/0001-Revert-spi-spi-uclass-Add-support-to-manually-reloca.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1c56fc2835e10cdc039a4c1d049c1a6978e036f3 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Thu, 22 Jul 2021 16:22:48 +0100 -Subject: [PATCH] Revert "spi: spi-uclass: Add support to manually relocate spi - memory ops" - -This reverts commit 346df7d4fa62afc578d820b3a18815eec765074f. - -This patch broke booting Rockchip systems from U-Boot residing on SPI -flash, for at least the Pinebook Pro and Rockpro64, and also confirmed -with the not yet upstream Helios64. - -Signed-off-by: Peter Robinson -Cc: T Karthik Reddy -Cc: Ashok Reddy Soma -Cc: Michal Simek -Cc: Pratyush Yadav ---- - drivers/spi/spi-uclass.c | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c -index d867b27806..ec7f4652b3 100644 ---- a/drivers/spi/spi-uclass.c -+++ b/drivers/spi/spi-uclass.c -@@ -11,7 +11,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -200,16 +199,6 @@ static int spi_post_probe(struct udevice *bus) - ops->set_mode += gd->reloc_off; - if (ops->cs_info) - ops->cs_info += gd->reloc_off; -- if (ops->mem_ops) { -- struct spi_controller_mem_ops *mem_ops = -- (struct spi_controller_mem_ops *)ops->mem_ops; -- if (mem_ops->adjust_op_size) -- mem_ops->adjust_op_size += gd->reloc_off; -- if (mem_ops->supports_op) -- mem_ops->supports_op += gd->reloc_off; -- if (mem_ops->exec_op) -- mem_ops->exec_op += gd->reloc_off; -- } - reloc_done++; - } - #endif --- -2.31.1 - diff --git a/rockchip-fix-mmc-numbering.patch b/rockchip-fix-mmc-numbering.patch deleted file mode 100644 index b8569be..0000000 --- a/rockchip-fix-mmc-numbering.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 76162abd0252cc431abb19421436f34dd9703abe Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 19 Apr 2021 00:09:11 +0100 -Subject: [PATCH] arm: rockchip: fix mmc numbering - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/rk3328.dtsi | 3 +++ - arch/arm/dts/rk3368.dtsi | 3 +++ - arch/arm/dts/rk3399.dtsi | 3 +++ - 3 files changed, 9 insertions(+) - -diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi -index 945387e579..77a556d06f 100644 ---- a/arch/arm/dts/rk3328.dtsi -+++ b/arch/arm/dts/rk3328.dtsi -@@ -27,6 +27,9 @@ - i2c1 = &i2c1; - i2c2 = &i2c2; - i2c3 = &i2c3; -+ mmc0 = &sdmmc; -+ mmc1 = &sdio; -+ mmc2 = &emmc; - ethernet0 = &gmac2io; - ethernet1 = &gmac2phy; - }; -diff --git a/arch/arm/dts/rk3368.dtsi b/arch/arm/dts/rk3368.dtsi -index b4f4f6139d..55b5f6b2a7 100644 ---- a/arch/arm/dts/rk3368.dtsi -+++ b/arch/arm/dts/rk3368.dtsi -@@ -62,6 +62,9 @@ - i2c3 = &i2c3; - i2c4 = &i2c4; - i2c5 = &i2c5; -+ mmc0 = &sdmmc; -+ mmc1 = &sdio0; -+ mmc2 = &emmc; - serial0 = &uart0; - serial1 = &uart1; - serial2 = &uart2; -diff --git a/arch/arm/dts/rk3399.dtsi b/arch/arm/dts/rk3399.dtsi -index 74f2c3d490..5997c29bc8 100644 ---- a/arch/arm/dts/rk3399.dtsi -+++ b/arch/arm/dts/rk3399.dtsi -@@ -29,6 +29,9 @@ - i2c6 = &i2c6; - i2c7 = &i2c7; - i2c8 = &i2c8; -+ mmc0 = &sdmmc; -+ mmc1 = &sdio0; -+ mmc2 = &sdhci; - serial0 = &uart0; - serial1 = &uart1; - serial2 = &uart2; --- -2.31.1 - diff --git a/sources b/sources index b1c060f..f55c53a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2021.10-rc1.tar.bz2) = 1481cb95501432b8cf5a06793e0e9dd3164911b8844bd328dccf88deabeb6fe18c865003f170b5d46a0b2b301a0960478582f922381e3e9b36962a97fe6cb5bc +SHA512 (u-boot-2021.10-rc2.tar.bz2) = 311e83e982b4fcbb54e67a87302eb49f10e15291956bae08b0edb2065cfefb1b8e7b8a60514fdbc6d86d4129774ddf2fb37620b87917af74bfe31e432b265f9e diff --git a/uboot-tools.spec b/uboot-tools.spec index fd0a2bc..1673200 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc1 +%global candidate rc2 Name: uboot-tools Version: 2021.10 -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 @@ -27,8 +27,6 @@ Patch10: AllWinner-PineTab.patch Patch11: 0001-Fix-BeagleAI-detection.patch # Rockchips improvements Patch12: phy-rockchip-inno-usb2-fix-hang-when-multiple-controllers-exit.patch -Patch13: rockchip-fix-mmc-numbering.patch -Patch14: 0001-Revert-spi-spi-uclass-Add-support-to-manually-reloca.patch BuildRequires: bc BuildRequires: dtc @@ -256,6 +254,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Mon Aug 16 2021 Peter Robinson - 2021.10-0.2.rc2 +- Update to 2021.10 RC2 + * Sun Aug 08 2021 Peter Robinson - 2021.10-0.1.rc1 - Update to 2021.10 RC1