mixtile-blade3: rk3588: u-boot: rewrite u-boot patches, no changes

- rewritten against ddc91cd08c10f625f7a7c93033042aa4071c78a8 - a specific commit in radxa's next-dev
2024-07-02 21:43:31 +02:00 · 2024-07-02 21:43:31 +02:00 · 5048eda353
commit 5048eda353
parent ff4e85ec98
11 changed files with 20 additions and 20 deletions
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0001-Add-Blade-3-defines.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0001-Add-Blade-3-defines.patch
@ -10,7 +10,7 @@ Subject: Add Blade 3 defines

 diff --git a/arch/arm/dts/rk3588-blade3.dts b/arch/arm/dts/rk3588-blade3.dts
 new file mode 100644
-index 000000000000..d46226011c0f
+index 000000000000..111111111111
 --- /dev/null
 +++ b/arch/arm/dts/rk3588-blade3.dts
@@ -0,0 +1,50 @@
@ -66,7 +66,7 @@ index 000000000000..d46226011c0f
 +};
 diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig
 new file mode 100644
-index 000000000000..092677e7fcd8
+index 000000000000..111111111111
 --- /dev/null
 +++ b/configs/blade3_defconfig
@@ -0,0 +1,225 @@
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0002-Fixed-restart-issues-with-pd-adapter.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0002-Fixed-restart-issues-with-pd-adapter.patch
@ -10,7 +10,7 @@ Subject: Fixed restart issues with pd adapter.
 3 files changed, 140 insertions(+), 76 deletions(-)

 diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
-index 1d0ae1bbe0ca..e60153dde872 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/mach-rockchip/board.c
 +++ b/arch/arm/mach-rockchip/board.c
@@ -414,8 +414,17 @@ static void cmdline_handle(void)
@ -32,7 +32,7 @@ index 1d0ae1bbe0ca..e60153dde872 100644
 	rockchip_set_ethaddr();
 #endif
 diff --git a/drivers/power/power_delivery/fusb302.c b/drivers/power/power_delivery/fusb302.c
-index 395455d06bd3..cf64df4ca4f4 100644
+index 111111111111..222222222222 100644
 --- a/drivers/power/power_delivery/fusb302.c
 +++ b/drivers/power/power_delivery/fusb302.c
@@ -11,7 +11,7 @@
@ -281,7 +281,7 @@ index 395455d06bd3..cf64df4ca4f4 100644
 {
 	struct fusb302_chip *chip = dev_get_priv(dev);
 diff --git a/drivers/power/power_delivery/tcpm.c b/drivers/power/power_delivery/tcpm.c
-index 22334c6230c4..6b628bafa26c 100644
+index 111111111111..222222222222 100644
 --- a/drivers/power/power_delivery/tcpm.c
 +++ b/drivers/power/power_delivery/tcpm.c
@@ -165,7 +165,7 @@
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0003-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0003-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch
@ -8,7 +8,7 @@ Subject: fix power_delivery driver affects adb to enter loader mode.
 1 file changed, 8 insertions(+), 1 deletion(-)

 diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
-index e60153dde872..9b2450ec9010 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/mach-rockchip/board.c
 +++ b/arch/arm/mach-rockchip/board.c
@@ -424,7 +424,14 @@ static void power_delivery_func(void)
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch
@ -8,7 +8,7 @@ Subject: cmd: source: fix the error that the command source failed to execute
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/cmd/source.c b/cmd/source.c
-index 6b1c8b744b49..cf820c072af1 100644
+index 111111111111..222222222222 100644
 --- a/cmd/source.c
 +++ b/cmd/source.c
@@ -87,7 +87,7 @@ source (ulong addr, const char *fit_uname)
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0005-add-device-tree-with-sata-support.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0005-add-device-tree-with-sata-support.patch
@ -10,7 +10,7 @@ Subject: add device tree with sata support

 diff --git a/arch/arm/dts/rk3588-blade3-sata.dts b/arch/arm/dts/rk3588-blade3-sata.dts
 new file mode 100644
-index 000000000000..e3eec13f1e2f
+index 000000000000..111111111111
 --- /dev/null
 +++ b/arch/arm/dts/rk3588-blade3-sata.dts
@@ -0,0 +1,27 @@
@ -43,7 +43,7 @@ index 000000000000..e3eec13f1e2f
 +};
 diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig
 new file mode 100644
-index 000000000000..0f68086a6532
+index 000000000000..111111111111
 --- /dev/null
 +++ b/configs/blade3_sata_defconfig
@@ -0,0 +1,225 @@
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0006-disable-optee-in-defconfig.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0006-disable-optee-in-defconfig.patch
@ -10,7 +10,7 @@ Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
 2 files changed, 2 insertions(+), 8 deletions(-)

 diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig
-index 092677e7fcd8..67408deca855 100644
+index 111111111111..222222222222 100644
 --- a/configs/blade3_defconfig
 +++ b/configs/blade3_defconfig
@@ -200,8 +200,8 @@ CONFIG_DISPLAY=y
@ -31,7 +31,7 @@ index 092677e7fcd8..67408deca855 100644
 -CONFIG_OPTEE_V2=y
 -CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y
 diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig
-index 0f68086a6532..f517434650c7 100644
+index 111111111111..222222222222 100644
 --- a/configs/blade3_sata_defconfig
 +++ b/configs/blade3_sata_defconfig
@@ -200,8 +200,8 @@ CONFIG_DISPLAY=y
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0007-mixtile-blade3-enable-OTP-in-defconfig.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0007-mixtile-blade3-enable-OTP-in-defconfig.patch
@ -9,7 +9,7 @@ Subject: mixtile-blade3: enable OTP in defconfig
 2 files changed, 2 insertions(+)

 diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig
-index 67408deca855..d0bb2907f063 100644
+index 111111111111..222222222222 100644
 --- a/configs/blade3_defconfig
 +++ b/configs/blade3_defconfig
@@ -220,3 +220,4 @@ CONFIG_AVB_LIBAVB_AB=y
@ -18,7 +18,7 @@ index 67408deca855..d0bb2907f063 100644
 CONFIG_RK_AVB_LIBAVB_USER=y
 +CONFIG_ROCKCHIP_OTP=y
 diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig
-index f517434650c7..ea632e1512a2 100644
+index 111111111111..222222222222 100644
 --- a/configs/blade3_sata_defconfig
 +++ b/configs/blade3_sata_defconfig
@@ -220,3 +220,4 @@ CONFIG_AVB_LIBAVB_AB=y
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0008-enable-nvme-pci-and-scsi-in-the-defconfig.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0008-enable-nvme-pci-and-scsi-in-the-defconfig.patch
@ -9,7 +9,7 @@ Subject: enable nvme, pci, and scsi in the defconfig
 2 files changed, 34 insertions(+), 2 deletions(-)

 diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig
-index d0bb2907f063..0ed3a08d853e 100644
+index 111111111111..222222222222 100644
 --- a/configs/blade3_defconfig
 +++ b/configs/blade3_defconfig
@@ -29,7 +29,7 @@ CONFIG_SPL_LOAD_FIT=y
@ -49,7 +49,7 @@ index d0bb2907f063..0ed3a08d853e 100644
 +CONFIG_SCSI_AHCI=y
 +CONFIG_SCSI=y
 diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig
-index ea632e1512a2..b62ff90d651b 100644
+index 111111111111..222222222222 100644
 --- a/configs/blade3_sata_defconfig
 +++ b/configs/blade3_sata_defconfig
@@ -29,7 +29,7 @@ CONFIG_SPL_LOAD_FIT=y
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0009-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0009-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch
@ -9,7 +9,7 @@ Subject: use serial# as base for MAC address; find serial# first, then
 1 file changed, 67 insertions(+), 5 deletions(-)

 diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
-index 9b2450ec9010..408e9eadf46c 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/mach-rockchip/board.c
 +++ b/arch/arm/mach-rockchip/board.c
@@ -109,15 +109,55 @@ static int rockchip_set_ethaddr(void)
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0010-blade3-enable-pcie3x4.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0010-blade3-enable-pcie3x4.patch
@ -9,7 +9,7 @@ Subject: blade3: enable pcie3x4
 2 files changed, 95 insertions(+), 20 deletions(-)

 diff --git a/arch/arm/dts/rk3588-blade3.dts b/arch/arm/dts/rk3588-blade3.dts
-index d46226011c0f..ba0e7306406b 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/dts/rk3588-blade3.dts
 +++ b/arch/arm/dts/rk3588-blade3.dts
@@ -5,7 +5,6 @@
@ -114,7 +114,7 @@ index d46226011c0f..ba0e7306406b 100644
 };
 +
 diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig
-index 0ed3a08d853e..07dde02b4276 100644
+index 111111111111..222222222222 100644
 --- a/configs/blade3_defconfig
 +++ b/configs/blade3_defconfig
@@ -6,14 +6,14 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0011-arch-arm-mach-rockchip-fix-srctree-path.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0011-arch-arm-mach-rockchip-fix-srctree-path.patch
@ -9,7 +9,7 @@ Subject: arch: arm: mach-rockchip: fix srctree path
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/arch/arm/mach-rockchip/fit_nodes.sh b/arch/arm/mach-rockchip/fit_nodes.sh
-index be7d46d8f71c..c0afc1ade315 100755
+index 111111111111..222222222222 100755
 --- a/arch/arm/mach-rockchip/fit_nodes.sh
 +++ b/arch/arm/mach-rockchip/fit_nodes.sh
@@ -6,7 +6,7 @@
@ -22,7 +22,7 @@ index be7d46d8f71c..c0afc1ade315 100755
 
 # Periph register
 diff --git a/arch/arm/mach-rockchip/make_fit_atf.sh b/arch/arm/mach-rockchip/make_fit_atf.sh
-index 045273e3bd08..fa6a9780ed0c 100755
+index 111111111111..222222222222 100755
 --- a/arch/arm/mach-rockchip/make_fit_atf.sh
 +++ b/arch/arm/mach-rockchip/make_fit_atf.sh
@@ -5,7 +5,7 @@