Update patches for new version

6 files changed, 52 insertions, 63 deletions

diff --git a/sys-boot/u-boot/Manifest b/sys-boot/u-boot/Manifest
index 100bbf7..0916cb3 100644
--- a/sys-boot/u-boot/Manifest
+++ b/sys-boot/u-boot/Manifest
@@ -1,6 +1,6 @@
-AUX 0001-Add-regulator-needed-for-usage-of-USB.patch 1686 BLAKE2B 7bdf5c0cf6a885f027846e16ce69b9e69e3a9e4918b8cffdb2b85e6e207d387e04aa790df2e3ed4c2b8f3265580c4f06d7bf6c082efb59f568574ca2230170fe SHA512 b5e386bb1e382fb551140bd821fe89153c4fc497a52ba71d4f2f3d14a7e34152f9db6e956f3f005ff5de7dd122ae55b779e715be7ff1cce495a05bdddd4a2561
-AUX 0002-Correct-boot-order-to-be-USB-SD-eMMC.patch 1083 BLAKE2B 063d5075dbcf3454cf23ad3c8bad89faeaa3421daf8ca9195db61474e6fb5506674062dee197845d1594945f2a24db91c5a0d01544e2bc335102ccedfcd46723 SHA512 64d0b1bc75b0842c782a76c7d46752693c39bcd4ccbcc9a22b9b5f93f6b5e046e53df5886287290ab44ea1106f8bcfbd6154f352af719a96bcd619d7554c0fef
-AUX 0003-Enable-the-power-LED-during-early-startup.patch 1761 BLAKE2B 5f78b0c352e3cc4e629735902b09e703c4914ccfe7a7d8f665dea99cf4ef1bb5d46fa517365caf8f6577963a8113eba1f50057ae18fc2d58ff6047b9383b6504 SHA512 51453cd9956aaadfee7f63a82e019052c08ac358c3d431dbc7f39400bb9e7b63d453d2018e6826380db2925fa569d89cd15724578dd10f7697e83e942b4d8201
+AUX 0001-Add-regulator-needed-for-usage-of-USB.patch 1688 BLAKE2B d8c0d24fb79197c7e591e31bf75e2b4890c37eff7fbd093708fd5b0535620c14b07b94a56e71f1a10372417c340c329dcd9d5ff7d80345f7fcfe3acd02aa0958 SHA512 257ed25576dfe67e5ff6916dbbd9352f74d9687ed7702b6d76fc79d04058762824fff6a7c02cbd85943611614eb11e684605dd84bb4edf18d2d601fb5db1dac0
+AUX 0002-Enable-the-power-LED-during-early-startup.patch 1765 BLAKE2B f4d919d5f6f8f2998758640622072359cb033f53d5b1e1d16e1a585d71c7843ee05e349d920651d6c69876a5ff5c57eb7f92f70f64521a0a9c198d446fae6374 SHA512 f8a478abe0af3b782e493575ec3be1487a809579b9928a1dcb750d48b743f949903277f1ff1d2bb953033c8f130e149ddd435df84b541b4430a39a255b2ee268
+AUX 0003-Correct-boot-order-to-be-USB-SD-eMMC.patch 798 BLAKE2B 571dfa33d97556374635dd84d87cd5276e0a1d83944bef28d695d9d0b076e8b2219288f328a796ee20973ab7a669f93e8322cdff2333c0a5c2f669939a15d168 SHA512 3c461ee0007e52e040b9991b04a8bc8375df2dcc860f56a9cd69d59dc2a973dba774a4cc4e672d1f9a00c9b0133fa33165388fd3088bbca6c835bc59745f3fba
 DIST u-boot-2022.01.tar.gz 22334075 BLAKE2B 565b61ab879f2fd7714adfb1985346c55bef3842ebe9c754fc3814222ecfaa1ac0a7f16ce6dc5f523245e204817e0538c640cb3aac62877724aa0dd48a646f24 SHA512 658fdea3c67ad69f10270cb76ee9e1de9b6572c6f0e6cf8c67a32f475f342b336d3e742ec58d0e67336570d249a453582cb92481568c00bb0865ee091f684c92
-EBUILD u-boot-2022.01.ebuild 1242 BLAKE2B ac63f994fcac6be1f5cfc73bec713fefff073be2f393250f182d841a2dad057b0f79d32864ba3de0dbdea926395a4298d1e468cc2faf592f988786dbcb8f8adf SHA512 4f0457ec8141ed56f150e2b7efcac41349356d28e4c862550a69997524f8666a5e44b6b704a732abe0834dea1cdb81371d56d03e5d4408b8394ee6bdbb11142f
+EBUILD u-boot-2022.01.ebuild 1242 BLAKE2B e0fe4da5bdc86d03e5d5d536d3ae14d629d13bb9ab34ca587fd57f259f5385f978fcc553b7f09c7604e22f91d3c9a001b592e0199d76e4073478affdae718b67 SHA512 0f539a6a78ce68875ee763b2039e1744f609dd53c827d2a61b7972c93835444ad351729f92b07cd90b81ccb57ff959665b67c42768a0c0aef9a99aba5eb69094
 MISC metadata.xml 366 BLAKE2B 8db8e8e36fd02b7aabfbd921cd256e9fecef19dff19856358ff73b802b20d8993d46e5c3d5c399236ea90b9a5e9200db72b5e0042cd891beb8b53b74ff440018 SHA512 a8a6360d4a524dbbcbaa80ff99840d3e1891559bf32aa38a99c777fa65ad756521b1245a224b0a311ff8f0d7a4b33ff2c798f7e0313ad08052bf93adc8f38224
diff --git a/sys-boot/u-boot/files/0001-Add-regulator-needed-for-usage-of-USB.patch b/sys-boot/u-boot/files/0001-Add-regulator-needed-for-usage-of-USB.patch
index 39c2bc9..5b98157 100644
--- a/sys-boot/u-boot/files/0001-Add-regulator-needed-for-usage-of-USB.patch
+++ b/sys-boot/u-boot/files/0001-Add-regulator-needed-for-usage-of-USB.patch
@@ -1,6 +1,6 @@
-From 6ad924ab3b6b2a4d8c73a9871d0e94245cce6fcf Mon Sep 17 00:00:00 2001
-From: Nadia Holmquist Pedersen <nadia@nhp.sh>
-Date: Sat, 20 Jun 2020 01:41:22 +0200
+From a2eedb4090451bde537c18585f2c0037881b4696 Mon Sep 17 00:00:00 2001
+From: "Jakob L. Kreuze" <zerodaysfordays@sdf.org>
+Date: Fri, 15 Apr 2022 18:33:52 -0400
 Subject: [PATCH 1/3] Add regulator needed for usage of USB
 
 ---
@@ -8,10 +8,10 @@ Subject: [PATCH 1/3] Add regulator needed for usage of USB
  1 file changed, 19 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts b/arch/arm/dts/rk3399-pinebook-pro.dts
-index 294d21bf45..6214887a1c 100644
+index 2b5f001ff4..05aa7ce0ff 100644
 --- a/arch/arm/dts/rk3399-pinebook-pro.dts
 +++ b/arch/arm/dts/rk3399-pinebook-pro.dts
-@@ -207,6 +207,16 @@
+@@ -220,6 +220,16 @@
  		};
  	};
  
@@ -28,7 +28,7 @@ index 294d21bf45..6214887a1c 100644
  	/* 5 V USB power supply */
  	vcc5v0_usb: pa_5v: vcc5v0-usb-regulator {
  		compatible = "regulator-fixed";
-@@ -610,8 +620,8 @@
+@@ -623,8 +633,8 @@
  				};
  			};
  
@@ -39,7 +39,7 @@ index 294d21bf45..6214887a1c 100644
  				regulator-always-on;
  				regulator-boot-on;
  
-@@ -872,6 +882,11 @@
+@@ -902,6 +912,11 @@
  			rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  
@@ -48,10 +48,10 @@ index 294d21bf45..6214887a1c 100644
 +			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
 +		};
 +
- 		vcc5v0_host_en_gpio: vcc5v0-host-en-gpio {
+ 		vcc5v0_host_en_pin: vcc5v0-host-en-pin {
  			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
-@@ -1054,10 +1069,12 @@
+@@ -1084,10 +1099,12 @@
  };
  
  &usb_host1_ehci {
@@ -65,5 +65,5 @@ index 294d21bf45..6214887a1c 100644
  };
  
 -- 
-2.27.0
+2.35.1
 
diff --git a/sys-boot/u-boot/files/0002-Correct-boot-order-to-be-USB-SD-eMMC.patch b/sys-boot/u-boot/files/0002-Correct-boot-order-to-be-USB-SD-eMMC.patch
deleted file mode 100644
index b6e755a..0000000
--- a/sys-boot/u-boot/files/0002-Correct-boot-order-to-be-USB-SD-eMMC.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e622965b31e1d08c2b7c6b3a8d683c59f37b2733 Mon Sep 17 00:00:00 2001
-From: Nadia Holmquist Pedersen <nadia@nhp.sh>
-Date: Sat, 20 Jun 2020 01:47:52 +0200
-Subject: [PATCH 2/3] Correct boot order to be USB -> SD -> eMMC
-
----
- include/configs/rockchip-common.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
-index 0b9e24d1db..9e217fad2a 100644
---- a/include/configs/rockchip-common.h
-+++ b/include/configs/rockchip-common.h
-@@ -17,8 +17,8 @@
- /* First try to boot from SD (index 0), then eMMC (index 1) */
- #if CONFIG_IS_ENABLED(CMD_MMC)
- 	#define BOOT_TARGET_MMC(func) \
--		func(MMC, mmc, 0) \
--		func(MMC, mmc, 1)
-+		func(MMC, mmc, 1) \
-+		func(MMC, mmc, 0)
- #else
- 	#define BOOT_TARGET_MMC(func)
- #endif
-@@ -55,9 +55,9 @@
- 
- #ifdef CONFIG_ROCKCHIP_RK3399
- #define BOOT_TARGET_DEVICES(func) \
-+	BOOT_TARGET_USB(func) \
- 	BOOT_TARGET_MMC(func) \
- 	BOOT_TARGET_NVME(func) \
--	BOOT_TARGET_USB(func) \
- 	BOOT_TARGET_PXE(func) \
- 	BOOT_TARGET_DHCP(func) \
- 	BOOT_TARGET_SF(func)
--- 
-2.27.0
-
diff --git a/sys-boot/u-boot/files/0003-Enable-the-power-LED-during-early-startup.patch b/sys-boot/u-boot/files/0002-Enable-the-power-LED-during-early-startup.patch
index a2e811c..b7b37c2 100644
--- a/sys-boot/u-boot/files/0003-Enable-the-power-LED-during-early-startup.patch
+++ b/sys-boot/u-boot/files/0002-Enable-the-power-LED-during-early-startup.patch
@@ -1,17 +1,17 @@
-From 08e8ace48b5c3a31b44661ef22a8b8a459906d7e Mon Sep 17 00:00:00 2001
-From: Nadia Holmquist Pedersen <nadia@nhp.sh>
-Date: Sat, 20 Jun 2020 01:49:49 +0200
-Subject: [PATCH 3/3] Enable the power LED during early startup
+From 18600ddc0569ae424066add8e288dbc2e4d0e45c Mon Sep 17 00:00:00 2001
+From: "Jakob L. Kreuze" <zerodaysfordays@sdf.org>
+Date: Fri, 15 Apr 2022 18:37:37 -0400
+Subject: [PATCH 2/3] Enable the power LED during early startup
 
 ---
  arch/arm/mach-rockchip/rk3399/rk3399.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
-index 4fda93b152..e24b39486d 100644
+index 2bc8e60b99..c7ba8a0595 100644
 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c
 +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
-@@ -19,6 +19,8 @@
+@@ -20,6 +20,8 @@
  #include <asm/arch-rockchip/hardware.h>
  #include <linux/bitops.h>
  #include <power/regulator.h>
@@ -20,7 +20,7 @@ index 4fda93b152..e24b39486d 100644
  
  DECLARE_GLOBAL_DATA_PTR;
  
-@@ -119,8 +121,8 @@ void board_debug_uart_init(void)
+@@ -120,8 +122,8 @@ void board_debug_uart_init(void)
  	struct rk3399_grf_regs * const grf = (void *)GRF_BASE;
  #ifdef CONFIG_TARGET_CHROMEBOOK_BOB
  	struct rk3399_pmugrf_regs * const pmugrf = (void *)PMUGRF_BASE;
@@ -30,7 +30,7 @@ index 4fda93b152..e24b39486d 100644
  
  #if defined(CONFIG_DEBUG_UART_BASE) && (CONFIG_DEBUG_UART_BASE == 0xff180000)
  	/* Enable early UART0 on the RK3399 */
-@@ -153,6 +155,14 @@ void board_debug_uart_init(void)
+@@ -154,6 +156,14 @@ void board_debug_uart_init(void)
  	spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_B, 4), GPIO_PULL_NORMAL);
  #endif /* CONFIG_TARGET_CHROMEBOOK_BOB */
  
@@ -46,5 +46,5 @@ index 4fda93b152..e24b39486d 100644
  	rk_clrsetreg(&grf->gpio4c_iomux,
  		     GRF_GPIO4C3_SEL_MASK,
 -- 
-2.27.0
+2.35.1
 
diff --git a/sys-boot/u-boot/files/0003-Correct-boot-order-to-be-USB-SD-eMMC.patch b/sys-boot/u-boot/files/0003-Correct-boot-order-to-be-USB-SD-eMMC.patch
new file mode 100644
index 0000000..443c0ba
--- /dev/null
+++ b/sys-boot/u-boot/files/0003-Correct-boot-order-to-be-USB-SD-eMMC.patch
@@ -0,0 +1,27 @@
+From 78df08299427f72581a877c015d354e9ea5454e2 Mon Sep 17 00:00:00 2001
+From: "Jakob L. Kreuze" <zerodaysfordays@sdf.org>
+Date: Fri, 15 Apr 2022 18:37:46 -0400
+Subject: [PATCH 3/3] Correct boot order to be USB -> SD -> eMMC
+
+---
+ include/configs/rockchip-common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
+index ba7061a287..5dc92373b2 100644
+--- a/include/configs/rockchip-common.h
++++ b/include/configs/rockchip-common.h
+@@ -55,9 +55,9 @@
+ 
+ #ifdef CONFIG_ROCKCHIP_RK3399
+ #define BOOT_TARGET_DEVICES(func) \
++	BOOT_TARGET_USB(func) \
+ 	BOOT_TARGET_MMC(func) \
+ 	BOOT_TARGET_NVME(func) \
+-	BOOT_TARGET_USB(func) \
+ 	BOOT_TARGET_PXE(func) \
+ 	BOOT_TARGET_DHCP(func) \
+ 	BOOT_TARGET_SF(func)
+-- 
+2.35.1
+
diff --git a/sys-boot/u-boot/u-boot-2022.01.ebuild b/sys-boot/u-boot/u-boot-2022.01.ebuild
index c07af7f..c95e6cf 100644
--- a/sys-boot/u-boot/u-boot-2022.01.ebuild
+++ b/sys-boot/u-boot/u-boot-2022.01.ebuild
@@ -24,8 +24,8 @@ BDEPEND=""
 S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/0001-Add-regulator-needed-for-usage-of-USB.patch"
-	"${FILESDIR}/0002-Correct-boot-order-to-be-USB-SD-eMMC.patch"
-	"${FILESDIR}/0003-Enable-the-power-LED-during-early-startup.patch"
+	"${FILESDIR}/0002-Enable-the-power-LED-during-early-startup.patch"
+	"${FILESDIR}/0003-Correct-boot-order-to-be-USB-SD-eMMC.patch"
 )
 
 src_configure() {