rk3318-box: rewrite u-boot patches against v2024.07-rc5

alexl83 · Jul 8, 2024 · f60b3bb · f60b3bb
1 parent 07084b6
commit f60b3bb
Show file tree

Hide file tree

Showing 7 changed files with 334 additions and 138 deletions.
diff --git a/patch/u-boot/v2024.07/board_rk3318-box/general-support-rmii-integrated-phy.patch b/patch/u-boot/v2024.07/board_rk3318-box/general-support-rmii-integrated-phy.patch
diff --git a/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-defconfig.patch b/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-defconfig.patch
@@ -1,6 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Oleg <[email protected]>
+Date: Wed, 27 Oct 2021 18:56:02 +0200
+Subject: [ARCHEOLOGY] u-boot usb m1 (#3221)
+
+> X-Git-Archeology: - Revision 7789fef83f10954ab442401a86a0e5a166e5db55: https://github.com/armbian/build/commit/7789fef83f10954ab442401a86a0e5a166e5db55
+> X-Git-Archeology:   Date: Wed, 27 Oct 2021 18:56:02 +0200
+> X-Git-Archeology:   From: Oleg <[email protected]>
+> X-Git-Archeology:   Subject: u-boot usb m1 (#3221)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision fd33c6545bbb4bf2383fc212dd305f3b09e47fac: https://github.com/armbian/build/commit/fd33c6545bbb4bf2383fc212dd305f3b09e47fac
+> X-Git-Archeology:   Date: Wed, 27 Oct 2021 20:28:50 +0200
+> X-Git-Archeology:   From: Piotr Szczepanik <[email protected]>
+> X-Git-Archeology:   Subject: Moved remaining u-boot rockchip64 mainline patches to new directory
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 2b431a49151f7bc1e0e593b4b1b4fea9dfefe229: https://github.com/armbian/build/commit/2b431a49151f7bc1e0e593b4b1b4fea9dfefe229
+> X-Git-Archeology:   Date: Thu, 16 Jun 2022 19:29:16 +0200
+> X-Git-Archeology:   From: Piotr Szczepanik <[email protected]>
+> X-Git-Archeology:   Subject: Adjust u-boot configs for Station M1 and Station P1 (#3900)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 2ca6a9381db4b875533926e0eae9d3d17f68ad06: https://github.com/armbian/build/commit/2ca6a9381db4b875533926e0eae9d3d17f68ad06
+> X-Git-Archeology:   Date: Thu, 23 Jun 2022 08:30:54 +0200
+> X-Git-Archeology:   From: Paolo <[email protected]>
+> X-Git-Archeology:   Subject: rockchip64: add rk3318-box tvbox board patch and configurations (#3921)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 4707e71e35ce43f35509ca65b1406d74d3e1c16f: https://github.com/armbian/build/commit/4707e71e35ce43f35509ca65b1406d74d3e1c16f
+> X-Git-Archeology:   Date: Sun, 26 Nov 2023 13:58:04 +0100
+> X-Git-Archeology:   From: Alex Shumsky <[email protected]>
+> X-Git-Archeology:   Subject: rk3318-box: Enable uboot BTRFS support
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision eec57ef6ce5837cf9a69b1ef03422a3ebeb9d556: https://github.com/armbian/build/commit/eec57ef6ce5837cf9a69b1ef03422a3ebeb9d556
+> X-Git-Archeology:   Date: Mon, 18 Dec 2023 10:03:17 +0100
+> X-Git-Archeology:   From: Alex Shumsky <[email protected]>
+> X-Git-Archeology:   Subject: rk3318: add uboot Recovery button support
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 6154b98851b93e868acfa0dc5e2a9abedfce2308: https://github.com/armbian/build/commit/6154b98851b93e868acfa0dc5e2a9abedfce2308
+> X-Git-Archeology:   Date: Fri, 23 Feb 2024 11:20:57 +0100
+> X-Git-Archeology:   From: Alex Shumsky <[email protected]>
+> X-Git-Archeology:   Subject: rk3318: enable uboot gpio command
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision efee17f217e58a93e795c165e303bfd0a2a0a32a: https://github.com/armbian/build/commit/efee17f217e58a93e795c165e303bfd0a2a0a32a
+> X-Git-Archeology:   Date: Mon, 22 Apr 2024 12:39:09 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip64: bump rk3318-box uboot to v2024.01
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision e127109e2dddb7ed48a9fef0b1b60fc8d064cff0: https://github.com/armbian/build/commit/e127109e2dddb7ed48a9fef0b1b60fc8d064cff0
+> X-Git-Archeology:   Date: Fri, 14 Jun 2024 00:35:08 +0200
+> X-Git-Archeology:   From: Alex Shumsky <[email protected]>
+> X-Git-Archeology:   Subject: rockchip64/rk3318-box: move stack further from base addr to allow bigger uboot image
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 7876017d0b77bbfefbb3d112045b32d9b50db928: https://github.com/armbian/build/commit/7876017d0b77bbfefbb3d112045b32d9b50db928
+> X-Git-Archeology:   Date: Tue, 02 Jul 2024 23:31:50 +0000
+> X-Git-Archeology:   From: Paolo <[email protected]>
+> X-Git-Archeology:   Subject: Bump rk322x-box and rk3318-box to u-boot v2024.07-rc5 (#6855)
+> X-Git-Archeology:
+---
+ configs/rk3318-box_defconfig | 131 ++++++++++
+ 1 file changed, 131 insertions(+)
+
 diff --git a/configs/rk3318-box_defconfig b/configs/rk3318-box_defconfig
 new file mode 100644
-index 0000000000..97bb10576e
+index 000000000000..111111111111
 --- /dev/null
 +++ b/configs/rk3318-box_defconfig
 @@ -0,0 +1,131 @@
@@ -135,3 +194,6 @@ index 0000000000..97bb10576e
 +CONFIG_TPL_TINY_MEMSET=y
 +CONFIG_ERRNO_STR=y
 +# CONFIG_EFI_LOADER is not set
+-- 
+Armbian
+
diff --git a/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-dts.patch b/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-dts.patch
@@ -1,18 +1,16 @@
-From 07a80d60680491abbf0db91071a66fe17ceeae4f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <[email protected]>
 Date: Sun, 16 Jun 2024 16:00:41 +0200
-Subject: [PATCH] Add rk3318-box device tree
+Subject: Add rk3318-box device tree
 
 ---
- arch/arm/dts/Makefile               |   3 +
- arch/arm/dts/rk3318-box-u-boot.dtsi |  58 +++
- dts/upstream/src/arm64/rockchip/rk3318-box.dts         | 648 ++++++++++++++++++++++++++++
+ arch/arm/dts/Makefile                          |   3 +
+ arch/arm/dts/rk3318-box-u-boot.dtsi            |  58 +
+ dts/upstream/src/arm64/rockchip/rk3318-box.dts | 648 ++++++++++
  3 files changed, 709 insertions(+)
- create mode 100644 arch/arm/dts/rk3318-box-u-boot.dtsi
- create mode 100644 arch/arm/dts/rk3318-box.dts
 
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 8fb6a8a1f1..a08f1a82e4 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
 @@ -90,6 +90,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \
@@ -27,7 +25,7 @@ index 8fb6a8a1f1..a08f1a82e4 100644
  	rk3368-sheep.dtb \
 diff --git a/arch/arm/dts/rk3318-box-u-boot.dtsi b/arch/arm/dts/rk3318-box-u-boot.dtsi
 new file mode 100644
-index 0000000000..ffe48d8932
+index 000000000000..111111111111
 --- /dev/null
 +++ b/arch/arm/dts/rk3318-box-u-boot.dtsi
 @@ -0,0 +1,58 @@
@@ -91,7 +89,7 @@ index 0000000000..ffe48d8932
 +};
 diff --git a/dts/upstream/src/arm64/rockchip/rk3318-box.dts b/dts/upstream/src/arm64/rockchip/rk3318-box.dts
 new file mode 100644
-index 0000000000..ad98288ea9
+index 000000000000..111111111111
 --- /dev/null
 +++ b/dts/upstream/src/arm64/rockchip/rk3318-box.dts
 @@ -0,0 +1,648 @@
@@ -744,5 +742,5 @@ index 0000000000..ad98288ea9
 +	status = "okay";
 +};
 -- 
-2.34.1
+Armbian
 
diff --git a/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-makefile.patch b/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-makefile.patch
@@ -1,5 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo <[email protected]>
+Date: Thu, 23 Jun 2022 08:30:54 +0200
+Subject: [ARCHEOLOGY] rockchip64: add rk3318-box tvbox board patch and
+ configurations (#3921)
+
+> X-Git-Archeology: > recovered message: > * rockchip64: add rk3318-box tvbox board patch and configurations
+> X-Git-Archeology: > recovered message: > * rockchip64: add missing bcm43342 patch for edge kernel
+> X-Git-Archeology: - Revision 2ca6a9381db4b875533926e0eae9d3d17f68ad06: https://github.com/armbian/build/commit/2ca6a9381db4b875533926e0eae9d3d17f68ad06
+> X-Git-Archeology:   Date: Thu, 23 Jun 2022 08:30:54 +0200
+> X-Git-Archeology:   From: Paolo <[email protected]>
+> X-Git-Archeology:   Subject: rockchip64: add rk3318-box tvbox board patch and configurations (#3921)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
+> X-Git-Archeology:   Date: Mon, 07 Nov 2022 21:29:00 +0100
+> X-Git-Archeology:   From: Igor Pecovnik <[email protected]>
+> X-Git-Archeology:   Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision efee17f217e58a93e795c165e303bfd0a2a0a32a: https://github.com/armbian/build/commit/efee17f217e58a93e795c165e303bfd0a2a0a32a
+> X-Git-Archeology:   Date: Mon, 22 Apr 2024 12:39:09 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip64: bump rk3318-box uboot to v2024.01
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 7876017d0b77bbfefbb3d112045b32d9b50db928: https://github.com/armbian/build/commit/7876017d0b77bbfefbb3d112045b32d9b50db928
+> X-Git-Archeology:   Date: Tue, 02 Jul 2024 23:31:50 +0000
+> X-Git-Archeology:   From: Paolo <[email protected]>
+> X-Git-Archeology:   Subject: Bump rk322x-box and rk3318-box to u-boot v2024.07-rc5 (#6855)
+> X-Git-Archeology:
+---
+ arch/arm/mach-rockchip/rk3328/Kconfig  |  8 ++
+ board/rockchip/rk3318_box/Kconfig      | 15 ++
+ board/rockchip/rk3318_box/MAINTAINERS  | 26 ++++
+ board/rockchip/rk3318_box/Makefile     |  7 +
+ board/rockchip/rk3318_box/README       | 70 ++++++++++
+ board/rockchip/rk3318_box/rk3318-box.c |  5 +
+ include/configs/rk3318-box.h           | 28 ++++
+ 7 files changed, 159 insertions(+)
+
 diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig
-index d13a1690..f2d8dab4 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/mach-rockchip/rk3328/Kconfig
 +++ b/arch/arm/mach-rockchip/rk3328/Kconfig
 @@ -10,6 +10,13 @@ config TARGET_EVB_RK3328
@@ -16,16 +54,16 @@ index d13a1690..f2d8dab4 100644
  endchoice
 
  config ROCKCHIP_BOOT_MODE_REG
-@@ -40,5 +47,6 @@ config TPL_STACK
- 	default 0xff098000
+@@ -37,5 +44,6 @@ config TPL_SYS_MALLOC_F_LEN
+ 	default 0x800
 
  source "board/rockchip/evb_rk3328/Kconfig"
 +source "board/rockchip/rk3318_box/Kconfig"
 
  endif
 diff --git a/board/rockchip/rk3318_box/Kconfig b/board/rockchip/rk3318_box/Kconfig
 new file mode 100644
-index 00000000..4b146413
+index 000000000000..111111111111
 --- /dev/null
 +++ b/board/rockchip/rk3318_box/Kconfig
 @@ -0,0 +1,15 @@
@@ -46,7 +84,7 @@ index 00000000..4b146413
 +endif
 diff --git a/board/rockchip/rk3318_box/MAINTAINERS b/board/rockchip/rk3318_box/MAINTAINERS
 new file mode 100644
-index 00000000..e7dd59ff
+index 000000000000..111111111111
 --- /dev/null
 +++ b/board/rockchip/rk3318_box/MAINTAINERS
 @@ -0,0 +1,26 @@
@@ -78,7 +116,7 @@ index 00000000..e7dd59ff
 +F:      arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi
 diff --git a/board/rockchip/rk3318_box/Makefile b/board/rockchip/rk3318_box/Makefile
 new file mode 100644
-index 00000000..5eba9dfb
+index 000000000000..111111111111
 --- /dev/null
 +++ b/board/rockchip/rk3318_box/Makefile
 @@ -0,0 +1,7 @@
@@ -91,7 +129,7 @@ index 00000000..5eba9dfb
 +obj-y	+= rk3318-box.o
 diff --git a/board/rockchip/rk3318_box/README b/board/rockchip/rk3318_box/README
 new file mode 100644
-index 00000000..6cbb66a4
+index 000000000000..111111111111
 --- /dev/null
 +++ b/board/rockchip/rk3318_box/README
 @@ -0,0 +1,70 @@
@@ -167,7 +205,7 @@ index 00000000..6cbb66a4
 +You should be able to get U-Boot log message in console/UART2 now.
 diff --git a/board/rockchip/rk3318_box/rk3318-box.c b/board/rockchip/rk3318_box/rk3318-box.c
 new file mode 100644
-index 00000000..779bc646
+index 000000000000..111111111111
 --- /dev/null
 +++ b/board/rockchip/rk3318_box/rk3318-box.c
 @@ -0,0 +1,5 @@
@@ -178,7 +216,7 @@ index 00000000..779bc646
 +
 diff --git a/include/configs/rk3318-box.h b/include/configs/rk3318-box.h
 new file mode 100644
-index 0000000000..dfbf9d7177
+index 000000000000..111111111111
 --- /dev/null
 +++ b/include/configs/rk3318-box.h
 @@ -0,0 +1,28 @@
@@ -210,3 +248,6 @@ index 0000000000..dfbf9d7177
 +
 +
 +#endif
+-- 
+Armbian
+
diff --git a/patch/u-boot/v2024.07/board_rk3318-box/rk3328-add-usb-reset-props.patch b/patch/u-boot/v2024.07/board_rk3318-box/rk3328-add-usb-reset-props.patch
@@ -1,8 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo Sabatino <[email protected]>
+Date: Mon, 6 May 2024 15:50:14 +0100
+Subject: [ARCHEOLOGY] rockchip: add reset props for usb on rk322x
+
+> X-Git-Archeology: - Revision 5657ec0798045ad9cff0df0033ff1c963dfcdd66: https://github.com/armbian/build/commit/5657ec0798045ad9cff0df0033ff1c963dfcdd66
+> X-Git-Archeology:   Date: Mon, 06 May 2024 15:50:14 +0100
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip: add reset props for usb on rk322x
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 4b51f88e56c54e3b517e584916241c4942dbfc5f: https://github.com/armbian/build/commit/4b51f88e56c54e3b517e584916241c4942dbfc5f
+> X-Git-Archeology:   Date: Sun, 02 Jun 2024 09:23:31 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rk322x: keep usb resets deasserted on exit
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 7876017d0b77bbfefbb3d112045b32d9b50db928: https://github.com/armbian/build/commit/7876017d0b77bbfefbb3d112045b32d9b50db928
+> X-Git-Archeology:   Date: Tue, 02 Jul 2024 23:31:50 +0000
+> X-Git-Archeology:   From: Paolo <[email protected]>
+> X-Git-Archeology:   Subject: Bump rk322x-box and rk3318-box to u-boot v2024.07-rc5 (#6855)
+> X-Git-Archeology:
+---
+ drivers/usb/host/dwc2.c                     | 5 ++++-
+ drivers/usb/host/ehci-generic.c             | 6 +++---
+ dts/upstream/src/arm64/rockchip/rk3328.dtsi | 8 ++++++++
+ 3 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
+index 111111111111..222222222222 100644
+--- a/drivers/usb/host/dwc2.c
++++ b/drivers/usb/host/dwc2.c
+@@ -1438,7 +1438,10 @@ static int dwc2_usb_remove(struct udevice *dev)
+
+ 	dwc2_uninit_common(priv->regs);
+
+-	reset_release_bulk(&priv->resets);
++	// Assert first and then leave the resets deasserted
++	reset_assert_bulk(&priv->resets);
++	reset_deassert_bulk(&priv->resets);
++
+ 	clk_disable_bulk(&priv->clks);
+ 	clk_release_bulk(&priv->clks);
+
+diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
+index 111111111111..222222222222 100644
+--- a/drivers/usb/host/ehci-generic.c
++++ b/drivers/usb/host/ehci-generic.c
+@@ -148,9 +148,9 @@ static int ehci_usb_remove(struct udevice *dev)
+ 	if (ret)
+ 		return ret;
+
+-	ret = reset_release_bulk(&priv->resets);
+-	if (ret)
+-		return ret;
++	// Assert first and then leave the resets deasserted
++	reset_assert_bulk(&priv->resets);
++	reset_deassert_bulk(&priv->resets);
+
+ 	return clk_release_bulk(&priv->clocks);
+ }
 diff --git a/dts/upstream/src/arm64/rockchip/rk3328.dtsi b/dts/upstream/src/arm64/rockchip/rk3328.dtsi
-index 7b4c15c4a9..a7830155dd 100644
+index 111111111111..222222222222 100644
 --- a/dts/upstream/src/arm64/rockchip/rk3328.dtsi
 +++ b/dts/upstream/src/arm64/rockchip/rk3328.dtsi
-@@ -977,6 +998,8 @@
+@@ -977,6 +977,8 @@
  		g-tx-fifo-size = <256 128 128 64 32 16>;
  		phys = <&u2phy_otg>;
  		phy-names = "usb2-phy";
@@ -11,7 +70,7 @@ index 7b4c15c4a9..a7830155dd 100644
  		status = "disabled";
  	};
 
-@@ -987,6 +1010,8 @@
+@@ -987,6 +989,8 @@
  		clocks = <&cru HCLK_HOST0>, <&u2phy>;
  		phys = <&u2phy_host>;
  		phy-names = "usb";
@@ -20,7 +79,7 @@ index 7b4c15c4a9..a7830155dd 100644
  		status = "disabled";
  	};
 
-@@ -997,6 +1022,8 @@
+@@ -997,6 +1001,8 @@
  		clocks = <&cru HCLK_HOST0>, <&u2phy>;
  		phys = <&u2phy_host>;
  		phy-names = "usb";
@@ -29,7 +88,7 @@ index 7b4c15c4a9..a7830155dd 100644
  		status = "disabled";
  	};
 
-@@ -1010,6 +1037,8 @@
+@@ -1010,6 +1016,8 @@
  			      "bus_clk";
  		dr_mode = "otg";
  		phy_type = "utmi_wide";
@@ -38,37 +97,6 @@ index 7b4c15c4a9..a7830155dd 100644
  		snps,dis-del-phy-power-chg-quirk;
  		snps,dis_enblslpm_quirk;
  		snps,dis-tx-ipgap-linecheck-quirk;
+-- 
+Armbian
 
-diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
-index 936e30438d..09d3805e78 100644
---- a/drivers/usb/host/dwc2.c
-+++ b/drivers/usb/host/dwc2.c
-@@ -1436,7 +1438,10 @@ static int dwc2_usb_remove(struct udevice *dev)
-
- 	dwc2_uninit_common(priv->regs);
-
--	reset_release_bulk(&priv->resets);
-+	// Assert first and then leave the resets deasserted
-+	reset_assert_bulk(&priv->resets);
-+	reset_deassert_bulk(&priv->resets);
-+
- 	clk_disable_bulk(&priv->clks);
- 	clk_release_bulk(&priv->clks);
-
-diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
-index 936e30438d..09d3805e78 100644
---- a/drivers/usb/host/ehci-generic.c
-+++ b/drivers/usb/host/ehci-generic.c
-@@ -148,9 +148,9 @@ static int ehci_usb_remove(struct udevice *dev)
- 	if (ret)
- 		return ret;
-
--	ret = reset_release_bulk(&priv->resets);
--	if (ret)
--		return ret;
-+	// Assert first and then leave the resets deasserted
-+	reset_assert_bulk(&priv->resets);
-+	reset_deassert_bulk(&priv->resets);
-
- 	return clk_release_bulk(&priv->clocks);
- }