mekotronics: rk3588: u-boot: rewrite u-boot patches, no changes

- rewritten against 609a77ef6e99c56aacd4b8d8f9c3056378f9c761 - a specific commit in radxa's next-dev
alexl83 · Jul 4, 2024 · 8ed90ed · 8ed90ed
1 parent 7dfb7ed
commit 8ed90ed
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...erial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch b/...erial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.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 1d0ae1bbe0ca..75bd0adc8f8f 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)

diff --git a/...meko-rk3588/0002-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch b/...meko-rk3588/0002-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch
@@ -9,7 +9,7 @@ Signed-off-by: Stephen <[email protected]>
  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)

diff --git a/...meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch b/...meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch
@@ -10,7 +10,7 @@ Subject: rk3588_meko_defconfig - evb sans optee (original-ish by Meko from
 
 diff --git a/configs/rk3588_meko_defconfig b/configs/rk3588_meko_defconfig
 new file mode 100644
-index 000000000000..73104bb182de
+index 000000000000..111111111111
 --- /dev/null
 +++ b/configs/rk3588_meko_defconfig
 @@ -0,0 +1,238 @@

diff --git a/...k3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch b/...k3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch
@@ -13,7 +13,7 @@ Subject: rk3588_meko_r58x_defconfig and dts with pci3x4 nvme boot and working
 
 diff --git a/arch/arm/dts/rk3588-blueberry-edge-v12.dts b/arch/arm/dts/rk3588-blueberry-edge-v12.dts
 new file mode 100644
-index 000000000000..5dd31189e3d4
+index 000000000000..111111111111
 --- /dev/null
 +++ b/arch/arm/dts/rk3588-blueberry-edge-v12.dts
 @@ -0,0 +1,159 @@
@@ -178,7 +178,7 @@ index 000000000000..5dd31189e3d4
 +
 diff --git a/configs/rk3588_meko_r58x_defconfig b/configs/rk3588_meko_r58x_defconfig
 new file mode 100644
-index 000000000000..b03ffa9437c7
+index 000000000000..111111111111
 --- /dev/null
 +++ b/configs/rk3588_meko_r58x_defconfig
 @@ -0,0 +1,248 @@

diff --git a/...8/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch b/...8/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch
@@ -10,7 +10,7 @@ Subject: boot_rkimg: don't try rockchip_u2phy_vbus_detect when RECOVERY button
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/mach-rockchip/boot_rkimg.c b/arch/arm/mach-rockchip/boot_rkimg.c
-index 9e6c3556a9e2..f79aed467bc1 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/mach-rockchip/boot_rkimg.c
 +++ b/arch/arm/mach-rockchip/boot_rkimg.c
 @@ -322,14 +322,17 @@ void setup_download_mode(void)