improve MMC on AllWinner A64 SoCs, fix RPi3B+ network errors (rhbz 1573261), Fix incorrect colours in uEFI console in Linux

improve MMC on AllWinner A64 SoCs
add AllWinner 64 bit enable usb kbd patch
2018-06-19 17:25:12 +01:00 · 2018-05-01 14:40:55 +01:00 · 2018-04-15 13:22:14 +01:00 · 2018-04-15 12:31:00 +01:00
38 changed files with 2370 additions and 4554 deletions
--- a/0001-Fix-BeagleAI-detection.patch
+++ b/0001-Fix-BeagleAI-detection.patch
@ -1,29 +0,0 @@
-From 1849ef423238aeb1732eb3b8e67eb46bc21401c7 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 10 Sep 2020 14:24:12 +0100
-Subject: [PATCH] Fix BeagleAI detection
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
- board/ti/am57xx/board.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
-index 7809875510..3232812a97 100644
--- a/board/ti/am57xx/board.c
-+++ b/board/ti/am57xx/board.c
-@@ -527,8 +527,10 @@ void do_board_detect(void)
- 
- 	rc = ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS,
- 				  CONFIG_EEPROM_CHIP_ADDRESS);
-	if (rc)
-+	if (rc) {
- 		printf("ti_i2c_eeprom_init failed %d\n", rc);
-+		ti_i2c_eeprom_am_set("BBONE-AI", "A");
-+	}
- 
- #ifdef CONFIG_SUPPORT_EMMC_BOOT
- 	rc = board_bootmode_has_emmc();
-- 
-2.26.2
-
--- a/0001-Fixes-for-AllWinner-ethernet-network-interfaces.patch
+++ b/0001-Fixes-for-AllWinner-ethernet-network-interfaces.patch
@ -1,518 +0,0 @@
-From 25ce28126444900b7b3efef36c6b9d15a6ab9af1 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Wed, 28 Oct 2020 10:08:44 +0000
-Subject: [PATCH] Fixes for AllWinner ethernet network interfaces
-
-The upstream kernel in fixing stuff has broken stuff.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
- arch/arm/dts/sun50i-a64-bananapi-m64.dts        | 2 +-
- arch/arm/dts/sun50i-a64-nanopi-a64.dts          | 2 +-
- arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts | 2 +-
- arch/arm/dts/sun50i-a64-olinuxino.dts           | 2 +-
- arch/arm/dts/sun50i-a64-orangepi-win.dts        | 2 +-
- arch/arm/dts/sun50i-a64-pine64-plus.dts         | 2 +-
- arch/arm/dts/sun50i-a64-sopine-baseboard.dts    | 2 +-
- arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts  | 2 +-
- arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts     | 2 +-
- arch/arm/dts/sun50i-h5-nanopi-neo2.dts          | 2 +-
- arch/arm/dts/sun50i-h5-orangepi-pc2.dts         | 2 +-
- arch/arm/dts/sun50i-h5-orangepi-prime.dts       | 2 +-
- arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts   | 2 +-
- arch/arm/dts/sun50i-h6-beelink-gs1.dts          | 2 +-
- arch/arm/dts/sun50i-h6-pine-h64.dts             | 2 +-
- arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts     | 2 +-
- arch/arm/dts/sun7i-a20-bananapi.dts             | 2 +-
- arch/arm/dts/sun7i-a20-bananapro.dts            | 2 +-
- arch/arm/dts/sun7i-a20-cubietruck.dts           | 2 +-
- arch/arm/dts/sun7i-a20-hummingbird.dts          | 2 +-
- arch/arm/dts/sun7i-a20-lamobo-r1.dts            | 2 +-
- arch/arm/dts/sun7i-a20-olimex-som-evb.dts       | 2 +-
- arch/arm/dts/sun7i-a20-olimex-som204-evb.dts    | 2 +-
- arch/arm/dts/sun7i-a20-olinuxino-lime2.dts      | 2 +-
- arch/arm/dts/sun7i-a20-orangepi-mini.dts        | 2 +-
- arch/arm/dts/sun7i-a20-orangepi.dts             | 2 +-
- arch/arm/dts/sun7i-a20-pcduino3-nano.dts        | 2 +-
- arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts     | 2 +-
- arch/arm/dts/sun8i-a83t-bananapi-m3.dts         | 2 +-
- arch/arm/dts/sun8i-a83t-cubietruck-plus.dts     | 2 +-
- arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts        | 2 +-
- arch/arm/dts/sun8i-h3-orangepi-plus.dts         | 2 +-
- arch/arm/dts/sun8i-h3-orangepi-plus2e.dts       | 2 +-
- arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts    | 2 +-
- arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts    | 2 +-
- arch/arm/dts/sunxi-bananapi-m2-plus.dtsi        | 2 +-
- 36 files changed, 36 insertions(+), 36 deletions(-)
-
-diff --git a/arch/arm/dts/sun50i-a64-bananapi-m64.dts b/arch/arm/dts/sun50i-a64-bananapi-m64.dts
-index ef1c90401b..e1c22aeb29 100644
--- a/arch/arm/dts/sun50i-a64-bananapi-m64.dts
-+++ b/arch/arm/dts/sun50i-a64-bananapi-m64.dts
-@@ -112,7 +112,7 @@
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&rgmii_pins>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-handle = <&ext_rgmii_phy>;
- 	phy-supply = <&reg_dc1sw>;
- 	status = "okay";
-diff --git a/arch/arm/dts/sun50i-a64-nanopi-a64.dts b/arch/arm/dts/sun50i-a64-nanopi-a64.dts
-index 31884dbc88..03ebe3e44b 100644
--- a/arch/arm/dts/sun50i-a64-nanopi-a64.dts
-+++ b/arch/arm/dts/sun50i-a64-nanopi-a64.dts
-@@ -102,7 +102,7 @@
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&rgmii_pins>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-handle = <&ext_rgmii_phy>;
- 	phy-supply = <&reg_dcdc1>;
- 	status = "okay";
-diff --git a/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts b/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts
-index 6a2154525d..94caf110ab 100644
--- a/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts
-+++ b/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts
-@@ -30,7 +30,7 @@
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&rgmii_pins>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-handle = <&ext_rgmii_phy>;
- 	phy-supply = <&reg_dc1sw>;
- 	allwinner,tx-delay-ps = <600>;
-diff --git a/arch/arm/dts/sun50i-a64-olinuxino.dts b/arch/arm/dts/sun50i-a64-olinuxino.dts
-index f7a4bccaa5..2396d9b797 100644
--- a/arch/arm/dts/sun50i-a64-olinuxino.dts
-+++ b/arch/arm/dts/sun50i-a64-olinuxino.dts
-@@ -102,7 +102,7 @@
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&rgmii_pins>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-handle = <&ext_rgmii_phy>;
- 	phy-supply = <&reg_dcdc1>;
- 	allwinner,tx-delay-ps = <600>;
-diff --git a/arch/arm/dts/sun50i-a64-orangepi-win.dts b/arch/arm/dts/sun50i-a64-orangepi-win.dts
-index b0c64f7579..5b5d4f31b6 100644
--- a/arch/arm/dts/sun50i-a64-orangepi-win.dts
-+++ b/arch/arm/dts/sun50i-a64-orangepi-win.dts
-@@ -127,7 +127,7 @@
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&rgmii_pins>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-handle = <&ext_rgmii_phy>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	status = "okay";
-diff --git a/arch/arm/dts/sun50i-a64-pine64-plus.dts b/arch/arm/dts/sun50i-a64-pine64-plus.dts
-index 24f1aac366..b09b4276f1 100644
--- a/arch/arm/dts/sun50i-a64-pine64-plus.dts
-+++ b/arch/arm/dts/sun50i-a64-pine64-plus.dts
-@@ -52,7 +52,7 @@
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&rgmii_pins>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-txid";
- 	phy-handle = <&ext_rgmii_phy>;
- 	status = "okay";
- };
-diff --git a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
-index 53fcc9098d..4a50a18128 100644
--- a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
-+++ b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
-@@ -95,7 +95,7 @@
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&rgmii_pins>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-handle = <&ext_rgmii_phy>;
- 	phy-supply = <&reg_dc1sw>;
- 	status = "okay";
-diff --git a/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts b/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts
-index df1b9263ad..6e30a564c8 100644
--- a/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts
-+++ b/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts
-@@ -36,7 +36,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	/delete-property/ allwinner,leds-active-low;
- 	status = "okay";
- };
-diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
-index 4f9ba53ffa..9d93fe1536 100644
--- a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
-+++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
-@@ -96,7 +96,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- };
- 
-diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo2.dts
-index b059e20813..e8ab8c2df5 100644
--- a/arch/arm/dts/sun50i-h5-nanopi-neo2.dts
-+++ b/arch/arm/dts/sun50i-h5-nanopi-neo2.dts
-@@ -75,7 +75,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- };
- 
-diff --git a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts
-index 70b5f09984..6cc567ea99 100644
--- a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts
-+++ b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts
-@@ -118,7 +118,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- };
- 
-diff --git a/arch/arm/dts/sun50i-h5-orangepi-prime.dts b/arch/arm/dts/sun50i-h5-orangepi-prime.dts
-index cb44bfa598..33ab44072e 100644
--- a/arch/arm/dts/sun50i-h5-orangepi-prime.dts
-+++ b/arch/arm/dts/sun50i-h5-orangepi-prime.dts
-@@ -124,7 +124,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- };
- 
-diff --git a/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts b/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts
-index ef5ca64442..de448ca51e 100644
--- a/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts
-+++ b/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts
-@@ -69,7 +69,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- };
- 
-diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
-index 0dc33c90dd..024035d36e 100644
--- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts
-+++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
-@@ -64,7 +64,7 @@
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&ext_rgmii_pins>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-handle = <&ext_rgmii_phy>;
- 	phy-supply = <&reg_aldo2>;
- 	status = "okay";
-diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts
-index 1898345183..13fbf26817 100644
--- a/arch/arm/dts/sun50i-h6-pine-h64.dts
-+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts
-@@ -66,7 +66,7 @@
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&ext_rgmii_pins>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-handle = <&ext_rgmii_phy>;
- 	phy-supply = <&reg_aldo2>;
- 	allwinner,rx-delay-ps = <200>;
-diff --git a/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts
-index e2bfe00588..4dbcad1343 100644
--- a/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts
-+++ b/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts
-@@ -130,7 +130,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-supply = <&reg_gmac_3v3>;
- 	status = "okay";
- 
-diff --git a/arch/arm/dts/sun7i-a20-bananapi.dts b/arch/arm/dts/sun7i-a20-bananapi.dts
-index 81bc85d398..33040c43bc 100644
--- a/arch/arm/dts/sun7i-a20-bananapi.dts
-+++ b/arch/arm/dts/sun7i-a20-bananapi.dts
-@@ -132,7 +132,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-supply = <&reg_gmac_3v3>;
- 	status = "okay";
- 
-diff --git a/arch/arm/dts/sun7i-a20-bananapro.dts b/arch/arm/dts/sun7i-a20-bananapro.dts
-index 0176e9de01..8a75545e22 100644
--- a/arch/arm/dts/sun7i-a20-bananapro.dts
-+++ b/arch/arm/dts/sun7i-a20-bananapro.dts
-@@ -110,7 +110,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-supply = <&reg_gmac_3v3>;
- 	status = "okay";
- 
-diff --git a/arch/arm/dts/sun7i-a20-cubietruck.dts b/arch/arm/dts/sun7i-a20-cubietruck.dts
-index 99f531b8d2..46a9f4669e 100644
--- a/arch/arm/dts/sun7i-a20-cubietruck.dts
-+++ b/arch/arm/dts/sun7i-a20-cubietruck.dts
-@@ -151,7 +151,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- 
- 	phy1: ethernet-phy@1 {
-diff --git a/arch/arm/dts/sun7i-a20-hummingbird.dts b/arch/arm/dts/sun7i-a20-hummingbird.dts
-index fd0153f656..5c3d107094 100644
--- a/arch/arm/dts/sun7i-a20-hummingbird.dts
-+++ b/arch/arm/dts/sun7i-a20-hummingbird.dts
-@@ -101,7 +101,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-supply = <&reg_gmac_vdd>;
- 	/* phy reset config */
- 	snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */
-diff --git a/arch/arm/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
-index f91e1bee44..8173d77c12 100644
--- a/arch/arm/dts/sun7i-a20-lamobo-r1.dts
-+++ b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
-@@ -120,7 +120,7 @@
- &gmac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-supply = <&reg_gmac_3v3>;
- 	status = "okay";
- 	/delete-property/#address-cells;
-diff --git a/arch/arm/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
-index f0e6a96e57..f0c5160ff8 100644
--- a/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
-+++ b/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
-@@ -112,7 +112,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- 
- 	phy1: ethernet-phy@1 {
-diff --git a/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts b/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts
-index 823aabce04..ff42708137 100644
--- a/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts
-+++ b/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts
-@@ -106,7 +106,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy3>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-supply = <&reg_vcc3v3>;
- 
- 	snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
-index 4e1c590eb0..996201665b 100644
--- a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
-+++ b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
-@@ -112,7 +112,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- 
- 	phy1: ethernet-phy@1 {
-diff --git a/arch/arm/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/dts/sun7i-a20-orangepi-mini.dts
-index 15881081ca..b80215c61c 100644
--- a/arch/arm/dts/sun7i-a20-orangepi-mini.dts
-+++ b/arch/arm/dts/sun7i-a20-orangepi-mini.dts
-@@ -121,7 +121,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-supply = <&reg_gmac_3v3>;
- 	status = "okay";
- 
-diff --git a/arch/arm/dts/sun7i-a20-orangepi.dts b/arch/arm/dts/sun7i-a20-orangepi.dts
-index d64de2e73a..66efb7d1ab 100644
--- a/arch/arm/dts/sun7i-a20-orangepi.dts
-+++ b/arch/arm/dts/sun7i-a20-orangepi.dts
-@@ -97,7 +97,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-supply = <&reg_gmac_3v3>;
- 	status = "okay";
- 
-diff --git a/arch/arm/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
-index 538ea15fa3..205eaae44a 100644
--- a/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
-+++ b/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
-@@ -115,7 +115,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- 
- 	phy1: ethernet-phy@1 {
-diff --git a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
-index c27e56091f..56cc5791c4 100644
--- a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
-+++ b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
-@@ -82,7 +82,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- 
- 	phy1: ethernet-phy@1 {
-diff --git a/arch/arm/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/dts/sun8i-a83t-bananapi-m3.dts
-index eaff6fa401..2beafe3a31 100644
--- a/arch/arm/dts/sun8i-a83t-bananapi-m3.dts
-+++ b/arch/arm/dts/sun8i-a83t-bananapi-m3.dts
-@@ -123,7 +123,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_sw>;
- 	phy-handle = <&rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	allwinner,rx-delay-ps = <700>;
- 	allwinner,tx-delay-ps = <700>;
- 	status = "okay";
-diff --git a/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
-index 5dba4fc310..ecd9ff38a8 100644
--- a/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
-+++ b/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
-@@ -160,7 +160,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_dldo4>;
- 	phy-handle = <&rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- };
- 
-diff --git a/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts
-index 4ba533b034..bc370d4ea1 100644
--- a/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts
-+++ b/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts
-@@ -96,7 +96,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 
- 	status = "okay";
- };
-diff --git a/arch/arm/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/dts/sun8i-h3-orangepi-plus.dts
-index 97f497854e..d05fa679dc 100644
--- a/arch/arm/dts/sun8i-h3-orangepi-plus.dts
-+++ b/arch/arm/dts/sun8i-h3-orangepi-plus.dts
-@@ -85,7 +85,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 
- 	status = "okay";
- };
-diff --git a/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts b/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
-index 6dbf7b2e0c..b6ca45d18e 100644
--- a/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
-+++ b/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
-@@ -67,7 +67,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	status = "okay";
- };
- 
-diff --git a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
-index c488aaacbd..9c20245eef 100644
--- a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
-+++ b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
-@@ -129,7 +129,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy-handle = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-supply = <&reg_dc1sw>;
- 	status = "okay";
- };
-diff --git a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
-index 15c22b06fc..3ab6f47cea 100644
--- a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
-+++ b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
-@@ -120,7 +120,7 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac_rgmii_pins>;
- 	phy-handle = <&phy1>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 	phy-supply = <&reg_dc1sw>;
- 	status = "okay";
- };
-diff --git a/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi b/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
-index 39263e74fb..8e5cb3b3fd 100644
--- a/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
-+++ b/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
-@@ -126,7 +126,7 @@
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 
- 	status = "okay";
- };
-- 
-2.28.0
-
--- a/10-devicetree.install
+++ b/10-devicetree.install
@ -0,0 +1,61 @@
+#!/bin/bash
+
+# set -x
+
+if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]
+then
+COMMAND="$1"
+KERNEL_VERSION="$2"
+#BOOT_DIR_ABS="$3"
+#KERNEL_IMAGE="$4"
+
+# Setup a /boot/dtb -> /boot/dtb-$newest_kernel_version symlink so that
+# u-boot can find the correct dtb to load.
+#
+# If invoked to 'add' a new kernel, find the newest based on `sort`ing
+# the kernel versions dtb.  If 'remove', then follow basically the same
+# procedure but exclude the version currently being removed.
+#
+# The theory of operation here is that, while newer kernels may add new
+# dtb nodes and fields, as upstreaming hw support for some particular
+# device progresses, it should never make backward incompatible changes.
+# So it should always be safe to use a newer dtb with an older kernel.
+
+    list_dtb_versions() {
+        excluded_version="$1"
+        for dtbdir in /boot/dtb-*; do
+            dtbver=${dtbdir#*-}
+            if [ "$dtbver" != "$excluded_version" ]; then
+                echo $dtbver
+            fi
+        done
+    }
+
+    setup_dtb_link() {
+        ver=`list_dtb_versions $1 | sort -r --sort=version | head -1`
+        if [ -h /boot/dtb ]; then
+            rm -f /boot/dtb
+        fi
+        ln -s dtb-$ver /boot/dtb
+    }
+
+    ret=0
+    case "$COMMAND" in
+        add)
+            # If we're adding a kernel we want that version
+            if [ -h /boot/dtb ]; then
+                rm -f /boot/dtb
+            fi
+            ln -s dtb-$KERNEL_VERSION /boot/dtb
+            ret=$?
+            ;;
+        remove)
+            setup_dtb_link $KERNEL_VERSION
+            ret=$?
+            ;;
+    esac
+    exit $ret
+else
+    # Just exit on non ARM
+    exit 0
+fi
--- a/AW64-add-spl-atf-support.patch
+++ b/AW64-add-spl-atf-support.patch
@ -0,0 +1,194 @@
+From patchwork Fri Mar 31 22:31:26 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,v3,14/19] sunxi: 64-bit SoCs: introduce FIT generator script
+From: Andre Przywara <andre.przywara@arm.com>
+X-Patchwork-Id: 745831
+X-Patchwork-Delegate: jagannadh.teki@gmail.com
+Message-Id: <1490999491-14899-15-git-send-email-andre.przywara@arm.com>
+To: Maxime Ripard <maxime.ripard@free-electrons.com>,
+ Jagan Teki <jagan@openedev.com>, Simon Glass <sjg@chromium.org>,
+ Tom Rini <trini@konsulko.com>
+Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>,
+ Michal Simek <michal.simek@xilinx.com>, u-boot@lists.denx.de,
+ Icenowy Zheng <icenowy@aosc.xyz>
+Date: Fri, 31 Mar 2017 23:31:26 +0100
+
+Now that the Makefile can call a generator script to build a more
+advanced FIT image, let's use this feature to address the needs of
+Allwinner boards with 64-bit SoCs (A64 and H5).
+The (DTB stripped) U-Boot binary and the ATF are static, but we allow
+an arbitrary number of supported device trees to be passed.
+The script enters both a DT entry in the /images node and the respective
+subnode in /configurations to support all listed DTBs.
+
+This requires to copy the ARM Trusted Firmware build (bl31.bin) into
+the U-Boot source directory (or to create a symlink to it).
+
+Signed-off-by: Andre Przywara <andre.przywara@arm.com>
+Reviewed-by: Simon Glass <sjg@chromium.org>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ board/sunxi/mksunxi_fit_atf.sh | 73 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 73 insertions(+)
+ create mode 100755 board/sunxi/mksunxi_fit_atf.sh
+
+diff --git a/board/sunxi/mksunxi_fit_atf.sh b/board/sunxi/mksunxi_fit_atf.sh
+new file mode 100755
+index 0000000..afa22e8
+--- /dev/null
+++ b/board/sunxi/mksunxi_fit_atf.sh
+@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# script to generate FIT image source for 64-bit sunxi boards with
+# ARM Trusted Firmware and multiple device trees (given on the command line)
+#
+# usage: $0 <dt_name> [<dt_name> [<dt_name] ...]
+
+cat << __HEADER_EOF
+/dts-v1/;
+
+/ {
+	description = "Configuration to load ATF before U-Boot";
+	#address-cells = <1>;
+
+	images {
+		uboot@1 {
+			description = "U-Boot (64-bit)";
+			data = /incbin/("u-boot-nodtb.bin");
+			type = "standalone";
+			arch = "arm64";
+			compression = "none";
+			load = <0x4a000000>;
+		};
+		atf@1 {
+			description = "ARM Trusted Firmware";
+			data = /incbin/("bl31.bin");
+			type = "firmware";
+			arch = "arm64";
+			compression = "none";
+			load = <0x44000>;
+			entry = <0x44000>;
+		};
+__HEADER_EOF
+
+cnt=1
+for dtname in $*
+do
+	cat << __FDT_IMAGE_EOF
+		fdt@$cnt {
+			description = "$(basename $dtname .dtb)";
+			data = /incbin/("$dtname");
+			type = "flat_dt";
+			compression = "none";
+		};
+__FDT_IMAGE_EOF
+	cnt=$((cnt+1))
+done
+
+cat << __CONF_HEADER_EOF
+	};
+	configurations {
+		default = "config@1";
+
+__CONF_HEADER_EOF
+
+cnt=1
+for dtname in $*
+do
+	cat << __CONF_SECTION_EOF
+		config@$cnt {
+			description = "$(basename $dtname .dtb)";
+			firmware = "uboot@1";
+			loadables = "atf@1";
+			fdt = "fdt@$cnt";
+		};
+__CONF_SECTION_EOF
+	cnt=$((cnt+1))
+done
+
+cat << __ITS_EOF
+	};
+};
+__ITS_EOF
+From patchwork Fri Mar 31 22:31:28 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,v3,16/19] sunxi: enable automatic FIT build for 64-bit SoCs
+From: Andre Przywara <andre.przywara@arm.com>
+X-Patchwork-Id: 745840
+X-Patchwork-Delegate: jagannadh.teki@gmail.com
+Message-Id: <1490999491-14899-17-git-send-email-andre.przywara@arm.com>
+To: Maxime Ripard <maxime.ripard@free-electrons.com>,
+ Jagan Teki <jagan@openedev.com>, Simon Glass <sjg@chromium.org>,
+ Tom Rini <trini@konsulko.com>
+Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>,
+ Michal Simek <michal.simek@xilinx.com>, u-boot@lists.denx.de,
+ Icenowy Zheng <icenowy@aosc.xyz>
+Date: Fri, 31 Mar 2017 23:31:28 +0100
+
+The Allwinner SoCs with 64-bit cores use an ARM Trusted Firmware binary,
+which needs to be loaded alongside U-Boot proper.
+Set the respective Kconfig options to let them select this feature and
+also automatically build the FIT image.
+
+Signed-off-by: Andre Przywara <andre.przywara@arm.com>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ Kconfig                        | 1 +
+ board/sunxi/Kconfig            | 4 ++++
+ include/configs/sunxi-common.h | 4 ++++
+ 3 files changed, 9 insertions(+)
+
+diff --git a/Kconfig b/Kconfig
+index 5c82788..ffea4c3 100644
+--- a/Kconfig
+++ b/Kconfig
+@@ -252,6 +252,7 @@ config SPL_FIT_SOURCE
+ config SPL_FIT_GENERATOR
+ 	string ".its file generator script for U-Boot FIT image"
+ 	depends on SPL_FIT
+	default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI
+ 	help
+ 	  Specifies a (platform specific) script file to generate the FIT
+ 	  source file used to build the U-Boot FIT image file. This gets
+diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
+index 3e0e262..b629f3b 100644
+--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
+@@ -145,12 +145,16 @@ config MACH_SUN50I
+ 	select SUNXI_GEN_SUN6I
+ 	select SUNXI_HIGH_SRAM
+ 	select SUPPORT_SPL
+	select FIT
+	select SPL_LOAD_FIT
+ 
+ config MACH_SUN50I_H5
+ 	bool "sun50i (Allwinner H5)"
+ 	select ARM64
+ 	select MACH_SUNXI_H3_H5
+ 	select SUNXI_HIGH_SRAM
+	select FIT
+	select SPL_LOAD_FIT
+ 
+ endchoice
+ 
+diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
+index b7eb95e..1982063 100644
+--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
+@@ -32,6 +32,10 @@
+ # define CONFIG_MACH_TYPE_COMPAT_REV	1
+ #endif
+ 
+#ifdef CONFIG_ARM64
+#define CONFIG_BUILD_TARGET "u-boot.itb"
+#endif
+
+ /* Serial & console */
+ #define CONFIG_SYS_NS16550_SERIAL
+ /* ns16550 reg in the low bits of cpu reg */
+
--- a/AllWinner-PineTab.patch
+++ b/AllWinner-PineTab.patch
@ -1,45 +0,0 @@
-From 6bf15552c2b6becb48ce7732120e0ddb2078cb1a Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Tue, 14 Apr 2020 09:53:07 +0100
-Subject: [PATCH 9/9] initial pinetab support
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
- configs/pinetab_defconfig | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
- create mode 100644 configs/pinetab_defconfig
-
-diff --git a/configs/pinetab_defconfig b/configs/pinetab_defconfig
-new file mode 100644
-index 0000000000..5b9620f3e5
--- /dev/null
-+++ b/configs/pinetab_defconfig
-@@ -0,0 +1,26 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_SPL=y
-+CONFIG_MACH_SUN50I=y
-+CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
-+CONFIG_DRAM_CLK=552
-+CONFIG_DRAM_ZQ=3881949
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-+CONFIG_R_I2C_ENABLE=y
-+CONFIG_SPL_SPI_SUNXI=y
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_USE_PREBOOT=y
-+# CONFIG_SPL_DOS_PARTITION is not set
-+# CONFIG_SPL_EFI_PARTITION is not set
-+CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pinetab"
-+CONFIG_OF_LIST="sun50i-a64-pinetab"
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_SUNXI=y
-+CONFIG_LED=y
-+CONFIG_LED_GPIO=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-- 
-2.26.0
--- a/BeagleBoard.org-PocketBeagle.patch
+++ b/BeagleBoard.org-PocketBeagle.patch
@ -0,0 +1,326 @@
+From patchwork Wed Mar  7 10:40:41 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,1/4] Add support for BeagleBoard.org PocketBeagle
+X-Patchwork-Submitter: Jason Kridner <jkridner@gmail.com>
+X-Patchwork-Id: 882566
+Message-Id: <20180307104044.4739-2-jdk@ti.com>
+To: u-boot@lists.denx.de
+Cc: Tom Rini <trini@konsulko.com>, Jason Kridner <jdk@ti.com>
+Date: Wed,  7 Mar 2018 05:40:41 -0500
+From: Jason Kridner <jkridner@gmail.com>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+Texas Instruments AM3358 based low-cost board using Octavo Systems OSD3358 SIP
+with built-in TPS65217 PMIC and 512MB DDR3. Board features small 35mm x
+55mm size, high-speed USB OTG, microSD and 72 0.1" expansion header
+pins with 2xSPI, 2xI2C, 2xUART, USB, 8xADC, up-to-44 GPIO, PRU pins and much more.
+
+https://beagleboard.org/pocket
+
+This was tested using the am335x_evm_usbspl_defconfig.
+
+Note that MII pins are enabled despite not having Ethernet on this
+board. This avoids an issue where otherwise many timeout errors would be
+generated. See https://e2e.ti.com/support/arm/sitara_arm/f/791/t/298976
+for some related discussion.
+
+Signed-off-by: Jason Kridner <jdk@ti.com>
+Cc: Tom Rini <trini@konsulko.com>
+---
+ board/ti/am335x/board.c      | 10 ++++++----
+ board/ti/am335x/board.h      |  7 ++++++-
+ board/ti/am335x/mux.c        |  3 +++
+ include/configs/am335x_evm.h |  2 ++
+ 4 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
+index b144fd1821..87bdd2d63d 100644
+--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
+@@ -264,7 +264,7 @@ const struct dpll_params *get_dpll_ddr_params(void)
+ 
+ 	if (board_is_evm_sk())
+ 		return &dpll_ddr3_303MHz[ind];
+-	else if (board_is_bone_lt() || board_is_icev2())
+	else if (board_is_pb() || board_is_bone_lt() || board_is_icev2())
+ 		return &dpll_ddr3_400MHz[ind];
+ 	else if (board_is_evm_15_or_later())
+ 		return &dpll_ddr3_303MHz[ind];
+@@ -295,7 +295,7 @@ const struct dpll_params *get_dpll_mpu_params(void)
+ 	if (bone_not_connected_to_ac_power())
+ 		freq = MPUPLL_M_600;
+ 
+-	if (board_is_bone_lt())
+	if (board_is_pb() || board_is_bone_lt())
+ 		freq = MPUPLL_M_1000;
+ 
+ 	switch (freq) {
+@@ -341,7 +341,7 @@ static void scale_vcores_bone(int freq)
+ 	 * Override what we have detected since we know if we have
+ 	 * a Beaglebone Black it supports 1GHz.
+ 	 */
+-	if (board_is_bone_lt())
+	if (board_is_pb() || board_is_bone_lt())
+ 		freq = MPUPLL_M_1000;
+ 
+ 	switch (freq) {
+@@ -542,7 +542,7 @@ void sdram_init(void)
+ 	if (board_is_evm_sk())
+ 		config_ddr(303, &ioregs_evmsk, &ddr3_data,
+ 			   &ddr3_cmd_ctrl_data, &ddr3_emif_reg_data, 0);
+-	else if (board_is_bone_lt())
+	else if (board_is_pb() || board_is_bone_lt())
+ 		config_ddr(400, &ioregs_bonelt,
+ 			   &ddr3_beagleblack_data,
+ 			   &ddr3_beagleblack_cmd_ctrl_data,
+@@ -931,6 +931,8 @@ int board_fit_config_name_match(const char *name)
+ 		return 0;
+ 	else if (board_is_bone_lt() && !strcmp(name, "am335x-boneblack"))
+ 		return 0;
+	else if (board_is_pb() && !strcmp(name, "am335x-pocketbeagle"))
+		return 0;
+ 	else if (board_is_evm_sk() && !strcmp(name, "am335x-evmsk"))
+ 		return 0;
+ 	else if (board_is_bbg1() && !strcmp(name, "am335x-bonegreen"))
+diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h
+index e13fcff02a..bab5b77f34 100644
+--- a/board/ti/am335x/board.h
+++ b/board/ti/am335x/board.h
+@@ -34,6 +34,11 @@ static inline int board_is_bone_lt(void)
+ 	return board_ti_is("A335BNLT");
+ }
+ 
+static inline int board_is_pb(void)
+{
+	return board_ti_is("A335PBGL");
+}
+
+ static inline int board_is_bbg1(void)
+ {
+ 	return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "BBG1", 4);
+@@ -41,7 +46,7 @@ static inline int board_is_bbg1(void)
+ 
+ static inline int board_is_beaglebonex(void)
+ {
+-	return board_is_bone() || board_is_bone_lt() || board_is_bbg1();
+	return board_is_pb() || board_is_bone() || board_is_bone_lt() || board_is_bbg1();
+ }
+ 
+ static inline int board_is_evm_sk(void)
+diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
+index ad85b3a19a..aa187605d0 100644
+--- a/board/ti/am335x/mux.c
+++ b/board/ti/am335x/mux.c
+@@ -390,6 +390,9 @@ void enable_board_pin_mux(void)
+ #else
+ 		configure_module_pin_mux(mmc1_pin_mux);
+ #endif
+	} else if (board_is_pb()) {
+		configure_module_pin_mux(mii1_pin_mux);
+		configure_module_pin_mux(mmc0_pin_mux);
+ 	} else if (board_is_icev2()) {
+ 		configure_module_pin_mux(mmc0_pin_mux);
+ 		configure_module_pin_mux(gpio0_18_pin_mux);
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index 158b7d4e8e..8d45b6fade 100644
+--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
+@@ -133,6 +133,8 @@
+ 			"setenv fdtfile am335x-bone.dtb; fi; " \
+ 		"if test $board_name = A335BNLT; then " \
+ 			"setenv fdtfile am335x-boneblack.dtb; fi; " \
+		"if test $board_name = A335PBGL; then " \
+			"setenv fdtfile am335x-pocketbeagle.dtb; fi; " \
+ 		"if test $board_name = BBBW; then " \
+ 			"setenv fdtfile am335x-boneblack-wireless.dtb; fi; " \
+ 		"if test $board_name = BBG1; then " \
+
+From patchwork Wed Mar  7 10:40:42 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,2/4] am335x_evm: scan more partitions and use uname_r
+X-Patchwork-Submitter: Jason Kridner <jkridner@gmail.com>
+X-Patchwork-Id: 882567
+Message-Id: <20180307104044.4739-3-jdk@ti.com>
+To: u-boot@lists.denx.de
+Cc: Tom Rini <trini@konsulko.com>, Jason Kridner <jdk@ti.com>
+Date: Wed,  7 Mar 2018 05:40:42 -0500
+From: Jason Kridner <jkridner@gmail.com>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+This enables mainline u-boot to boot the BeagleBoard.org Debian
+distribution builds without extensive environment modifications.
+
+Some boot layouts only have a single partition on the
+MMC/eMMC. This will scan those partitions after the second
+partition that was already being scanned.
+
+Some layouts use uname_r to define the kernel being used for the boot to
+support multiple kernels stored within the boot file system without
+using symlinks.
+
+See http://elinux.org/Beagleboard:U-boot_partitioning_layout_2.0 for
+more details on the BeagleBoard.org Debian image layout.
+
+Signed-off-by: Jason Kridner <jdk@ti.com>
+Cc: Robert Nelson <robertcnelson@gmail.com>
+Cc: Tom Rini <trini@konsulko.com>
+---
+ include/configs/am335x_evm.h |  5 ++++-
+ include/environment/ti/mmc.h | 13 +++++++++----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index 8d45b6fade..32fe0e0cd5 100644
+--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
+@@ -61,7 +61,10 @@
+ #define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \
+ 	"bootcmd_" #devtypel #instance "=" \
+ 	"setenv mmcdev " #instance"; "\
+-	"setenv bootpart " #instance":2 ; "\
+	"setenv bootpart " #instance":2; "\
+	"run mmcboot;"\
+	"setenv mmcdev " #instance"; "\
+	"setenv bootpart " #instance":1; "\
+ 	"run mmcboot\0"
+ 
+ #define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \
+diff --git a/include/environment/ti/mmc.h b/include/environment/ti/mmc.h
+index 4305ebdaaf..b803ecccb7 100644
+--- a/include/environment/ti/mmc.h
+++ b/include/environment/ti/mmc.h
+@@ -23,9 +23,10 @@
+ 	"bootenvfile=uEnv.txt\0" \
+ 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
+ 		"env import -t ${loadaddr} ${filesize}\0" \
+-	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \
+-	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+-	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+	"loadbootenv=if fatload mmc ${mmcdev} ${loadaddr} ${bootdir}/${bootenvfile}; then echo Found ${bootdir}/${bootenvfile} in FAT partition; else load mmc ${mmcdev} ${loadaddr} ${bootdir}/${bootenvfile}; fi\0" \
+	"loadimage=if test -n ${uname_r}; then load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/vmlinuz-${uname_r}; run loadrd; else load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; fi\0" \
+	"loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/initrd.img-${uname_r}; setenv rdsize ${filesize}\0" \
+	"loadfdt=if test -n ${uname_r}; then load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/dtbs/${uname_r}/${fdtfile}; else load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}; fi;\0" \
+ 	"envboot=mmc dev ${mmcdev}; " \
+ 		"if mmc rescan; then " \
+ 			"echo SD/MMC found on device ${mmcdev};" \
+@@ -45,7 +46,11 @@
+ 	"mmcloados=run args_mmc; " \
+ 		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+ 			"if run loadfdt; then " \
+-				"bootz ${loadaddr} - ${fdtaddr}; " \
+				"if test -n ${uname_r}; then " \
+					"bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \
+				"else " \
+					"bootz ${loadaddr} - ${fdtaddr}; " \
+				"fi; " \
+ 			"else " \
+ 				"if test ${boot_fdt} = try; then " \
+ 					"bootz; " \
+
+From patchwork Wed Mar  7 10:40:43 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,3/4] Handle NETCONSOLE and SPL enabled
+X-Patchwork-Submitter: Jason Kridner <jkridner@gmail.com>
+X-Patchwork-Id: 882568
+Message-Id: <20180307104044.4739-4-jdk@ti.com>
+To: u-boot@lists.denx.de
+Cc: Joe Hershberger <joe.hershberger@ni.com>,
+ Jason Kridner <jkridner@beagleboard.org>, Jason Kridner <jdk@ti.com>
+Date: Wed,  7 Mar 2018 05:40:43 -0500
+From: Jason Kridner <jkridner@gmail.com>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+From: Jason Kridner <jkridner@beagleboard.org>
+
+NETCONSOLE isn't compiled in with SPL, so the include file needs to recognize that.
+
+Signed-off-by: Jason Kridner <jdk@ti.com>
+Cc: Joe Hershberger <joe.hershberger@ni.com>
+---
+ include/net.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/net.h b/include/net.h
+index 455b48f6c7..3101096e9a 100644
+--- a/include/net.h
+++ b/include/net.h
+@@ -676,7 +676,7 @@ int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport,
+ /* Processes a received packet */
+ void net_process_received_packet(uchar *in_packet, int len);
+ 
+-#ifdef CONFIG_NETCONSOLE
+#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD)
+ void nc_start(void);
+ int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port,
+ 	unsigned src_port, unsigned len);
+@@ -684,7 +684,7 @@ int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port,
+ 
+ static __always_inline int eth_is_on_demand_init(void)
+ {
+-#ifdef CONFIG_NETCONSOLE
+#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD)
+ 	extern enum proto_t net_loop_last_protocol;
+ 
+ 	return net_loop_last_protocol != NETCONS;
+@@ -695,7 +695,7 @@ static __always_inline int eth_is_on_demand_init(void)
+ 
+ static inline void eth_set_last_protocol(int protocol)
+ {
+-#ifdef CONFIG_NETCONSOLE
+#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD)
+ 	extern enum proto_t net_loop_last_protocol;
+ 
+ 	net_loop_last_protocol = protocol;
+
+From patchwork Wed Mar  7 10:40:44 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,4/4] am335x: am335x_evm_usbspl_defconfig: NETCONSOLE
+X-Patchwork-Submitter: Jason Kridner <jkridner@gmail.com>
+X-Patchwork-Id: 882569
+Message-Id: <20180307104044.4739-5-jdk@ti.com>
+To: u-boot@lists.denx.de
+Cc: Tom Rini <trini@konsulko.com>, Jason Kridner <jdk@ti.com>
+Date: Wed,  7 Mar 2018 05:40:44 -0500
+From: Jason Kridner <jkridner@gmail.com>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+Enable NETCONSOLE by default. Still requires changes to the boot
+environment to enable on the platform.
+
+Signed-of-by: Jason Kridner <jdk@ti.com>
+Cc: Tom Rini <trini@konsulko.com>
+---
+ configs/am335x_evm_usbspl_defconfig | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
+index e4bf757923..19f7c49951 100644
+--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
+@@ -6,7 +6,13 @@ CONFIG_AM33XX=y
+ CONFIG_DISTRO_DEFAULTS=y
+ # CONFIG_ANDROID_BOOT_IMAGE is not set
+ CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
+CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+# CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
+ CONFIG_SYS_CONSOLE_INFO_QUIET=y
+# CONFIG_SYS_STDIO_DEREGISTER is not set
+# CONFIG_FIT_EMBED is not set
+ CONFIG_VERSION_VARIABLE=y
+ CONFIG_ARCH_MISC_INIT=y
+ CONFIG_SPL=y
+@@ -50,3 +56,4 @@ CONFIG_USB_ETHER=y
+ CONFIG_LZO=y
+ CONFIG_OF_LIBFDT=y
+ CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_NETCONSOLE=y
--- a/Raspberry-Pi-400-Compute-Module-4-support.patch
+++ b/Raspberry-Pi-400-Compute-Module-4-support.patch
--- a/50
+++ b/50
@ -1,75 +1,29 @@
-a64-olinuxino
-amarula_a64_relic
-bananapi_m2_plus_h5
 bananapi_m64
 dragonboard410c
 dragonboard820c
 espresso7420
 evb-rk3328
 evb-rk3399
-ficus-rk3399
 firefly-rk3399
 geekbox
 hikey
-khadas-edge-captain-rk3399
-khadas-edge-v-rk3399
-khadas-edge-rk3399
 khadas-vim
-khadas-vim2
-khadas-vim3
-khadas-vim3l
-libretech-ac
-libretech_all_h3_cc_h5
-libretech_all_h3_it_h5
-libretech_all_h5_cc_h5
 libretech-cc
 mvebu_espressobin-88f3720
 mvebu_mcbin-88f8040
-nanopc-t4-rk3399
-nanopi_a64
-nanopi-k2
-nanopi-m4-rk3399
-nanopi-m4-2gb-rk3399
 nanopi_neo2
-nanopi-neo4-rk3399
-nanopi_neo_plus2
 odroid-c2
-orangepi_lite2
-orangepi_one_plus
 orangepi_pc2
 orangepi_prime
-orangepi-rk3399
 orangepi_win
-orangepi_zero_plus
 orangepi_zero_plus2
 p212
 p2371-2180
 p2771-0000-500
-p3450-0000
-pine64-lts
 pine64_plus
-pinebook
-pinebook-pro-rk3399
-pinephone
-pinetab
-pine_h64
 poplar
-puma-rk3399
-rock64-rk3328
-rock960-rk3399
-rock-pi-4-rk3399
-rock-pi-4c-rk3399
-rock-pi-e-rk3328
-rock-pi-n10-rk3399pro
-rockpro64-rk3399
-roc-cc-rk3328
-roc-pc-rk3399
-roc-pc-mezzanine-rk3399
 rpi_3
-rpi_4
-rpi_arm64
 sopine_baseboard
-teres_i
-turris_mox
+vexpress_aemv8a_dram
 vexpress_aemv8a_juno
-xilinx_zynqmp_virt
+vexpress_aemv8a_semi
--- a/35
+++ b/35
@ -6,26 +6,23 @@ A20-Olimex-SOM-EVB
 A20-OLinuXino-Lime
 A20-OLinuXino-Lime2
 A20-OLinuXino_MICRO
+am335x_boneblack
 am335x_evm
+am335x_evm_usbspl
 am57xx_evm
 Ampe_A76
-apalis_imx6
 arndale
 Auxtek-T003
 Auxtek-T004
 ba10_tv_box
 Bananapi
-bananapi_m1_plus
-bananapi_m2_berry
-Bananapi_m2m
-bananapi_m2_plus_h3
 Bananapi_M2_Ultra
-bananapi_m2_zero
 Bananapro
 chiliboard
 CHIP
 Chuwi_V7_CW0825
 clearfog
+cl-som-am57x
 cm_fx6
 Colombus
 colorfly_e708_q1
@ -39,27 +36,27 @@ db-mv784mp-gp
 difrnce_dit4350
 dserve_dsrv9703c
 evb-rk3229
+fennec-rk3288
 firefly-rk3288
-helios4
+highbank
 Hummingbird_A31
 Hyundai_A7HD
 i12-tvbox
 icnova-a20-swac
 inet1
-iNet_3F
-iNet_3W
 inet86dz
-iNet_86VS
 inet97fv2
 inet98v_rev2
 inet9f_rev03
 inet_q972
+iNet_3F
+iNet_3W
+iNet_86VS
 Itead_Ibox_A20
 jesurun_q5
 jetson-tk1
 kc1
 Lamobo_R1
-libretech_all_h3_cc_h2_plus
 Linksprite_pcDuino
 Linksprite_pcDuino3
 Linksprite_pcDuino3_Nano
@ -87,6 +84,7 @@ novena
 odroid
 odroid-xu3
 omap3_beagle
+omap3_pandora
 omap4_panda
 omap5_uevm
 Orangepi
@ -98,11 +96,9 @@ orangepi_pc
 orangepi_pc_plus
 orangepi_plus
 orangepi_plus2e
-orangepi_r1
 orangepi_zero
 origen
 paz00
-pinecube
 polaroid_mid2809pxe04
 pov_protab2_ips9
 q8_a13_tablet
@ -113,25 +109,24 @@ qemu_arm
 r7-tv-dongle
 riotboard
 rock
-rock-pi-n8-rk3288
 rock2
 rpi_2
 rpi_3_32b
-rpi_4_32b
 Sinlinx_SinA31s
 Sinovoip_BPI_M2
+Sinovoip_BPI_M2_Plus
 Sinovoip_BPI_M3
+smdkv310
 stih410-b2260
-stm32mp15_basic
 sunxi_Gemei_G9
 tbs_a711
 tinker-rk3288
-tinker-s-rk3288
 trimslice
+turris_omnia
 udoo
 udoo_neo
-usbarmory
 UTOO_P66
+usbarmory
 vexpress_ca15_tc2
 vexpress_ca9x4
 wandboard
@ -140,4 +135,6 @@ warp7
 Wexler_TAB7200
 Wits_Pro_A20_DKT
 Yones_Toptech_BS1078_V2
-xilinx_zynq_virt
+zynq_microzed
+zynq_zed
+zynq_zybo
--- a/arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch
+++ b/arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch
@ -1,135 +0,0 @@
-From 5cb3ca7ebd46c1983d0929b5ba027a03c1f5e51e Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Wed, 16 Dec 2020 15:22:34 +0000
-Subject: [PATCH 1/2] arm: dts: rockchip: rk3399: enable rng at the SoC level
-
-The rng is embedded in the SoC so enable it in the device tree
-universally, the use of it can be controlled by enabling/disabling
-at the device config level.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
- arch/arm/dts/rk3399-evb-u-boot.dtsi          | 4 ----
- arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ----
- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi    | 4 ----
- arch/arm/dts/rk3399-u-boot.dtsi              | 2 +-
- 4 files changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
-index 8056dc843e..398b205ec2 100644
--- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
-+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
-@@ -13,10 +13,6 @@
- 	};
- };
- 
-&rng {
-	status = "okay";
-};
-
- &i2c0 {
- 	u-boot,dm-pre-reloc;
- };
-diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
-index ded7db0aef..c3e866a779 100644
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
-+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
-@@ -28,10 +28,6 @@
- 	u-boot,dm-pre-reloc;
- };
- 
-&rng {
-	status = "okay";
-};
-
- &sdhci {
- 	max-frequency = <25000000>;
- 	u-boot,dm-pre-reloc;
-diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
-index 6317b47e41..37dff04adf 100644
--- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
-+++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
-@@ -15,10 +15,6 @@
- 	};
- };
- 
-&rng {
-	status = "okay";
-};
-
- &spi1 {
- 	spi_flash: flash@0 {
- 		u-boot,dm-pre-reloc;
-diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
-index ecd230c720..73922c328a 100644
--- a/arch/arm/dts/rk3399-u-boot.dtsi
-+++ b/arch/arm/dts/rk3399-u-boot.dtsi
-@@ -32,7 +32,7 @@
- 	rng: rng@ff8b8000 {
- 		compatible = "rockchip,cryptov1-rng";
- 		reg = <0x0 0xff8b8000 0x0 0x1000>;
-		status = "disabled";
-+		status = "okay";
- 	};
- 
- 	dmc: dmc {
-- 
-2.29.2
-
-From 62093137fcbe760d009cf2757feda7ccf328fbb7 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Wed, 16 Dec 2020 15:37:21 +0000
-Subject: [PATCH 2/2] configs: rk3399: enable rng on firefly/rock960/rockpro64
-
-Enable the RNG on the Firefly, rock960 and RockPro64 devices
-to enable KASLR on devices that support it.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
- configs/firefly-rk3399_defconfig   | 2 ++
- configs/rock960-rk3399_defconfig   | 2 ++
- configs/rockpro64-rk3399_defconfig | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
-index c453b82dc5..cfbaae40aa 100644
--- a/configs/firefly-rk3399_defconfig
-+++ b/configs/firefly-rk3399_defconfig
-@@ -35,6 +35,8 @@ CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
- CONFIG_MMC_SDHCI=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
-+CONFIG_DM_RNG=y
-+CONFIG_RNG_ROCKCHIP=y
- CONFIG_SF_DEFAULT_SPEED=20000000
- CONFIG_DM_ETH=y
- CONFIG_ETH_DESIGNWARE=y
-diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
-index 65dce3cd73..aadbc55f57 100644
--- a/configs/rock960-rk3399_defconfig
-+++ b/configs/rock960-rk3399_defconfig
-@@ -39,6 +39,8 @@ CONFIG_MMC_DW_ROCKCHIP=y
- CONFIG_MMC_SDHCI=y
- CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
-+CONFIG_DM_RNG=y
-+CONFIG_RNG_ROCKCHIP=y
- CONFIG_DM_ETH=y
- CONFIG_NVME=y
- CONFIG_PCI=y
-diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
-index 575b7a20d5..f78dfcc8f7 100644
--- a/configs/rockpro64-rk3399_defconfig
-+++ b/configs/rockpro64-rk3399_defconfig
-@@ -42,6 +42,8 @@ CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
- CONFIG_MMC_SDHCI=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
-+CONFIG_DM_RNG=y
-+CONFIG_RNG_ROCKCHIP=y
- CONFIG_SF_DEFAULT_BUS=1
- CONFIG_SPI_FLASH_GIGADEVICE=y
- CONFIG_DM_ETH=y
-- 
-2.29.2
-
--- a/dragonboard-fixes.patch
+++ b/dragonboard-fixes.patch
@ -1,17 +1,17 @@
-From 8b0274a733cd1ce39ad9ad18e1bd8efdd02a40b7 Mon Sep 17 00:00:00 2001
+From fbd0bffb20ca5edd21bbeb7cc20e24d091ab4280 Mon Sep 17 00:00:00 2001
 From: Rob Clark <robdclark@gmail.com>
 Date: Wed, 21 Jun 2017 14:21:15 -0400
-Subject: [PATCH 1/3] WIP: fix usb
+Subject: [PATCH 1/4] WIP: fix usb

 ---
 common/usb_storage.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/common/usb_storage.c b/common/usb_storage.c
-index d92ebb6eb19..9df3c3daaf4 100644
+index a91b1c0d2f..caea87a09f 100644
 --- a/common/usb_storage.c
 +++ b/common/usb_storage.c
-@@ -1016,7 +1016,7 @@ static int usb_request_sense(struct scsi_cmd *srb, struct us_data *ss)
+@@ -1018,7 +1018,7 @@ static int usb_request_sense(struct scsi_cmd *srb, struct us_data *ss)
 
 static int usb_test_unit_ready(struct scsi_cmd *srb, struct us_data *ss)
 {
@ -20,7 +20,7 @@ index d92ebb6eb19..9df3c3daaf4 100644
 
 	do {
 		memset(&srb->cmd[0], 0, 12);
-@@ -1039,7 +1039,7 @@ static int usb_test_unit_ready(struct scsi_cmd *srb, struct us_data *ss)
+@@ -1041,7 +1041,7 @@ static int usb_test_unit_ready(struct scsi_cmd *srb, struct us_data *ss)
 		if ((srb->sense_buf[2] == 0x02) &&
 		    (srb->sense_buf[12] == 0x3a))
 			return -1;
@ -30,12 +30,12 @@ index d92ebb6eb19..9df3c3daaf4 100644
 
 	return -1;
 -- 
-2.19.1
+2.14.3

-From 7bf41d74ca9d58bc2243b7688f8987c1d373ea56 Mon Sep 17 00:00:00 2001
+From d1b25b8d6461c5278228d657de9c24e0979e4b9d Mon Sep 17 00:00:00 2001
 From: Rob Clark <robdclark@gmail.com>
 Date: Mon, 3 Jul 2017 08:34:37 -0400
-Subject: [PATCH 2/3] HACK: disable emmc
+Subject: [PATCH 2/4] HACK: disable emmc

 Hitting some timeout which makes boot take much longer.  And
 uefi/boot/rootfs partitions will be on sd-card or usb disk, etc,
@ -45,18 +45,18 @@ so we can just ignore emmc.
 1 file changed, 2 insertions(+)

 diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts
-index fa348bc621e..bfe7f15d5ed 100644
+index 5ccfe7f8c8..9e2d3f5d9b 100644
 --- a/arch/arm/dts/dragonboard410c.dts
 +++ b/arch/arm/dts/dragonboard410c.dts
-@@ -106,6 +106,7 @@
- 			#phy-cells = <0>;
+@@ -67,6 +67,7 @@
+ 			reg = <0x78d9000 0x400>;
 		};
 
 +/*
 		sdhci@07824000 {
 			compatible = "qcom,sdhci-msm-v4";
 			reg = <0x7824900 0x11c 0x7824000 0x800>;
-@@ -115,6 +116,7 @@
+@@ -76,6 +77,7 @@
 			clock = <&clkc 0>;
 			clock-frequency = <100000000>;
 		};
@ -65,31 +65,35 @@ index fa348bc621e..bfe7f15d5ed 100644
 		sdhci@07864000 {
 			compatible = "qcom,sdhci-msm-v4";
 -- 
-2.19.1
+2.14.3

-From 871fe802cf3ab593b9332c4f36ab2b3f179d51ae Mon Sep 17 00:00:00 2001
+From a43912730613da9f17a185e55a980d9acd0e437e Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
-Date: Tue, 4 Sep 2018 12:21:59 +0100
-Subject: [PATCH 3/3] add options for dm410c config
+Date: Tue, 6 Mar 2018 10:08:32 +0000
+Subject: [PATCH 3/4] db410c: config updates

+Enable USB keyboards and video output, VFAT writes (useful for EFI boot)
+and a common USB eth adapter
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
 configs/dragonboard410c_defconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)

 diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
-index a55abaf8df5..4ece0cafbe4 100644
+index e6114db2ce..30e5cb3f5d 100644
 --- a/configs/dragonboard410c_defconfig
 +++ b/configs/dragonboard410c_defconfig
-@@ -7,6 +7,8 @@ CONFIG_NR_DRAM_BANKS=1
- # CONFIG_ANDROID_BOOT_IMAGE is not set
- CONFIG_FIT=y
- CONFIG_OF_BOARD_SETUP=y
+@@ -20,6 +20,8 @@ CONFIG_CMD_USB=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_TIMER=y
+ CONFIG_ENV_IS_IN_MMC=y
 +CONFIG_FAT_WRITE=y
 +CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
- CONFIG_MISC_INIT_R=y
- # CONFIG_DISPLAY_CPUINFO is not set
- # CONFIG_DISPLAY_BOARDINFO is not set
-@@ -41,6 +43,13 @@ CONFIG_DM_PMIC=y
+ CONFIG_CLK=y
+ CONFIG_MSM_GPIO=y
+ CONFIG_PM8916_GPIO=y
+@@ -32,10 +34,17 @@ CONFIG_DM_PMIC=y
 CONFIG_PMIC_PM8916=y
 CONFIG_MSM_SERIAL=y
 CONFIG_SPMI_MSM=y
@ -99,11 +103,15 @@ index a55abaf8df5..4ece0cafbe4 100644
 +# CONFG_VIDEO_BPP8 is not set
 +CONFIG_NO_FB_CLEAR=y
 +CONFIG_VIDEO_SIMPLE=y
-+CONFIG_USB_KEYBOARD=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
-@@ -57,5 +66,6 @@ CONFIG_USB_HOST_ETHER=y
+ CONFIG_USB_EHCI_MSM=y
+CONFIG_USB_KEYBOARD=y
+ CONFIG_USB_ULPI_VIEWPORT=y
+ CONFIG_USB_ULPI=y
+ CONFIG_USB_STORAGE=y
+@@ -43,5 +52,6 @@ CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_ASIX88179=y
 CONFIG_USB_ETHER_MCS7830=y
@ -111,5 +119,4 @@ index a55abaf8df5..4ece0cafbe4 100644
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 -- 
-2.19.1
-
+2.14.3
--- a/dwc2-USB-controller-hangs-with-lan78xx.patch
+++ b/dwc2-USB-controller-hangs-with-lan78xx.patch
@ -0,0 +1,45 @@
+From patchwork Mon Jun 18 18:56:06 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,1/1] dwc2 USB controller hangs with lan78xx
+X-Patchwork-Submitter: Andrew Thomas <andrew.thomas@oracle.com>
+X-Patchwork-Id: 931158
+Message-Id: <1529348166-130059-2-git-send-email-andrew.thomas@oracle.com>
+To: u-boot@lists.denx.de
+Cc: Andrew Thomas <andrew.thomas@oracle.com>
+Date: Mon, 18 Jun 2018 11:56:06 -0700
+From: Andrew Thomas <andrew.thomas@oracle.com>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+This bug is the combination of dwc2 USB controller and lan78xx
+USB ethernet controller, which is the combination in use on
+the Raspberry Pi Model 3 B+.
+
+When the host attempts to receive a packet, but a packet has not
+arrived, the lan78xx controller responds by setting BIR
+(Bulk-In Empty Response) to NAK. Unfortunately, this hangs
+the USB controller and requires the USB controller to
+be reset.
+
+The fix proposed is to have the lan78xx controller respond
+by setting BIR to ZLP.
+
+Signed-off-by: Andrew Thomas <andrew.thomas@oracle.com>
+---
+ drivers/usb/eth/lan78xx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c
+index c5ff379..e8ee665 100644
+--- a/drivers/usb/eth/lan78xx.c
+++ b/drivers/usb/eth/lan78xx.c
+@@ -296,7 +296,7 @@ static int lan78xx_basic_reset(struct usb_device *udev,
+ 	ret = lan7x_read_reg(udev, LAN78XX_USB_CFG0, &val);
+ 	if (ret)
+ 		return ret;
+-	val |= LAN78XX_USB_CFG0_BIR;
+	val &= ~LAN78XX_USB_CFG0_BIR;
+ 	return lan7x_write_reg(udev, LAN78XX_USB_CFG0, val);
+ }
+ 
--- a/fdt-fixes.patch
+++ b/fdt-fixes.patch
@ -0,0 +1,171 @@
+From 6a09f5e80038570b15f81fdb1e5bde897e01868a Mon Sep 17 00:00:00 2001
+From: Rob Clark <robdclark@gmail.com>
+Date: Fri, 23 Jun 2017 15:36:33 -0400
+Subject: [PATCH] dm: core: also parse chosen node
+
+This is the node that would contain, for example, the framebuffer setup
+by an earlier stage.
+
+Signed-off-by: Rob Clark <robdclark@gmail.com>
+---
+ arch/sandbox/dts/test.dts |  7 +++++++
+ drivers/core/root.c       | 12 ++++++++++++
+ test/dm/bus.c             |  2 +-
+ test/dm/test-fdt.c        |  2 +-
+ 4 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
+index e67d428eb2..3f9e788e6c 100644
+--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
+@@ -478,6 +478,13 @@
+ 	wdt0: wdt@0 {
+ 		compatible = "sandbox,wdt";
+ 	};
+
+	chosen {
+		chosen-test {
+			compatible = "denx,u-boot-fdt-test";
+			reg = <9 1>;
+		};
+	};
+ };
+ 
+ #include "sandbox_pmic.dtsi"
+diff --git a/drivers/core/root.c b/drivers/core/root.c
+index 976e2c4fdd..5a1c5994f6 100644
+--- a/drivers/core/root.c
+++ b/drivers/core/root.c
+@@ -266,6 +266,18 @@ static int dm_scan_fdt_node(struct udevice *parent, const void *blob,
+ 	for (offset = fdt_first_subnode(blob, offset);
+ 	     offset > 0;
+ 	     offset = fdt_next_subnode(blob, offset)) {
+
+		/* "chosen" node isn't a device itself but may contain some: */
+		if (!strcmp(fdt_get_name(blob, offset, NULL), "chosen")) {
+			pr_debug("parsing subnodes of \"chosen\"\n");
+
+			err = dm_scan_fdt_node(parent, blob, offset,
+					       pre_reloc_only);
+			if (err && !ret)
+				ret = err;
+			continue;
+		}
+
+ 		if (pre_reloc_only &&
+ 		    !dm_fdt_pre_reloc(blob, offset))
+ 			continue;
+diff --git a/test/dm/bus.c b/test/dm/bus.c
+index 7006d4163d..1da398ae3a 100644
+--- a/test/dm/bus.c
+++ b/test/dm/bus.c
+@@ -105,7 +105,7 @@ UCLASS_DRIVER(testbus) = {
+ /* Test that we can probe for children */
+ static int dm_test_bus_children(struct unit_test_state *uts)
+ {
+-	int num_devices = 6;
+	int num_devices = 7;
+ 	struct udevice *bus;
+ 	struct uclass *uc;
+ 
+diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
+index dcc2ef8b65..920ccbf016 100644
+--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
+@@ -167,7 +167,7 @@ int dm_check_devices(struct unit_test_state *uts, int num_devices)
+ /* Test that FDT-based binding works correctly */
+ static int dm_test_fdt(struct unit_test_state *uts)
+ {
+-	const int num_devices = 6;
+	const int num_devices = 7;
+ 	struct udevice *dev;
+ 	struct uclass *uc;
+ 	int ret;
+
+From 310feda7f7f40afbb26a158183e16c2c46eea28a Mon Sep 17 00:00:00 2001
+From: Rob Clark <robdclark@gmail.com>
+Date: Thu, 3 Aug 2017 09:52:14 -0400
+Subject: [PATCH] fdtdec: allow board to provide fdt for CONFIG_OF_SEPARATE
+
+Similar to CONFIG_OF_BOARD, but in this case the fdt is still built by
+u-boot build.  This allows the board to patch the fdt, etc.
+
+In the specific case of dragonboard 410c, we pass the u-boot generated
+fdt to the previous stage of bootloader (by embedding it in the
+u-boot.img that is loaded by lk/aboot), which patches the fdt and passes
+it back to u-boot.
+
+Signed-off-by: Rob Clark <robdclark@gmail.com>
+---
+ include/fdtdec.h |  3 ++-
+ lib/fdtdec.c     | 35 +++++++++++++++++++++++------------
+ 2 files changed, 25 insertions(+), 13 deletions(-)
+
+diff --git a/include/fdtdec.h b/include/fdtdec.h
+index 1ba02be8e1..c5acb8dae1 100644
+--- a/include/fdtdec.h
+++ b/include/fdtdec.h
+@@ -988,7 +988,8 @@ int fdtdec_setup(void);
+ 
+ /**
+  * Board-specific FDT initialization. Returns the address to a device tree blob.
+- * Called when CONFIG_OF_BOARD is defined.
+ * Called when CONFIG_OF_BOARD is defined, or if CONFIG_OF_SEPARATE is defined
+ * and the board implements it.
+  */
+ void *board_fdt_blob_setup(void);
+ 
+diff --git a/lib/fdtdec.c b/lib/fdtdec.c
+index 45f3fe7baf..15bd9b2572 100644
+--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
+@@ -1258,6 +1258,28 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp)
+ # endif
+ #endif
+ 
+#ifdef CONFIG_OF_SEPARATE
+/*
+ * For CONFIG_OF_SEPARATE, the board may optionally implement this to
+ * provide and/or fixup the fdt.
+ */
+__weak void *board_fdt_blob_setup(void)
+{
+	void *fdt_blob = NULL;
+#ifdef CONFIG_SPL_BUILD
+	/* FDT is at end of BSS unless it is in a different memory region */
+	if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS))
+		fdt_blob = (ulong *)&_image_binary_end;
+	else
+		fdt_blob = (ulong *)&__bss_end;
+#else
+	/* FDT is at end of image */
+	fdt_blob = (ulong *)&_end;
+#endif
+	return fdt_blob;
+}
+#endif
+
+ int fdtdec_setup(void)
+ {
+ #if CONFIG_IS_ENABLED(OF_CONTROL)
+@@ -1267,18 +1289,7 @@ int fdtdec_setup(void)
+ # ifdef CONFIG_OF_EMBED
+ 	/* Get a pointer to the FDT */
+ 	gd->fdt_blob = __dtb_dt_begin;
+-# elif defined CONFIG_OF_SEPARATE
+-#  ifdef CONFIG_SPL_BUILD
+-	/* FDT is at end of BSS unless it is in a different memory region */
+-	if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS))
+-		gd->fdt_blob = (ulong *)&_image_binary_end;
+-	else
+-		gd->fdt_blob = (ulong *)&__bss_end;
+-#  else
+-	/* FDT is at end of image */
+-	gd->fdt_blob = (ulong *)&_end;
+-#  endif
+-# elif defined(CONFIG_OF_BOARD)
+# elif defined(CONFIG_OF_SEPARATE) || defined(CONFIG_OF_BOARD)
+ 	/* Allow the board to override the fdt address. */
+ 	gd->fdt_blob = board_fdt_blob_setup();
+ # elif defined(CONFIG_OF_HOSTFILE)
+
--- a/mmc-mv_sdhci-zero-out-sdhci_host-structure.patch
+++ b/mmc-mv_sdhci-zero-out-sdhci_host-structure.patch
@ -0,0 +1,35 @@
+From patchwork Tue Mar 27 17:53:55 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot] mmc: mv_sdhci: zero out sdhci_host structure
+X-Patchwork-Submitter: Matt Pelland <mpelland@starry.com>
+X-Patchwork-Id: 891784
+Message-Id: <20180327175355.29633-1-mpelland@starry.com>
+To: u-boot@lists.denx.de
+Date: Tue, 27 Mar 2018 13:53:55 -0400
+From: Matt Pelland <mpelland@starry.com>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+The mv_sdhci driver was not zeroing the sdhci_host structure it
+allocates causing random access violations in parts of the mmc core
+where the "ops" member pointers are checked and called if not NULL.
+
+Signed-off-by: Matt Pelland <mpelland@starry.com>
+---
+ drivers/mmc/mv_sdhci.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
+index 69aa87babe..afc03f75a0 100644
+--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
+@@ -74,6 +74,8 @@ int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks)
+ 		return -ENOMEM;
+ 	}
+ 
+	memset(host, 0, sizeof(struct sdhci_host));
+
+ 	host->name = MVSDH_NAME;
+ 	host->ioaddr = (void *)regbase;
+ 	host->quirks = quirks;
--- a/mmc-use-core-clock-frequency-in-bcm2835-sdhost.patch
+++ b/mmc-use-core-clock-frequency-in-bcm2835-sdhost.patch
@ -0,0 +1,115 @@
+From patchwork Sat Mar 17 05:15:48 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot] mmc: use core clock frequency in bcm2835 sdhost
+X-Patchwork-Submitter: Jonathan Gray <jsg@jsg.id.au>
+X-Patchwork-Id: 887255
+Message-Id: <20180317051548.42856-1-jsg@jsg.id.au>
+To: u-boot@lists.denx.de
+Cc: Alexander Graf <agraf@suse.de>
+Date: Sat, 17 Mar 2018 16:15:48 +1100
+From: Jonathan Gray <jsg@jsg.id.au>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+In raspberrypi-firmware 7fdcd00e00a42a1c91e8bd6f5eb8352fe9358557 and
+later start.elf now sets the EMMC clock to 200 MHz.
+
+According to Phil Elwell in
+https://github.com/raspberrypi/firmware/issues/953
+the SDHost controller shares the core/VPU clock and doesn't use
+the EMMC clock.
+
+Use the core clock id when determining the frequency to allow
+U-Boot to work with recent versions of raspberrypi-firmware.
+Otherwise U-Boot hangs at:
+
+U-Boot 2018.03 (Mar 14 2018 - 20:36:00 +1100)
+
+DRAM:  948 MiB
+RPI 3 Model B (0xa02082)
+MMC:   mmc@7e202000: 0, sdhci@7e300000: 1
+Loading Environment from FAT...
+
+Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
+Cc: Alexander Graf <agraf@suse.de>
+Cc: Peter Robinson <pbrobinson@gmail.com>
+---
+ arch/arm/mach-bcm283x/include/mach/msg.h | 3 ++-
+ arch/arm/mach-bcm283x/msg.c              | 4 ++--
+ drivers/mmc/bcm2835_sdhci.c              | 2 +-
+ drivers/mmc/bcm2835_sdhost.c             | 3 ++-
+ 4 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm/mach-bcm283x/include/mach/msg.h b/arch/arm/mach-bcm283x/include/mach/msg.h
+index 478b1f1c50..d055480ba1 100644
+--- a/arch/arm/mach-bcm283x/include/mach/msg.h
+++ b/arch/arm/mach-bcm283x/include/mach/msg.h
+@@ -18,9 +18,10 @@ int bcm2835_power_on_module(u32 module);
+ /**
+  * bcm2835_get_mmc_clock() - get the frequency of the MMC clock
+  *
+ * @clock_id: ID of clock to get frequency for
+  * @return clock frequency, or -ve on error
+  */
+-int bcm2835_get_mmc_clock(void);
+int bcm2835_get_mmc_clock(u32 clock_id);
+ 
+ /**
+  * bcm2835_get_video_size() - get the current display size
+diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
+index 92e93ad9e5..ad29f3be09 100644
+--- a/arch/arm/mach-bcm283x/msg.c
+++ b/arch/arm/mach-bcm283x/msg.c
+@@ -65,7 +65,7 @@ int bcm2835_power_on_module(u32 module)
+ 	return 0;
+ }
+ 
+-int bcm2835_get_mmc_clock(void)
+int bcm2835_get_mmc_clock(u32 clock_id)
+ {
+ 	ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_clock_rate, msg_clk, 1);
+ 	int ret;
+@@ -76,7 +76,7 @@ int bcm2835_get_mmc_clock(void)
+ 
+ 	BCM2835_MBOX_INIT_HDR(msg_clk);
+ 	BCM2835_MBOX_INIT_TAG(&msg_clk->get_clock_rate, GET_CLOCK_RATE);
+-	msg_clk->get_clock_rate.body.req.clock_id = BCM2835_MBOX_CLOCK_ID_EMMC;
+	msg_clk->get_clock_rate.body.req.clock_id = clock_id;
+ 
+ 	ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg_clk->hdr);
+ 	if (ret) {
+diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
+index 3157354d2a..08bddd410e 100644
+--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/drivers/mmc/bcm2835_sdhci.c
+@@ -183,7 +183,7 @@ static int bcm2835_sdhci_probe(struct udevice *dev)
+ 	if (base == FDT_ADDR_T_NONE)
+ 		return -EINVAL;
+ 
+-	ret = bcm2835_get_mmc_clock();
+	ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC);
+ 	if (ret < 0) {
+ 		debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret);
+ 		return ret;
+diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
+index 1bf52a3019..bccd182e50 100644
+--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
+@@ -35,6 +35,7 @@
+ #include <dm.h>
+ #include <mmc.h>
+ #include <asm/arch/msg.h>
+#include <asm/arch/mbox.h>
+ #include <asm/unaligned.h>
+ #include <linux/compat.h>
+ #include <linux/io.h>
+@@ -941,7 +942,7 @@ static int bcm2835_probe(struct udevice *dev)
+ 	if (!host->ioaddr)
+ 		return -ENOMEM;
+ 
+-	host->max_clk = bcm2835_get_mmc_clock();
+	host->max_clk = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_CORE);
+ 
+ 	bcm2835_add_host(host);
+ 
--- a/mvebu-enable-generic-distro-boot-config.patch
+++ b/mvebu-enable-generic-distro-boot-config.patch
@ -0,0 +1,111 @@
+From 8de891d0767aafb383b6f533b08a5c0b75b4718b Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Mon, 18 Sep 2017 15:48:32 +0100
+Subject: [PATCH] arm: mvebu: enable generic distro boot config
+
+Switch all of the mvebu boards to support disto generic booting
+This will enable Fedora, Debian and other distros to support
+mvebu systems easier. Tested on SolidRun ClearFog
+
+Signed-off-by: Dennis Gilmore <dgilmore@redhat.com>
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ include/configs/mv-common.h | 84 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 84 insertions(+)
+
+diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
+index 7c2bab2fc6..2819493fca 100644
+--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
+@@ -130,4 +130,88 @@
+ #define CONFIG_MTD_PARTITIONS
+ #endif
+ 
+#ifndef CONFIG_SPL_BUILD
+#include <config_distro_defaults.h>
+
+/*
+* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc.
+* 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
+* 1M script, 1M pxe and the ramdisk at the end.
+*/
+#define SDRAM_OFFSET(x) 0x0##x
+
+#define KERNEL_ADDR_R  __stringify(SDRAM_OFFSET(2000000))
+#define FDT_ADDR_R     __stringify(SDRAM_OFFSET(3000000))
+#define SCRIPT_ADDR_R  __stringify(SDRAM_OFFSET(3100000))
+#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000))
+#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3300000))
+
+#define MEM_LAYOUT_ENV_SETTINGS \
+        "bootm_size=0xa000000\0" \
+        "kernel_addr_r=" KERNEL_ADDR_R "\0" \
+        "fdt_addr_r=" FDT_ADDR_R "\0" \
+        "scriptaddr=" SCRIPT_ADDR_R "\0" \
+        "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \
+        "ramdisk_addr_r=" RAMDISK_ADDR_R "\0"
+
+#ifdef CONFIG_MMC
+#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
+#else
+#define BOOT_TARGET_DEVICES_MMC(func)
+#endif
+
+#ifdef CONFIG_CMD_SATA
+#define BOOT_TARGET_DEVICES_SATA(func) func(SATA, sata, 0) func(SATA, sata, 1)
+#define CONFIG_PREBOOT                  "sata init"
+#else
+#define BOOT_TARGET_DEVICES_SATA(func)
+#endif
+
+#ifdef CONFIG_USB_STORAGE
+#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
+#else
+#define BOOT_TARGET_DEVICES_USB(func)
+#endif
+
+#define BOOT_TARGET_DEVICES(func) \
+        BOOT_TARGET_DEVICES_MMC(func) \
+        BOOT_TARGET_DEVICES_SATA(func) \
+        BOOT_TARGET_DEVICES_USB(func) \
+        func(PXE, pxe, na)
+
+#include <config_distro_bootcmd.h>
+
+#ifdef CONFIG_USB_KEYBOARD
+#define CONSOLE_STDIN_SETTINGS \
+        "preboot=usb start\0" \
+        "stdin=serial,usbkbd\0"
+#else
+#define CONSOLE_STDIN_SETTINGS \
+        "stdin=serial\0"
+#endif
+
+#ifdef CONFIG_VIDEO
+#define CONSOLE_STDOUT_SETTINGS \
+        "stdout=serial,vga\0" \
+        "stderr=serial,vga\0"
+#else
+#define CONSOLE_STDOUT_SETTINGS \
+        "stdout=serial\0" \
+        "stderr=serial\0"
+#endif
+
+#define CONSOLE_ENV_SETTINGS \
+        CONSOLE_STDIN_SETTINGS \
+        CONSOLE_STDOUT_SETTINGS
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+        CONSOLE_ENV_SETTINGS \
+        MEM_LAYOUT_ENV_SETTINGS \
+        "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+        "console=ttyS0,115200\0" \
+        BOOTENV
+#else /* ifndef CONFIG_SPL_BUILD */
+#define CONFIG_EXTRA_ENV_SETTINGS
+#endif
+
+ #endif /* _MV_COMMON_H */
+-- 
+2.13.5
+
--- a/mvneta-support-setting-hardware-address.patch
+++ b/mvneta-support-setting-hardware-address.patch
@ -0,0 +1,53 @@
+From patchwork Tue Mar 27 17:18:25 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot] net: mvneta: support setting hardware address
+X-Patchwork-Submitter: Matt Pelland <mpelland@starry.com>
+X-Patchwork-Id: 891783
+Message-Id: <20180327171825.12742-1-mpelland@starry.com>
+To: u-boot@lists.denx.de
+Date: Tue, 27 Mar 2018 13:18:25 -0400
+From: Matt Pelland <mpelland@starry.com>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+mvneta already supports setting the MAC address but this was only done
+internally when some other part of U-Boot tries to actually use the
+interface. This commit exposes this functionality to the ethernet core
+code so that the MAC addresses of all interfaces are configured
+correctly even if they are not used before loading Linux.
+
+Signed-off-by: Matt Pelland <mpelland@starry.com>
+---
+ drivers/net/mvneta.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
+index 83e3153768..fdff772178 100644
+--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
+@@ -890,6 +890,16 @@ static void mvneta_mac_addr_set(struct mvneta_port *pp, unsigned char *addr,
+ 	mvneta_set_ucast_addr(pp, addr[5], queue);
+ }
+ 
+static int mvneta_write_hwaddr(struct udevice *dev)
+{
+	mvneta_mac_addr_set(
+		dev_get_priv(dev),
+		((struct eth_pdata *)dev_get_platdata(dev))->enetaddr,
+		rxq_def);
+
+	return 0;
+}
+
+ /* Handle rx descriptor fill by setting buf_cookie and buf_phys_addr */
+ static void mvneta_rx_desc_fill(struct mvneta_rx_desc *rx_desc,
+ 				u32 phys_addr, u32 cookie)
+@@ -1753,6 +1763,7 @@ static const struct eth_ops mvneta_ops = {
+ 	.send		= mvneta_send,
+ 	.recv		= mvneta_recv,
+ 	.stop		= mvneta_stop,
+	.write_hwaddr	= mvneta_write_hwaddr,
+ };
+ 
+ static int mvneta_ofdata_to_platdata(struct udevice *dev)
--- a/mx6-utilite-distro-boot.patch
+++ b/mx6-utilite-distro-boot.patch
@ -0,0 +1,154 @@
+From af017eb82317dc88c1b23301d76466b389c2e007 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Tue, 13 Sep 2016 08:47:34 +0100
+Subject: [PATCH] port utilite to distro generic boot commands
+
+---
+ include/configs/cm_fx6.h | 115 ++++++++++++-----------------------------------
+ 1 file changed, 29 insertions(+), 86 deletions(-)
+
+diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
+index c839b03..4dd501e 100644
+--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
+@@ -11,6 +11,7 @@
+ #ifndef __CONFIG_CM_FX6_H
+ #define __CONFIG_CM_FX6_H
+ 
+#include <config_distro_defaults.h>
+ #include "mx6_common.h"
+ 
+ /* Machine config */
+@@ -78,101 +79,43 @@
+ #define CONFIG_ENV_SIZE			(8 * 1024)
+ #define CONFIG_ENV_OFFSET		(768 * 1024)
+ 
+#ifndef CONFIG_SPL_BUILD
+#include <config_distro_defaults.h>
+#include <config_distro_bootcmd.h>
+
+#ifdef CONFIG_AHCI
+#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
+#else
+#define BOOT_TARGET_DEVICES_SCSI(func)
+#endif
+
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 2) \
+	BOOT_TARGET_DEVICES_SCSI(func) \
+	func(PXE, pxe, na) \
+	func(DHCP, dhcp, na)
+
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"stdin=serial,usbkbd\0" \
+ 	"stdout=serial,vga\0" \
+ 	"stderr=serial,vga\0" \
+ 	"panel=HDMI\0" \
+-	"autoload=no\0" \
+-	"uImage=uImage-cm-fx6\0" \
+-	"zImage=zImage-cm-fx6\0" \
+-	"kernel=uImage-cm-fx6\0" \
+-	"script=boot.scr\0" \
+-	"dtb=cm-fx6.dtb\0" \
+-	"bootm_low=18000000\0" \
+	"dtb=imx6q-utilite-pro.dts\0" \
+ 	"loadaddr=0x10800000\0" \
+ 	"fdtaddr=0x11000000\0" \
+	"fdt_addr_r=0x18000000\0" \
+	"pxefile_addr_r=0x17f00000\0" \
+	"scriptaddr=0x17e00000\0" \
+	"kernel_addr_r=0x11000000\0" \
+	"ramdisk_addr_r=0x18100000\0" \
+	"bootm_size=0x20000000\0" \
+ 	"console=ttymxc3,115200\0" \
+ 	"ethprime=FEC0\0" \
+-	"video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32@50,if=RGB32\0" \
+-	"video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
+-	"doboot=bootm ${loadaddr}\0" \
+-	"doloadfdt=false\0" \
+-	"mtdids=" MTDIDS_DEFAULT "\0" \
+-	"mtdparts=" MTDPARTS_DEFAULT "\0" \
+-	"setboottypez=setenv kernel ${zImage};" \
+-		"setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
+-		"setenv doloadfdt true;\0" \
+-	"setboottypem=setenv kernel ${uImage};" \
+-		"setenv doboot bootm ${loadaddr};" \
+-		"setenv doloadfdt false;\0"\
+-	"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
+-	"sataroot=/dev/sda2 rw rootwait\0" \
+-	"nandroot=/dev/mtdblock4 rw\0" \
+-	"nandrootfstype=ubifs\0" \
+-	"mmcargs=setenv bootargs console=${console} root=${mmcroot} " \
+-		"${video} ${extrabootargs}\0" \
+-	"sataargs=setenv bootargs console=${console} root=${sataroot} " \
+-		"${video} ${extrabootargs}\0" \
+-	"nandargs=setenv bootargs console=${console} " \
+-		"root=${nandroot} " \
+-		"rootfstype=${nandrootfstype} " \
+-		"${video} ${extrabootargs}\0" \
+-	"nandboot=if run nandloadkernel; then " \
+-			"run nandloadfdt;" \
+-			"run setboottypem;" \
+-			"run storagebootcmd;" \
+-			"run setboottypez;" \
+-			"run storagebootcmd;" \
+-		"fi;\0" \
+-	"run_eboot=echo Starting EBOOT ...; "\
+-		"mmc dev 2 && " \
+-		"mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \
+-	"loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0"\
+-	"loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0"\
+-	"loadfdt=load ${storagetype} ${storagedev} ${fdtaddr} ${dtb};\0" \
+-	"bootscript=echo Running bootscript from ${storagetype} ...;" \
+-		   "source ${loadaddr};\0" \
+-	"nandloadkernel=nand read ${loadaddr} 0 780000;\0" \
+-	"nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \
+-	"setupmmcboot=setenv storagetype mmc; setenv storagedev 2;\0" \
+-	"setupsataboot=setenv storagetype sata; setenv storagedev 0;\0" \
+-	"setupnandboot=setenv storagetype nand;\0" \
+-	"setupusbboot=setenv storagetype usb; setenv storagedev 0;\0" \
+-	"storagebootcmd=echo Booting from ${storagetype} ...;" \
+-			"run ${storagetype}args; run doboot;\0" \
+-	"trybootk=if run loadkernel; then " \
+-		"if ${doloadfdt}; then " \
+-			"run loadfdt;" \
+-		"fi;" \
+-		"run storagebootcmd;" \
+-		"fi;\0" \
+-	"trybootsmz=if run loadscript; then " \
+-			"run bootscript;" \
+-		"fi;" \
+-		"run setboottypem;" \
+-		"run trybootk;" \
+-		"run setboottypez;" \
+-		"run trybootk;\0"
+-
+-#define CONFIG_BOOTCOMMAND \
+-	"run setupmmcboot;" \
+-	"mmc dev ${storagedev};" \
+-	"if mmc rescan; then " \
+-		"run trybootsmz;" \
+-	"fi;" \
+-	"run setupusbboot;" \
+-	"if usb start; then "\
+-		"if run loadscript; then " \
+-			"run bootscript;" \
+-		"fi;" \
+-	"fi;" \
+-	"run setupsataboot;" \
+-	"if sata init; then " \
+-		"run trybootsmz;" \
+-	"fi;" \
+-	"run setupnandboot;" \
+-	"run nandboot;"
+	BOOTENV
+
+#else /* ifndef CONFIG_SPL_BUILD */
+#define CONFIG_EXTRA_ENV_SETTINGS
+#endif
+ 
+ #define CONFIG_PREBOOT		"usb start;sf probe"
+ 
+-- 
+2.9.3
+
--- a/mx6cuboxi-add-support-for-detecting-Revision-1.5-SoM.patch
+++ b/mx6cuboxi-add-support-for-detecting-Revision-1.5-SoM.patch
@ -0,0 +1,104 @@
+From 6f617cf4eeb14eceecfac499c723753ab1dded54 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Sun, 4 Mar 2018 13:27:10 +0000
+Subject: [PATCH] mx6cuboxi: add support for detecting Revision 1.5 SoMs
+
+Solid Run have a rev 1.5 SoM with different a different WiFi/BT module and some
+other changes. Their downstream commit 99e18b7f14 adds support for detecting
+this new SoM revision. This adds that support and sets up the new
+device tree naming that landed in the linux 4.16 kernel.
+
+Tested on a Hummingboard2 Gate.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ board/solidrun/mx6cuboxi/mx6cuboxi.c | 30 +++++++++++++++++++++++++++---
+ include/configs/mx6cuboxi.h          | 12 ++++++------
+ 2 files changed, 33 insertions(+), 9 deletions(-)
+
+diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
+index ee9e4f7c01..bea6275b78 100644
+--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
+@@ -79,9 +79,11 @@ static iomux_v3_cfg_t const usdhc2_pads[] = {
+ };
+ 
+ static iomux_v3_cfg_t const hb_cbi_sense[] = {
+-	/* These pins are for sensing if it is a CuBox-i or a HummingBoard */
+-	IOMUX_PADS(PAD_KEY_ROW1__GPIO4_IO09  | MUX_PAD_CTRL(UART_PAD_CTRL)),
+-	IOMUX_PADS(PAD_EIM_DA4__GPIO3_IO04   | MUX_PAD_CTRL(UART_PAD_CTRL)),
+	/* These pins are for sensing if it is a CuBox-i, HummingBoard(2) and SoM rev */
+	IOMUX_PADS(PAD_KEY_ROW1__GPIO4_IO09   | MUX_PAD_CTRL(UART_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA4__GPIO3_IO04    | MUX_PAD_CTRL(UART_PAD_CTRL)),
+	IOMUX_PADS(PAD_CSI0_DAT14__GPIO6_IO00 | MUX_PAD_CTRL(UART_PAD_CTRL)),
+	IOMUX_PADS(PAD_CSI0_DAT18__GPIO6_IO04 | MUX_PAD_CTRL(UART_PAD_CTRL)),
+ };
+ 
+ static iomux_v3_cfg_t const usb_pads[] = {
+@@ -390,6 +392,25 @@ static bool is_hummingboard2(void)
+ 		return false;
+ }
+ 
+static bool is_som_rev15(void)
+{
+	int val1;
+	int val2;
+
+	SETUP_IOMUX_PADS(hb_cbi_sense);
+
+	gpio_direction_input(IMX_GPIO_NR(6, 0));
+	gpio_direction_input(IMX_GPIO_NR(6, 4));
+
+	val1 = gpio_get_value(IMX_GPIO_NR(6, 0));
+	val2 = gpio_get_value(IMX_GPIO_NR(6, 4));
+
+	if (val1 == 1 && val2 == 0)
+		return true;
+	else
+		return false;
+}
+
+ int checkboard(void)
+ {
+ 	if (is_hummingboard2())
+@@ -412,6 +433,9 @@ int board_late_init(void)
+ 	else
+ 		env_set("board_name", "CUBOXI");
+ 
+	if (is_som_rev15())
+		env_set("som_rev", "-som-v15");
+
+ 	if (is_mx6dq())
+ 		env_set("board_rev", "MX6Q");
+ 	else
+diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
+index 0e1d18cad8..076fd2c40e 100644
+--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
+@@ -104,17 +104,17 @@
+ 		"fi\0" \
+ 	"findfdt="\
+ 		"if test $board_name = HUMMINGBOARD2 && test $board_rev = MX6Q ; then " \
+-			"setenv fdtfile imx6q-hummingboard2.dtb; fi; " \
+			"setenv fdtfile imx6q-hummingboard2${som_rev}.dtb; fi; " \
+ 		"if test $board_name = HUMMINGBOARD2 && test $board_rev = MX6DL ; then " \
+-			"setenv fdtfile imx6dl-hummingboard2.dtb; fi; " \
+			"setenv fdtfile imx6dl-hummingboard2${som_rev}.dtb; fi; " \
+ 		"if test $board_name = HUMMINGBOARD && test $board_rev = MX6Q ; then " \
+-			"setenv fdtfile imx6q-hummingboard.dtb; fi; " \
+			"setenv fdtfile imx6q-hummingboard${som_rev}.dtb; fi; " \
+ 		"if test $board_name = HUMMINGBOARD && test $board_rev = MX6DL ; then " \
+-			"setenv fdtfile imx6dl-hummingboard.dtb; fi; " \
+			"setenv fdtfile imx6dl-hummingboard${som_rev}.dtb; fi; " \
+ 		"if test $board_name = CUBOXI && test $board_rev = MX6Q ; then " \
+-			"setenv fdtfile imx6q-cubox-i.dtb; fi; " \
+			"setenv fdtfile imx6q-cubox-i${som_rev}.dtb; fi; " \
+ 		"if test $board_name = CUBOXI && test $board_rev = MX6DL ; then " \
+-			"setenv fdtfile imx6dl-cubox-i.dtb; fi; " \
+			"setenv fdtfile imx6dl-cubox-i${som_rev}.dtb; fi; " \
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine dtb to use; fi; \0" \
+ 	BOOTENV
+-- 
+2.14.3
+
--- a/net-Only-access-network-devices-after-init.patch
+++ b/net-Only-access-network-devices-after-init.patch
@ -0,0 +1,48 @@
+From patchwork Thu Mar 15 14:07:09 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot] net: Only access network devices after init
+X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
+X-Patchwork-Id: 886255
+Message-Id: <20180315140709.10346-1-agraf@suse.de>
+To: u-boot@lists.denx.de
+Cc: Joe Hershberger <joe.hershberger@ni.com>
+Date: Thu, 15 Mar 2018 15:07:09 +0100
+From: Alexander Graf <agraf@suse.de>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+In the efi_loader main loop we call eth_rx() occasionally. This rx function
+might end up calling into devices that haven't been initialized yet,
+potentially resulting in a lot of transfer timeouts.
+
+Instead, let's make sure the ethernet device is actually initialized before
+reading from or writing to it.
+
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ net/eth-uclass.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/eth-uclass.c b/net/eth-uclass.c
+index d30b04ba86..240b596534 100644
+--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
+@@ -336,7 +336,7 @@ int eth_send(void *packet, int length)
+ 	if (!current)
+ 		return -ENODEV;
+ 
+-	if (!device_active(current))
+	if (!eth_is_active(current))
+ 		return -EINVAL;
+ 
+ 	ret = eth_get_ops(current)->send(current, packet, length);
+@@ -359,7 +359,7 @@ int eth_rx(void)
+ 	if (!current)
+ 		return -ENODEV;
+ 
+-	if (!device_active(current))
+	if (!eth_is_active(current))
+ 		return -EINVAL;
+ 
+ 	/* Process up to 32 packets at one time */
--- a/rk3399-Pinebook-pro-EDP-support.patch
+++ b/rk3399-Pinebook-pro-EDP-support.patch
--- a/rk33xx-enable-make-itb.patch
+++ b/rk33xx-enable-make-itb.patch
@ -0,0 +1,33 @@
+From 5245a38260ff414e054d2f987907710f46e5a2e0 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Sun, 25 Feb 2018 19:15:39 +0000
+Subject: [PATCH] config: evb-rk3399: enable make itb
+
+Similar to firefly 3399 enable the ability to create a FIT image
+with combined arm-trusted-firmware.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ configs/evb-rk3399_defconfig | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
+index b5ae073224..bf81b2f93a 100644
+--- a/configs/evb-rk3399_defconfig
+++ b/configs/evb-rk3399_defconfig
+@@ -11,9 +11,12 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
+ CONFIG_DEBUG_UART=y
+ CONFIG_FIT=y
+ CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
+ # CONFIG_DISPLAY_CPUINFO is not set
+ CONFIG_SPL_STACK_R=y
+ CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
+CONFIG_SPL_ATF=y
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
+ CONFIG_CMD_BOOTZ=y
+ CONFIG_CMD_GPT=y
+ CONFIG_CMD_MMC=y
+-- 
+2.14.3
+
--- a/rk33xx-make_fit_atf-fix.patch
+++ b/rk33xx-make_fit_atf-fix.patch
@ -0,0 +1,28 @@
+From 319f90eb72054efc5022cc2183496fd7801a4e1e Mon Sep 17 00:00:00 2001
+From: Patrick Uiterwijk <patrick@puiterwijk.org>
+Date: Wed, 14 Feb 2018 01:29:42 +0100
+Subject: [PATCH 1/2] arm: rockchip: make_fit_atf: remove unneeded imports
+
+These imports are entirely unused in the entire script.
+
+Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ arch/arm/mach-rockchip/make_fit_atf.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py
+index 7c6dd57678..9a404d1d32 100755
+--- a/arch/arm/mach-rockchip/make_fit_atf.py
+++ b/arch/arm/mach-rockchip/make_fit_atf.py
+@@ -13,8 +13,6 @@ import getopt
+ 
+ # pip install pyelftools
+ from elftools.elf.elffile import ELFFile
+-from elftools.elf.sections import SymbolTableSection
+-from elftools.elf.segments import Segment, InterpSegment, NoteSegment
+ 
+ ELF_SEG_P_TYPE='p_type'
+ ELF_SEG_P_PADDR='p_paddr'
+-- 
+2.14.3
--- a/rng-Add-iProc-RNG200-driver.patch
+++ b/rng-Add-iProc-RNG200-driver.patch
@ -1,450 +0,0 @@
-From patchwork Tue Dec 15 09:49:23 2020
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: mbrugger <matthias.bgg@kernel.org>
-X-Patchwork-Id: 1416366
-X-Patchwork-Delegate: matthias.bgg@gmail.com
-Return-Path: <u-boot-bounces@lists.denx.de>
-X-Original-To: incoming@patchwork.ozlabs.org
-Delivered-To: patchwork-incoming@bilbo.ozlabs.org
-Authentication-Results: ozlabs.org;
- spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
- (client-ip=85.214.62.61; helo=phobos.denx.de;
- envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)
-Authentication-Results: ozlabs.org;
- dmarc=fail (p=none dis=none) header.from=kernel.org
-Received: from phobos.denx.de (phobos.denx.de [85.214.62.61])
-	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
-	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
-	(No client certificate requested)
-	by ozlabs.org (Postfix) with ESMTPS id 4CwD58649Dz9s0b
-	for <incoming@patchwork.ozlabs.org>; Tue, 15 Dec 2020 20:49:53 +1100 (AEDT)
-Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
-	by phobos.denx.de (Postfix) with ESMTP id 4EC6082956;
-	Tue, 15 Dec 2020 10:49:42 +0100 (CET)
-Authentication-Results: phobos.denx.de;
- dmarc=fail (p=none dis=none) header.from=kernel.org
-Authentication-Results: phobos.denx.de;
- spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
-Received: by phobos.denx.de (Postfix, from userid 109)
- id B1A738295E; Tue, 15 Dec 2020 10:49:40 +0100 (CET)
-X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
-X-Spam-Level: 
-X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI,
- SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2
-Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
- (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
- (No client certificate requested)
- by phobos.denx.de (Postfix) with ESMTPS id 38FB382955
- for <u-boot@lists.denx.de>; Tue, 15 Dec 2020 10:49:37 +0100 (CET)
-Authentication-Results: phobos.denx.de;
- dmarc=pass (p=none dis=none) header.from=kernel.org
-Authentication-Results: phobos.denx.de;
- spf=pass smtp.mailfrom=matthias.bgg@kernel.org
-From: matthias.bgg@kernel.org
-Authentication-Results: mail.kernel.org;
- dkim=permerror (bad message/signature format)
-To: sughosh.ganu@linaro.org,
-	xypron.glpk@gmx.de
-Cc: u-boot@lists.denx.de,
-	Matthias Brugger <mbrugger@suse.com>
-Subject: [PATCH v2 1/2] rng: Add iProc RNG200 driver
-Date: Tue, 15 Dec 2020 10:49:23 +0100
-Message-Id: <20201215094924.30072-1-matthias.bgg@kernel.org>
-X-Mailer: git-send-email 2.29.2
-MIME-Version: 1.0
-X-BeenThere: u-boot@lists.denx.de
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: U-Boot discussion <u-boot.lists.denx.de>
-List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
- <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
-List-Archive: <https://lists.denx.de/pipermail/u-boot/>
-List-Post: <mailto:u-boot@lists.denx.de>
-List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
-List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
- <mailto:u-boot-request@lists.denx.de?subject=subscribe>
-Errors-To: u-boot-bounces@lists.denx.de
-Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
-X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de
-X-Virus-Status: Clean
-
-From: Matthias Brugger <mbrugger@suse.com>
-
-Add support for random number generator RNG200.
-This is for example found on RPi4.
-
-Signed-off-by: Matthias Brugger <mbrugger@suse.com>
-Tested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
-
-Changes in v2: None
-
- drivers/rng/Kconfig        |   6 ++
- drivers/rng/Makefile       |   1 +
- drivers/rng/iproc_rng200.c | 186 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 193 insertions(+)
- create mode 100644 drivers/rng/iproc_rng200.c
-
-diff --git a/drivers/rng/Kconfig b/drivers/rng/Kconfig
-index 11001c8ae7..94915d45b3 100644
--- a/drivers/rng/Kconfig
-+++ b/drivers/rng/Kconfig
-@@ -46,4 +46,10 @@ config RNG_ROCKCHIP
- 	  Enable random number generator for rockchip.This driver is
- 	  support rng module of crypto v1 and crypto v2.
- 
-+config RNG_IPROC200
-+	bool "Broadcom iProc RNG200 random number generator"
-+	depends on DM_RNG
-+	default n
-+	help
-+	  Enable random number generator for RPI4.
- endif
-diff --git a/drivers/rng/Makefile b/drivers/rng/Makefile
-index 8953406882..39f7ee3f03 100644
--- a/drivers/rng/Makefile
-+++ b/drivers/rng/Makefile
-@@ -9,3 +9,4 @@ obj-$(CONFIG_RNG_SANDBOX) += sandbox_rng.o
- obj-$(CONFIG_RNG_MSM) += msm_rng.o
- obj-$(CONFIG_RNG_STM32MP1) += stm32mp1_rng.o
- obj-$(CONFIG_RNG_ROCKCHIP) += rockchip_rng.o
-+obj-$(CONFIG_RNG_IPROC200) += iproc_rng200.o
-diff --git a/drivers/rng/iproc_rng200.c b/drivers/rng/iproc_rng200.c
-new file mode 100644
-index 0000000000..1063f43953
--- /dev/null
-+++ b/drivers/rng/iproc_rng200.c
-@@ -0,0 +1,186 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * Copyright 2020, Matthias Brugger <mbrugger@suse.com>
-+ *
-+ * Driver for Raspberry Pi hardware random number generator
-+ */
-+
-+#include <common.h>
-+#include <dm.h>
-+#include <linux/delay.h>
-+#include <rng.h>
-+#include <asm/io.h>
-+
-+#define usleep_range(a, b) udelay((b))
-+
-+#define RNG_CTRL_OFFSET					0x00
-+#define RNG_CTRL_RNG_RBGEN_MASK				0x00001FFF
-+#define RNG_CTRL_RNG_RBGEN_ENABLE			0x00000001
-+#define RNG_CTRL_RNG_RBGEN_DISABLE			0x00000000
-+
-+#define RNG_SOFT_RESET_OFFSET				0x04
-+#define RNG_SOFT_RESET					0x00000001
-+
-+#define RBG_SOFT_RESET_OFFSET				0x08
-+#define RBG_SOFT_RESET					0x00000001
-+
-+#define RNG_INT_STATUS_OFFSET				0x18
-+#define RNG_INT_STATUS_MASTER_FAIL_LOCKOUT_IRQ_MASK	0x80000000
-+#define RNG_INT_STATUS_NIST_FAIL_IRQ_MASK		0x00000020
-+
-+#define RNG_FIFO_DATA_OFFSET				0x20
-+
-+#define RNG_FIFO_COUNT_OFFSET				0x24
-+#define RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK		0x000000FF
-+
-+struct iproc_rng200_platdata {
-+	fdt_addr_t base;
-+};
-+
-+static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable)
-+{
-+	fdt_addr_t rng_base = pdata->base;
-+	u32 val;
-+
-+	val = readl(rng_base + RNG_CTRL_OFFSET);
-+	val &= ~RNG_CTRL_RNG_RBGEN_MASK;
-+	if (enable)
-+		val |= RNG_CTRL_RNG_RBGEN_ENABLE;
-+	else
-+		val &= ~RNG_CTRL_RNG_RBGEN_ENABLE;
-+
-+	writel(val, rng_base + RNG_CTRL_OFFSET);
-+
-+}
-+
-+static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata)
-+{
-+	fdt_addr_t rng_base = pdata->base;
-+	u32 val;
-+
-+	iproc_rng200_enable(pdata, false);
-+
-+	/* Clear all interrupt status */
-+	writel(0xFFFFFFFFUL, rng_base + RNG_INT_STATUS_OFFSET);
-+
-+	/* Reset RNG and RBG */
-+	val = readl(rng_base + RBG_SOFT_RESET_OFFSET);
-+	val |= RBG_SOFT_RESET;
-+	writel(val, rng_base + RBG_SOFT_RESET_OFFSET);
-+
-+	val = readl(rng_base + RNG_SOFT_RESET_OFFSET);
-+	val |= RNG_SOFT_RESET;
-+	writel(val, rng_base + RNG_SOFT_RESET_OFFSET);
-+
-+	val = readl(rng_base + RNG_SOFT_RESET_OFFSET);
-+	val &= ~RNG_SOFT_RESET;
-+	writel(val, rng_base + RNG_SOFT_RESET_OFFSET);
-+
-+	val = readl(rng_base + RBG_SOFT_RESET_OFFSET);
-+	val &= ~RBG_SOFT_RESET;
-+	writel(val, rng_base + RBG_SOFT_RESET_OFFSET);
-+
-+	iproc_rng200_enable(pdata, true);
-+}
-+
-+static int iproc_rng200_read(struct udevice *dev, void *data, size_t len)
-+{
-+	struct iproc_rng200_platdata *priv = dev_get_platdata(dev);
-+	char *buf = (char *)data;
-+	u32 num_remaining = len;
-+	u32 status;
-+
-+	#define MAX_RESETS_PER_READ	1
-+	u32 num_resets = 0;
-+
-+	while (num_remaining > 0) {
-+
-+		/* Is RNG sane? If not, reset it. */
-+		status = readl(priv->base + RNG_INT_STATUS_OFFSET);
-+		if ((status & (RNG_INT_STATUS_MASTER_FAIL_LOCKOUT_IRQ_MASK |
-+			RNG_INT_STATUS_NIST_FAIL_IRQ_MASK)) != 0) {
-+
-+			if (num_resets >= MAX_RESETS_PER_READ)
-+				return len - num_remaining;
-+
-+			iproc_rng200_restart(priv);
-+			num_resets++;
-+		}
-+
-+		/* Are there any random numbers available? */
-+		if ((readl(priv->base + RNG_FIFO_COUNT_OFFSET) &
-+				RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK) > 0) {
-+
-+			if (num_remaining >= sizeof(u32)) {
-+				/* Buffer has room to store entire word */
-+				*(u32 *)buf = readl(priv->base +
-+							RNG_FIFO_DATA_OFFSET);
-+				buf += sizeof(u32);
-+				num_remaining -= sizeof(u32);
-+			} else {
-+				/* Buffer can only store partial word */
-+				u32 rnd_number = readl(priv->base +
-+							RNG_FIFO_DATA_OFFSET);
-+				memcpy(buf, &rnd_number, num_remaining);
-+				buf += num_remaining;
-+				num_remaining = 0;
-+			}
-+
-+		} else {
-+			/* Can wait, give others chance to run */
-+			usleep_range(min(num_remaining * 10, 500U), 500);
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int iproc_rng200_probe(struct udevice *dev)
-+{
-+	struct iproc_rng200_platdata *priv = dev_get_platdata(dev);
-+
-+	iproc_rng200_enable(priv, true);
-+
-+	return 0;
-+}
-+
-+static int iproc_rng200_remove(struct udevice *dev)
-+{
-+	struct iproc_rng200_platdata *priv = dev_get_platdata(dev);
-+
-+	iproc_rng200_enable(priv, false);
-+
-+	return 0;
-+}
-+
-+static int iproc_rng200_ofdata_to_platdata(struct udevice *dev)
-+{
-+	struct iproc_rng200_platdata *pdata = dev_get_platdata(dev);
-+
-+	pdata->base = dev_read_addr(dev);
-+	if (!pdata->base)
-+		return -ENODEV;
-+
-+	return 0;
-+}
-+
-+static const struct dm_rng_ops iproc_rng200_ops = {
-+	.read = iproc_rng200_read,
-+};
-+
-+static const struct udevice_id iproc_rng200_rng_match[] = {
-+	{ .compatible = "brcm,bcm2711-rng200", },
-+	{ .compatible = "brcm,iproc-rng200", },
-+	{},
-+};
-+
-+U_BOOT_DRIVER(iproc_rng200_rng) = {
-+	.name = "iproc_rng200-rng",
-+	.id = UCLASS_RNG,
-+	.of_match = iproc_rng200_rng_match,
-+	.ops = &iproc_rng200_ops,
-+	.probe = iproc_rng200_probe,
-+	.remove = iproc_rng200_remove,
-+	.platdata_auto_alloc_size = sizeof(struct iproc_rng200_platdata),
-+	.ofdata_to_platdata = iproc_rng200_ofdata_to_platdata,
-+};
-
-From patchwork Tue Dec 15 09:49:24 2020
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: mbrugger <matthias.bgg@kernel.org>
-X-Patchwork-Id: 1416367
-X-Patchwork-Delegate: matthias.bgg@gmail.com
-Return-Path: <u-boot-bounces@lists.denx.de>
-X-Original-To: incoming@patchwork.ozlabs.org
-Delivered-To: patchwork-incoming@bilbo.ozlabs.org
-Authentication-Results: ozlabs.org;
- spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
- (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;
- envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)
-Authentication-Results: ozlabs.org;
- dmarc=fail (p=none dis=none) header.from=kernel.org
-Received: from phobos.denx.de (phobos.denx.de
- [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])
-	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
-	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest
- SHA256)
-	(No client certificate requested)
-	by ozlabs.org (Postfix) with ESMTPS id 4CwD5D4Gf2z9s0b
-	for <incoming@patchwork.ozlabs.org>; Tue, 15 Dec 2020 20:50:08 +1100 (AEDT)
-Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
-	by phobos.denx.de (Postfix) with ESMTP id A25E782961;
-	Tue, 15 Dec 2020 10:49:46 +0100 (CET)
-Authentication-Results: phobos.denx.de;
- dmarc=fail (p=none dis=none) header.from=kernel.org
-Authentication-Results: phobos.denx.de;
- spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
-Received: by phobos.denx.de (Postfix, from userid 109)
- id 9EC418295C; Tue, 15 Dec 2020 10:49:41 +0100 (CET)
-X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
-X-Spam-Level: 
-X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI,
- SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2
-Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
- (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
- (No client certificate requested)
- by phobos.denx.de (Postfix) with ESMTPS id BCF5682956
- for <u-boot@lists.denx.de>; Tue, 15 Dec 2020 10:49:38 +0100 (CET)
-Authentication-Results: phobos.denx.de;
- dmarc=pass (p=none dis=none) header.from=kernel.org
-Authentication-Results: phobos.denx.de;
- spf=pass smtp.mailfrom=matthias.bgg@kernel.org
-From: matthias.bgg@kernel.org
-Authentication-Results: mail.kernel.org;
- dkim=permerror (bad message/signature format)
-To: sughosh.ganu@linaro.org,
-	xypron.glpk@gmx.de
-Cc: u-boot@lists.denx.de,
-	Matthias Brugger <mbrugger@suse.com>
-Subject: [PATCH v2 2/2] config: Enable iProc RNG200 driver in RPi4 configs
-Date: Tue, 15 Dec 2020 10:49:24 +0100
-Message-Id: <20201215094924.30072-2-matthias.bgg@kernel.org>
-X-Mailer: git-send-email 2.29.2
-In-Reply-To: <20201215094924.30072-1-matthias.bgg@kernel.org>
-References: <20201215094924.30072-1-matthias.bgg@kernel.org>
-MIME-Version: 1.0
-X-BeenThere: u-boot@lists.denx.de
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: U-Boot discussion <u-boot.lists.denx.de>
-List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
- <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
-List-Archive: <https://lists.denx.de/pipermail/u-boot/>
-List-Post: <mailto:u-boot@lists.denx.de>
-List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
-List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
- <mailto:u-boot-request@lists.denx.de?subject=subscribe>
-Errors-To: u-boot-bounces@lists.denx.de
-Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
-X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de
-X-Virus-Status: Clean
-
-From: Matthias Brugger <mbrugger@suse.com>
-
-We find the iProc RNG200 in the Raspberry Pi 4. Add it to all it's
-config so that it can be used.
-
-Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
-
-Changes in v2:
- fix defconfigs using savedefconfig (Heinrich)
-
- configs/rpi_4_32b_defconfig | 2 ++
- configs/rpi_4_defconfig     | 2 ++
- configs/rpi_arm64_defconfig | 2 ++
- drivers/rng/iproc_rng200.c  | 1 -
- 4 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
-index 5ddd838fd5..4039e46c81 100644
--- a/configs/rpi_4_32b_defconfig
-+++ b/configs/rpi_4_32b_defconfig
-@@ -36,6 +36,8 @@ CONFIG_PCI_BRCMSTB=y
- CONFIG_PINCTRL=y
- # CONFIG_PINCTRL_GENERIC is not set
- CONFIG_DM_RESET=y
-+CONFIG_DM_RNG=y
-+CONFIG_RNG_IPROC200=y
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
- CONFIG_USB=y
- CONFIG_DM_USB=y
-diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
-index 2590d0a696..46b6cc3046 100644
--- a/configs/rpi_4_defconfig
-+++ b/configs/rpi_4_defconfig
-@@ -36,6 +36,8 @@ CONFIG_PCI_BRCMSTB=y
- CONFIG_PINCTRL=y
- # CONFIG_PINCTRL_GENERIC is not set
- CONFIG_DM_RESET=y
-+CONFIG_DM_RNG=y
-+CONFIG_RNG_IPROC200=y
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
- CONFIG_USB=y
- CONFIG_DM_USB=y
-diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
-index 2639219a1a..b75144036d 100644
--- a/configs/rpi_arm64_defconfig
-+++ b/configs/rpi_arm64_defconfig
-@@ -33,6 +33,8 @@ CONFIG_PCI_BRCMSTB=y
- CONFIG_PINCTRL=y
- # CONFIG_PINCTRL_GENERIC is not set
- CONFIG_DM_RESET=y
-+CONFIG_DM_RNG=y
-+CONFIG_RNG_IPROC200=y
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
- CONFIG_USB=y
- CONFIG_DM_USB=y
-diff --git a/drivers/rng/iproc_rng200.c b/drivers/rng/iproc_rng200.c
-index 1063f43953..378f6cf48d 100644
--- a/drivers/rng/iproc_rng200.c
-+++ b/drivers/rng/iproc_rng200.c
-@@ -50,7 +50,6 @@ static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable
- 		val &= ~RNG_CTRL_RNG_RBGEN_ENABLE;
- 
- 	writel(val, rng_base + RNG_CTRL_OFFSET);
-
- }
- 
- static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata)
--- a/rockchip-spl-u-boot-itb-offset.patch
+++ b/rockchip-spl-u-boot-itb-offset.patch
@ -1,11 +0,0 @@
--- u-boot-2020.10/common/spl/Kconfig.orig	2020-10-07 12:08:54.972632715 +0100
-+++ u-boot-2020.10/common/spl/Kconfig	2020-10-07 12:08:59.100672506 +0100
-@@ -324,7 +324,7 @@
- 	default 0x200 if ARCH_SOCFPGA || ARCH_AT91
- 	default 0x300 if ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || OMAP44XX || \
- 		         OMAP54XX || AM33XX || AM43XX || ARCH_K3
-	default 0x4000 if ARCH_ROCKCHIP
-+	default 0x200 if ARCH_ROCKCHIP
- 	default 0x822 if TARGET_SIFIVE_FU540
- 	help
- 	  Address on the MMC to load U-Boot from, when the MMC is being used
--- a/rpi-3-plus-support.patch
+++ b/rpi-3-plus-support.patch
@ -0,0 +1,138 @@
+From patchwork Thu Mar 15 14:10:20 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot] lan7xxx: Require phylib
+X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
+X-Patchwork-Id: 886258
+Message-Id: <20180315141020.11581-1-agraf@suse.de>
+To: u-boot@lists.denx.de
+Cc: Joe Hershberger <joe.hershberger@ni.com>
+Date: Thu, 15 Mar 2018 15:10:20 +0100
+From: Alexander Graf <agraf@suse.de>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+The lan75xx and lan78xx drivers need to drive their phy via the generic
+phylib framework. Let's reflect that dependency in Kconfig, so that we
+don't get build errors when phylib does not get selected.
+
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ drivers/usb/eth/Kconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/usb/eth/Kconfig b/drivers/usb/eth/Kconfig
+index 496a6d1933..2f6bfa8e71 100644
+--- a/drivers/usb/eth/Kconfig
+++ b/drivers/usb/eth/Kconfig
+@@ -23,6 +23,7 @@ config USB_ETHER_ASIX88179
+ config USB_ETHER_LAN75XX
+ 	bool "Microchip LAN75XX support"
+ 	depends on USB_HOST_ETHER
+	depends on PHYLIB
+ 	---help---
+ 	  Say Y here if you would like to support Microchip LAN75XX Hi-Speed
+ 	  USB 2.0 to 10/100/1000 Gigabit Ethernet controller.
+@@ -32,6 +33,7 @@ config USB_ETHER_LAN75XX
+ config USB_ETHER_LAN78XX
+ 	bool "Microchip LAN78XX support"
+ 	depends on USB_HOST_ETHER
+	depends on PHYLIB
+ 	---help---
+ 	  Say Y here if you would like to support Microchip LAN78XX USB 3.1
+ 	  Gen 1 to 10/100/1000 Gigabit Ethernet controller.
+From patchwork Thu Mar 15 14:05:36 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,1/2] rpi3: Enable lan78xx driver
+X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
+X-Patchwork-Id: 886254
+Message-Id: <20180315140537.9818-1-agraf@suse.de>
+To: u-boot@lists.denx.de
+Date: Thu, 15 Mar 2018 15:05:36 +0100
+From: Alexander Graf <agraf@suse.de>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+The new Raspberry Pi B 3+ has a lan78xx device attached to it. Let's add
+driver support in U-Boot for it.
+
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ configs/rpi_3_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
+index 0f3a54ec9a..810b60344f 100644
+--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
+@@ -36,3 +36,5 @@ CONFIG_SYS_WHITE_ON_BLACK=y
+ CONFIG_CONSOLE_SCROLL_LINES=10
+ CONFIG_PHYS_TO_BUS=y
+ CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_PHYLIB=y
+CONFIG_USB_ETHER_LAN78XX=y
+
+From patchwork Thu Mar 15 14:05:37 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,2/2] rpi: Add identifier for the new RPi3 B+
+X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
+X-Patchwork-Id: 886253
+Message-Id: <20180315140537.9818-2-agraf@suse.de>
+To: u-boot@lists.denx.de
+Date: Thu, 15 Mar 2018 15:05:37 +0100
+From: Alexander Graf <agraf@suse.de>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+The Raspberr Pi Foundation released a new RPi3 version which we want
+to detect as well, so we can enable ethernet on it and know the correct
+device tree file name.
+
+Add an identifier for it.
+
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ board/raspberrypi/rpi/rpi.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
+index 177f4af265..279a9c3cda 100644
+--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
+@@ -111,6 +111,11 @@ static const struct rpi_model rpi_models_new_scheme[] = {
+ 		DTB_DIR "bcm2835-rpi-zero-w.dtb",
+ 		false,
+ 	},
+	[0xD] = {
+		"3 Model B+",
+		DTB_DIR "bcm2837-rpi-3-b-plus.dtb",
+		true,
+	},
+ };
+ 
+ static const struct rpi_model rpi_models_old_scheme[] = {
+From 2ce61c377f5cb1175f3fd0ad05857d4f56ce3966 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Fri, 16 Mar 2018 02:24:41 +0000
+Subject: [PATCH] Raspberry Pi B 3+ has a lan78xx device
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ configs/rpi_3_32b_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
+index 317fc28f71..4e59c14fdf 100644
+--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
+@@ -36,3 +36,5 @@ CONFIG_SYS_WHITE_ON_BLACK=y
+ CONFIG_CONSOLE_SCROLL_LINES=10
+ CONFIG_PHYS_TO_BUS=y
+ CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_PHYLIB=y
+CONFIG_USB_ETHER_LAN78XX=y
+-- 
+2.16.2
+
--- a/rpi-Adjust-fdt_addr_r-to-a-sane-address.patch
+++ b/rpi-Adjust-fdt_addr_r-to-a-sane-address.patch
@ -0,0 +1,40 @@
+From patchwork Fri Apr 13 15:49:00 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot] rpi: Adjust fdt_addr_r to a sane address
+X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
+X-Patchwork-Id: 898002
+X-Patchwork-Delegate: agraf@suse.de
+Message-Id: <20180413154900.84208-1-agraf@suse.de>
+To: u-boot@lists.denx.de
+Date: Fri, 13 Apr 2018 17:49:00 +0200
+From: Alexander Graf <agraf@suse.de>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+Back in the old days, 0x100 was used as the address to pass the device tree
+from firmware into the kernel. This has since changed to a more dynamic
+location, so using 0x100 actually breaks more things than it helps with.
+
+Let's move the device tree default location for distro boot to a more sane
+place that gives us enough head room in low memory.
+
+Reported-by: Tuomas Tynkkynen <tuomas@tuxera.com>
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ include/configs/rpi.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/rpi.h b/include/configs/rpi.h
+index 325e52a019..fcf7e0976b 100644
+--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
+@@ -124,7 +124,7 @@
+ #define ENV_MEM_LAYOUT_SETTINGS \
+ 	"fdt_high=ffffffff\0" \
+ 	"initrd_high=ffffffff\0" \
+-	"fdt_addr_r=0x00000100\0" \
+	"fdt_addr_r=0x01f00000\0" \
+ 	"pxefile_addr_r=0x00100000\0" \
+ 	"kernel_addr_r=0x01000000\0" \
+ 	"scriptaddr=0x02000000\0" \
--- a/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
+++ b/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
@ -1,96 +0,0 @@
-From f10f94831450671a77f61fe413b4a57459963860 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Mon, 10 Aug 2020 22:20:29 +0100
-Subject: [PATCH] rpi: Use firmware provided device tree
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
- configs/rpi_0_w_defconfig      | 2 +-
- configs/rpi_2_defconfig        | 2 +-
- configs/rpi_3_32b_defconfig    | 2 +-
- configs/rpi_3_b_plus_defconfig | 2 +-
- configs/rpi_3_defconfig        | 2 +-
- configs/rpi_defconfig          | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
-index bba5e12b12..0241f4c6d3 100644
--- a/configs/rpi_0_w_defconfig
-+++ b/configs/rpi_0_w_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
-index 1c2bbb29ce..9573e475f4 100644
--- a/configs/rpi_2_defconfig
-+++ b/configs/rpi_2_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
-index b8a3d17f43..252df994e6 100644
--- a/configs/rpi_3_32b_defconfig
-+++ b/configs/rpi_3_32b_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
-index 4c361438fa..3b2996a2f9 100644
--- a/configs/rpi_3_b_plus_defconfig
-+++ b/configs/rpi_3_b_plus_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
-index 9b281a4f15..1e9ee6122e 100644
--- a/configs/rpi_3_defconfig
-+++ b/configs/rpi_3_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
-index b5ad53c37b..223fc03275 100644
--- a/configs/rpi_defconfig
-+++ b/configs/rpi_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-- 
-2.26.2
-
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (u-boot-2021.01-rc4.tar.bz2) = 6de2c60d02276f4eed31b5baf2d8239ad0af30c9d341339a4cd7fa0786068cb5faa1ab8bd0b4155e536962e1a4869906f60f1d2a1e50b0ed15e98c2e84d6a97b
+SHA512 (u-boot-2018.03.tar.bz2) = adcf2446f33173bde48abd882e99e44b28f0ce88db803085def0160bbe3808d23ac383c57a6c9b0f2b724dd62d4b4bb18e44ec101d53928eafe889fc7b0547c7
--- a/sunxi-Add-fix-for-Pine64-gigabit-throughput-issues.patch
+++ b/sunxi-Add-fix-for-Pine64-gigabit-throughput-issues.patch
@ -0,0 +1,164 @@
+From patchwork Wed Feb 14 23:02:15 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,
+ 1/2] net: phy: Add PHY_RTL8211E_PINE64_GIGABIT_FIX for realtek phys
+X-Patchwork-Submitter: Kyle Evans <kevans@freebsd.org>
+X-Patchwork-Id: 873752
+Message-Id: <20180214230216.2001-2-kevans@FreeBSD.org>
+To: andre.przywara@arm.com, joe.hershberger@ni.com,
+ philipp.tomsich@theobroma-systems.com, alex.g@adaptrum.com,
+ hannes.schmelzer@br-automation.com, sbabic@denx.de,
+ jagan@amarulasolutions.com, narmstrong@baylibre.com,
+ tharvey@gateworks.com, 
+ york.sun@nxp.com, madalin.bucur@nxp.com, u-boot@lists.denx.de
+Date: Wed, 14 Feb 2018 17:02:15 -0600
+From: kevans@FreeBSD.org
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+Setting PHY_RTL8211E_PINE64_GIGABIT_FIX forces internal rx/tx delays off
+on the PHY, as well as flipping some magical undocumented bits. The
+magic number comes from the Pine64 engineering team, presumably as a
+proxy from Realtek. This configuration fixes the throughput on some
+Pine64 models. Packet loss of up to 60-70% has been observed without
+this.
+
+Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
+---
+ drivers/net/phy/Kconfig   | 10 ++++++++++
+ drivers/net/phy/realtek.c | 34 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
+index e32f1eb1c0..ad648a889d 100644
+--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
+@@ -114,6 +114,16 @@ config PHY_NATSEMI
+ config PHY_REALTEK
+ 	bool "Realtek Ethernet PHYs support"
+ 
+config RTL8211E_PINE64_GIGABIT_FIX
+	bool "Fix gigabit throughput on some Pine64+ models"
+	depends on PHY_REALTEK
+	help
+	  Configure the Realtek RTL8211E found on some Pine64+ models differently to
+	  fix throughput on Gigabit links, turning off all internal delays in the
+	  process. The settings that this touches are not documented in the CONFREG
+	  section of the RTL8211E datasheet, but come from Realtek by way of the
+	  Pine64 engineering team.
+
+ config RTL8211X_PHY_FORCE_MASTER
+ 	bool "Ethernet PHY RTL8211x: force 1000BASE-T master mode"
+ 	depends on PHY_REALTEK
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index 6d917f86f4..d5c2a46c67 100644
+--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
+@@ -13,6 +13,7 @@
+ #include <phy.h>
+ 
+ #define PHY_RTL8211x_FORCE_MASTER BIT(1)
+#define PHY_RTL8211E_PINE64_GIGABIT_FIX BIT(2)
+ 
+ #define PHY_AUTONEGOTIATE_TIMEOUT 5000
+ 
+@@ -47,6 +48,13 @@
+ #define MIIM_RTL8211F_PHYSTAT_SPDDONE  0x0800
+ #define MIIM_RTL8211F_PHYSTAT_LINK     0x0004
+ 
+#define MIIM_RTL8211E_CONFREG           0x1c
+#define MIIM_RTL8211E_CONFREG_TXD		0x0002
+#define MIIM_RTL8211E_CONFREG_RXD		0x0004
+#define MIIM_RTL8211E_CONFREG_MAGIC		0xb400	/* Undocumented */
+
+#define MIIM_RTL8211E_EXT_PAGE_SELECT  0x1e
+
+ #define MIIM_RTL8211F_PAGE_SELECT      0x1f
+ #define MIIM_RTL8211F_TX_DELAY		0x100
+ #define MIIM_RTL8211F_LCR		0x10
+@@ -60,6 +68,15 @@ static int rtl8211b_probe(struct phy_device *phydev)
+ 	return 0;
+ }
+ 
+static int rtl8211e_probe(struct phy_device *phydev)
+{
+#ifdef CONFIG_RTL8211E_PINE64_GIGABIT_FIX
+	phydev->flags |= PHY_RTL8211E_PINE64_GIGABIT_FIX;
+#endif
+
+	return 0;
+}
+
+ /* RealTek RTL8211x */
+ static int rtl8211x_config(struct phy_device *phydev)
+ {
+@@ -81,6 +98,22 @@ static int rtl8211x_config(struct phy_device *phydev)
+ 		reg |= MIIM_RTL8211x_CTRL1000T_MASTER;
+ 		phy_write(phydev, MDIO_DEVAD_NONE, MII_CTRL1000, reg);
+ 	}
+	if (phydev->flags & PHY_RTL8211E_PINE64_GIGABIT_FIX) {
+		unsigned int reg;
+
+		phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211F_PAGE_SELECT,
+			  7);
+		phy_write(phydev, MDIO_DEVAD_NONE,
+			  MIIM_RTL8211E_EXT_PAGE_SELECT, 0xa4);
+		reg = phy_read(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211E_CONFREG);
+		/* Ensure both internal delays are turned off */
+		reg &= ~(MIIM_RTL8211E_CONFREG_TXD | MIIM_RTL8211E_CONFREG_RXD);
+		/* Flip the magic undocumented bits */
+		reg |= MIIM_RTL8211E_CONFREG_MAGIC;
+		phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211E_CONFREG, reg);
+		phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211F_PAGE_SELECT,
+			  0);
+	}
+ 	/* read interrupt status just to clear it */
+ 	phy_read(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211x_PHY_INER);
+ 
+@@ -279,6 +312,7 @@ static struct phy_driver RTL8211E_driver = {
+ 	.uid = 0x1cc915,
+ 	.mask = 0xffffff,
+ 	.features = PHY_GBIT_FEATURES,
+	.probe = &rtl8211e_probe,
+ 	.config = &rtl8211x_config,
+ 	.startup = &rtl8211e_startup,
+ 	.shutdown = &genphy_shutdown,
+
+From patchwork Wed Feb 14 23:02:16 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,
+ 2/2] Configs: Use the newly added PHY_RTL8211E_PINE64_GIGABIT_FIX
+X-Patchwork-Submitter: Kyle Evans <kevans@freebsd.org>
+X-Patchwork-Id: 873751
+Message-Id: <20180214230216.2001-3-kevans@FreeBSD.org>
+To: andre.przywara@arm.com, joe.hershberger@ni.com,
+ philipp.tomsich@theobroma-systems.com, alex.g@adaptrum.com,
+ hannes.schmelzer@br-automation.com, sbabic@denx.de,
+ jagan@amarulasolutions.com, narmstrong@baylibre.com,
+ tharvey@gateworks.com, 
+ york.sun@nxp.com, madalin.bucur@nxp.com, u-boot@lists.denx.de
+Date: Wed, 14 Feb 2018 17:02:16 -0600
+From: kevans@FreeBSD.org
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+The Pine64+ uses a generic PHY driver, so flip it over to using the Realtek PHY
+driver to actually apply the RTL8211e fix.
+
+Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
+---
+ configs/pine64_plus_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig
+index 01ed23844b..149311f2c4 100644
+--- a/configs/pine64_plus_defconfig
+++ b/configs/pine64_plus_defconfig
+@@ -14,3 +14,5 @@ CONFIG_OF_LIST="sun50i-a64-pine64 sun50i-a64-pine64-plus"
+ CONFIG_SUN8I_EMAC=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_PHY_REALTEK=y
+CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y
--- a/sunxi-add-PineCube-board.patch
+++ b/sunxi-add-PineCube-board.patch
@ -1,222 +0,0 @@
-From patchwork Wed Nov 18 10:27:17 2020
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Icenowy Zheng <icenowy@aosc.io>
-X-Patchwork-Id: 1402159
-X-Patchwork-Delegate: andre.przywara@arm.com
-Return-Path: <u-boot-bounces@lists.denx.de>
-X-Original-To: incoming@patchwork.ozlabs.org
-Delivered-To: patchwork-incoming@bilbo.ozlabs.org
-Authentication-Results: ozlabs.org;
- spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
- (client-ip=85.214.62.61; helo=phobos.denx.de;
- envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)
-Authentication-Results: ozlabs.org;
- dmarc=none (p=none dis=none) header.from=aosc.io
-Authentication-Results: ozlabs.org;
-	dkim=fail reason="signature verification failed" (1024-bit key;
- unprotected) header.d=mymailcheap.com header.i=@mymailcheap.com
- header.a=rsa-sha256 header.s=default header.b=YYrkSpBD;
-	dkim=fail reason="signature verification failed" (1024-bit key;
- unprotected) header.d=aosc.io header.i=@aosc.io header.a=rsa-sha256
- header.s=default header.b=o7lHQ4SZ;
-	dkim-atps=neutral
-Received: from phobos.denx.de (phobos.denx.de [85.214.62.61])
-	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
-	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
-	(No client certificate requested)
-	by ozlabs.org (Postfix) with ESMTPS id 4CbfCp3G62z9s1l
-	for <incoming@patchwork.ozlabs.org>; Wed, 18 Nov 2020 21:28:22 +1100 (AEDT)
-Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
-	by phobos.denx.de (Postfix) with ESMTP id 00D6D82304;
-	Wed, 18 Nov 2020 11:28:16 +0100 (CET)
-Authentication-Results: phobos.denx.de;
- dmarc=none (p=none dis=none) header.from=aosc.io
-Authentication-Results: phobos.denx.de;
- spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
-Authentication-Results: phobos.denx.de;
-	dkim=fail reason="signature verification failed" (1024-bit key;
- unprotected) header.d=mymailcheap.com header.i=@mymailcheap.com
- header.b="YYrkSpBD";
-	dkim=fail reason="signature verification failed" (1024-bit key;
- unprotected) header.d=aosc.io header.i=@aosc.io header.b="o7lHQ4SZ";
-	dkim-atps=neutral
-Received: by phobos.denx.de (Postfix, from userid 109)
- id 2E5B282309; Wed, 18 Nov 2020 11:28:11 +0100 (CET)
-X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
-X-Spam-Level: 
-X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham
- autolearn_force=no version=3.4.2
-Received: from relay1.mymailcheap.com (relay1.mymailcheap.com
- [144.217.248.100])
- (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
- (No client certificate requested)
- by phobos.denx.de (Postfix) with ESMTPS id EC082808F1
- for <u-boot@lists.denx.de>; Wed, 18 Nov 2020 11:28:05 +0100 (CET)
-Authentication-Results: phobos.denx.de;
- dmarc=none (p=none dis=none) header.from=aosc.io
-Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=icenowy@aosc.io
-Received: from filter2.mymailcheap.com (filter2.mymailcheap.com
- [91.134.140.82])
- by relay1.mymailcheap.com (Postfix) with ESMTPS id 18A423F201;
- Wed, 18 Nov 2020 10:27:59 +0000 (UTC)
-Received: from localhost (localhost [127.0.0.1])
- by filter2.mymailcheap.com (Postfix) with ESMTP id 6377C2A7E9;
- Wed, 18 Nov 2020 11:27:58 +0100 (CET)
-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mymailcheap.com;
- s=default; t=1605695278;
- bh=vA5tPn4fjpXJj/OQnRg+m708mrodc5u5TJSDVOSBnHo=;
- h=From:To:Cc:Subject:Date:From;
- b=YYrkSpBDGdpkLi16yGwNw7yMTXXW566rTdXX2RSRxCe6FylY99qiYDmZR+PZFqCX0
- t3yDL0nO6zMKUvJVqZaTwsroyblAKNCaLz1AfCURNqCwohtJcIkDsegRYz9slzT9Qu
- BQkTT6dosAIQFtAVrc48QBX38eHXMYreqkbHXz5g=
-Received: from filter2.mymailcheap.com ([127.0.0.1])
- by localhost (filter2.mymailcheap.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id eCMZCx2FVDgE; Wed, 18 Nov 2020 11:27:57 +0100 (CET)
-Received: from mail20.mymailcheap.com (mail20.mymailcheap.com [51.83.111.147])
- (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))
- (No client certificate requested)
- by filter2.mymailcheap.com (Postfix) with ESMTPS;
- Wed, 18 Nov 2020 11:27:57 +0100 (CET)
-Received: from [213.133.102.83] (ml.mymailcheap.com [213.133.102.83])
- by mail20.mymailcheap.com (Postfix) with ESMTP id A597A400BE;
- Wed, 18 Nov 2020 10:27:56 +0000 (UTC)
-Authentication-Results: mail20.mymailcheap.com; dkim=pass (1024-bit key;
- unprotected) header.d=aosc.io header.i=@aosc.io header.b="o7lHQ4SZ";
- dkim-atps=neutral
-AI-Spam-Status: Not processed
-Received: from ice-e5v2.lan (unknown [59.41.160.51])
- (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
- key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest
- SHA256) (No client certificate requested)
- by mail20.mymailcheap.com (Postfix) with ESMTPSA id 3B979400BE;
- Wed, 18 Nov 2020 10:27:45 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=aosc.io; s=default;
- t=1605695270; bh=vA5tPn4fjpXJj/OQnRg+m708mrodc5u5TJSDVOSBnHo=;
- h=From:To:Cc:Subject:Date:From;
- b=o7lHQ4SZ+kcNlSGrF+USzZxRQhtIEcZFQPjvsiu+MiK+TTjArUzo5bRKHH0I4ZcDM
- a4Ywg6IcctT99QEZGbRIHqhvjH6/Kvj4lWM77Bb0DrlHXfEdOj3LC7KiAF1vVGFfPI
- 0oTEacf71O2OWPmQBqEH/uaV/IiGI4rZvgWiMPkk=
-From: Icenowy Zheng <icenowy@aosc.io>
-To: Jagan Teki <jagan@amarulasolutions.com>,
- Andre Przywara <andre.przywara@arm.com>,
- Hans de Goede <hdegoede@redhat.com>
-Cc: u-boot@lists.denx.de, linux-sunxi@googlegroups.com,
- Icenowy Zheng <icenowy@aosc.io>
-Subject: [PATCH v3] sunxi: add PineCube board
-Date: Wed, 18 Nov 2020 18:27:17 +0800
-Message-Id: <20201118102717.635129-1-icenowy@aosc.io>
-X-Mailer: git-send-email 2.28.0
-MIME-Version: 1.0
-X-Rspamd-Queue-Id: A597A400BE
-X-Spamd-Result: default: False [4.90 / 20.00]; RCVD_VIA_SMTP_AUTH(0.00)[];
- ARC_NA(0.00)[]; R_DKIM_ALLOW(0.00)[aosc.io:s=default];
- RECEIVED_SPAMHAUS_PBL(0.00)[59.41.160.51:received];
- FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[];
- R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[];
- MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[aosc.io];
- BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all];
- RCPT_COUNT_FIVE(0.00)[6]; ML_SERVERS(-3.10)[213.133.102.83];
- DKIM_TRACE(0.00)[aosc.io:+]; MID_CONTAINS_FROM(1.00)[];
- RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[];
- MIME_TRACE(0.00)[0:+];
- ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE];
- RCVD_COUNT_TWO(0.00)[2];
- HFILTER_HELO_BAREIP(3.00)[213.133.102.83,1]
-X-Rspamd-Server: mail20.mymailcheap.com
-X-BeenThere: u-boot@lists.denx.de
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: U-Boot discussion <u-boot.lists.denx.de>
-List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
- <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
-List-Archive: <https://lists.denx.de/pipermail/u-boot/>
-List-Post: <mailto:u-boot@lists.denx.de>
-List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
-List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
- <mailto:u-boot-request@lists.denx.de?subject=subscribe>
-Errors-To: u-boot-bounces@lists.denx.de
-Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
-X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de
-X-Virus-Status: Clean
-
-PineCube is an IP camera development kit released by Pine64.
-
-It comes with the following compoents:
-
- A mainboard with Sochip S3 SoC, a 16MByte SPI Flash, AXP209 PMIC,
-a power-only microUSB connector, a USB Type-A connector, a 10/100Mbps
-Ethernet port and FPC connectors for camera and daughter board.
- An OV5640-based camera module which is connected to the parallel CSI
-bus of the mainboard.
- A daughterboard with several buttons, a SD slot, some IR LEDs, a
-microphone and a speaker connector.
-
-As the device tree is synchronized in a previous commit, just add it to
-Makefile, create a new MAINTAINER item and provide a defconfig.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
-Reviewed-by: Andre Przywara <andre.przywara@arm.com>
---
-Changes since v2:
- Add Makefile reference to DT.
-Changes since v1:
- Dropped LDO3 quirk.
-
- arch/arm/dts/Makefile      |  1 +
- board/sunxi/MAINTAINERS    |  5 +++++
- configs/pinecube_defconfig | 15 +++++++++++++++
- 3 files changed, 21 insertions(+)
- create mode 100644 configs/pinecube_defconfig
-
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 7d1a369845..e6993733b0 100644
--- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -587,6 +587,7 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \
- 	sun8i-r40-bananapi-m2-ultra.dtb \
- 	sun8i-v40-bananapi-m2-berry.dtb
- dtb-$(CONFIG_MACH_SUN8I_V3S) += \
-+	sun8i-s3-pinecube.dtb \
- 	sun8i-v3s-licheepi-zero.dtb
- dtb-$(CONFIG_MACH_SUN50I_H5) += \
- 	sun50i-h5-bananapi-m2-plus.dtb \
-diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
-index d3755ae41a..735801ae1d 100644
--- a/board/sunxi/MAINTAINERS
-+++ b/board/sunxi/MAINTAINERS
-@@ -440,6 +440,11 @@ M:	Vasily Khoruzhick <anarsoul@gmail.com>
- S:	Maintained
- F:	configs/pinebook_defconfig
- 
-+PINECUBE BOARD:
-+M:	Icenowy Zheng <icenowy@aosc.io>
-+S:	Maintained
-+F:	configs/pinecube_defconfig
-+
- PINE64 BOARDS
- M:	Andre Przywara <andre.przywara@arm.com>
- S:	Maintained
-diff --git a/configs/pinecube_defconfig b/configs/pinecube_defconfig
-new file mode 100644
-index 0000000000..a8c404f6b1
--- /dev/null
-+++ b/configs/pinecube_defconfig
-@@ -0,0 +1,15 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_SPL=y
-+CONFIG_MACH_SUN8I_V3S=y
-+CONFIG_SUNXI_DRAM_DDR3_1333=y
-+CONFIG_DRAM_CLK=504
-+CONFIG_DRAM_ODT_EN=y
-+CONFIG_I2C0_ENABLE=y
-+CONFIG_DEFAULT_DEVICE_TREE="sun8i-s3-pinecube"
-+CONFIG_SPL_I2C_SUPPORT=y
-+# CONFIG_NETDEVICES is not set
-+CONFIG_AXP209_POWER=y
-+CONFIG_AXP_DCDC2_VOLT=1250
-+CONFIG_AXP_DCDC3_VOLT=3300
-+CONFIG_CONS_INDEX=3
--- a/sunxi-fix-eMMC-stability-issues-on-A64.patch
+++ b/sunxi-fix-eMMC-stability-issues-on-A64.patch
@ -0,0 +1,118 @@
+From patchwork Sat Apr 28 21:16:27 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,1/2] sunxi-mmc: use new mode on A64
+X-Patchwork-Submitter: Vasily Khoruzhick <anarsoul@gmail.com>
+X-Patchwork-Id: 906216
+Message-Id: <20180428211628.13753-2-anarsoul@gmail.com>
+To: Jagan Teki <jagan@openedev.com>,
+ Maxime Ripard <maxime.ripard@bootlin.com>, 
+ Albert Aribaud <albert.u.boot@aribaud.net>,
+ Jaehoon Chung <jh80.chung@samsung.com>, u-boot@lists.denx.de
+Date: Sat, 28 Apr 2018 14:16:27 -0700
+From: Vasily Khoruzhick <anarsoul@gmail.com>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+That is necessary for using automatic calibration on A64 eMMC.
+
+Signed-off-by: Vasily khoruzhick <anarsoul@gmail.com>
+---
+ arch/arm/mach-sunxi/Kconfig | 1 +
+ drivers/mmc/sunxi_mmc.c     | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
+index b868f0e350..774a39f580 100644
+--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
+@@ -256,6 +256,7 @@ config MACH_SUN50I
+ 	select SUNXI_DE2
+ 	select SUNXI_GEN_SUN6I
+ 	select SUNXI_HIGH_SRAM
+	select MMC_SUNXI_HAS_NEW_MODE
+ 	select SUPPORT_SPL
+ 	select SUNXI_DRAM_DW
+ 	select SUNXI_DRAM_DW_32BIT
+diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
+index df6f32850e..06b0fd491c 100644
+--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
+@@ -167,8 +167,12 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)
+ 
+ 	if (new_mode) {
+ #ifdef CONFIG_MMC_SUNXI_HAS_NEW_MODE
+#ifdef CONFIG_MACH_SUN50I
+		val = 0;
+#else
+ 		val = CCM_MMC_CTRL_MODE_SEL_NEW;
+ 		setbits_le32(&priv->reg->ntsr, SUNXI_MMC_NTSR_MODE_SEL_NEW);
+#endif
+ #endif
+ 	} else {
+ 		val = CCM_MMC_CTRL_OCLK_DLY(oclk_dly) |
+
+From patchwork Sat Apr 28 21:16:28 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot,2/2] mmc: sunxi: run calibration on A64
+X-Patchwork-Submitter: Vasily Khoruzhick <anarsoul@gmail.com>
+X-Patchwork-Id: 906217
+Message-Id: <20180428211628.13753-3-anarsoul@gmail.com>
+To: Jagan Teki <jagan@openedev.com>,
+ Maxime Ripard <maxime.ripard@bootlin.com>, 
+ Albert Aribaud <albert.u.boot@aribaud.net>,
+ Jaehoon Chung <jh80.chung@samsung.com>, u-boot@lists.denx.de
+Date: Sat, 28 Apr 2018 14:16:28 -0700
+From: Vasily Khoruzhick <anarsoul@gmail.com>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+Along with using new mode it fixes eMMC instability on Pinebook
+
+Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
+---
+ arch/arm/include/asm/arch-sunxi/mmc.h | 6 +++++-
+ drivers/mmc/sunxi_mmc.c               | 6 ++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h b/arch/arm/include/asm/arch-sunxi/mmc.h
+index 69f737f3bf..8575b393e5 100644
+--- a/arch/arm/include/asm/arch-sunxi/mmc.h
+++ b/arch/arm/include/asm/arch-sunxi/mmc.h
+@@ -47,7 +47,9 @@ struct sunxi_mmc {
+ 	u32 cbda;		/* 0x94 */
+ 	u32 res2[26];
+ #ifdef CONFIG_SUNXI_GEN_SUN6I
+-	u32 res3[64];
+	u32 res3[17];
+	u32 samp_dl;
+	u32 res4[46];
+ #endif
+ 	u32 fifo;		/* 0x100 / 0x200 FIFO access address */
+ };
+@@ -131,5 +133,7 @@ struct sunxi_mmc {
+ #define SUNXI_MMC_COMMON_CLK_GATE		(1 << 16)
+ #define SUNXI_MMC_COMMON_RESET			(1 << 18)
+ 
+#define SUNXI_MMC_CAL_DL_SW_EN		(0x1 << 7)
+
+ struct mmc *sunxi_mmc_init(int sdc_no);
+ #endif /* _SUNXI_MMC_H */
+diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
+index 06b0fd491c..9e7c42c571 100644
+--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
+@@ -227,6 +227,12 @@ static int mmc_config_clock(struct sunxi_mmc_priv *priv, struct mmc *mmc)
+ 	rval &= ~SUNXI_MMC_CLK_DIVIDER_MASK;
+ 	writel(rval, &priv->reg->clkcr);
+ 
+#ifdef CONFIG_MACH_SUN50I
+	/* Run calibration on A64 */
+	if (priv->mmc_no == 2)
+		writel(SUNXI_MMC_CAL_DL_SW_EN, &priv->reg->samp_dl);
+#endif
+
+ 	/* Re-enable Clock */
+ 	rval |= SUNXI_MMC_CLK_ENABLE;
+ 	writel(rval, &priv->reg->clkcr);
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@ -1,60 +1,53 @@
-%global candidate rc4
+#global candidate rc4

-Name:     uboot-tools
-Version:  2021.01
-Release:  0.4%{?candidate:.%{candidate}}%{?dist}
-Summary:  U-Boot utilities
-License:  GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
-URL:      http://www.denx.de/wiki/U-Boot
+Name:      uboot-tools
+Version:   2018.03
+Release:   6%{?candidate:.%{candidate}}%{?dist}
+Summary:   U-Boot utilities
+License:   GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
+URL:       http://www.denx.de/wiki/U-Boot

-Source0:  ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
-Source1:  arm-boards
-Source2:  arm-chromebooks
-Source3:  aarch64-boards
-Source4:  aarch64-chromebooks
+Source0:   ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
+Source1:   arm-boards
+Source2:   arm-chromebooks
+Source3:   aarch64-boards
+Source4:   aarch64-chromebooks
+Source5:   10-devicetree.install

 # Fedoraisms patches
-# Needed to find DT on boot partition that's not the first partition
-Patch1:   uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
-# Needed due to issues with shim
-Patch2:   uefi-use-Fedora-specific-path-name.patch
-# RPi - uses RPI firmware device tree for HAT support
-Patch3:   rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
-# Ajust the U-Boot offsets in SPL to take less space
-#Patch4:   rockchip-spl-u-boot-itb-offset.patch
+Patch1:    uefi-use-Fedora-specific-path-name.patch
+
+# general fixes
+Patch2:    uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
+Patch3:    usb-kbd-fixes.patch
+Patch4:    rk33xx-make_fit_atf-fix.patch
+Patch5:    rk33xx-enable-make-itb.patch
+Patch6:    net-Only-access-network-devices-after-init.patch
+Patch7:    uefi-fixes.patch
+Patch8:    uefi-efi_loader-Fix-GOP-32bpp-exposure.patch

 # Board fixes and enablement
-Patch5:   Raspberry-Pi-400-Compute-Module-4-support.patch
-Patch6:   rng-Add-iProc-RNG200-driver.patch
-# AllWinner improvements
-Patch10:  AllWinner-PineTab.patch
-Patch11:  sunxi-add-PineCube-board.patch
-Patch12:  0001-Fixes-for-AllWinner-ethernet-network-interfaces.patch
-# TI fixes
-Patch13:  0001-Fix-BeagleAI-detection.patch
-# Rockchips improvements
-Patch14:  arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch
-Patch15:  rk3399-Pinebook-pro-EDP-support.patch
+Patch10:   dragonboard-fixes.patch
+Patch11:   BeagleBoard.org-PocketBeagle.patch
+Patch12:   mx6cuboxi-add-support-for-detecting-Revision-1.5-SoM.patch
+Patch13:   rpi-3-plus-support.patch
+Patch14:   rpi-Adjust-fdt_addr_r-to-a-sane-address.patch
+Patch15:   dwc2-USB-controller-hangs-with-lan78xx.patch
+Patch16:   mmc-use-core-clock-frequency-in-bcm2835-sdhost.patch
+Patch17:   mmc-mv_sdhci-zero-out-sdhci_host-structure.patch
+Patch18:   mvneta-support-setting-hardware-address.patch
+Patch19:   sunxi-Add-fix-for-Pine64-gigabit-throughput-issues.patch
+Patch20:   sunxi-fix-eMMC-stability-issues-on-A64.patch

 BuildRequires:  bc
 BuildRequires:  dtc
-BuildRequires:  make
-# Requirements for building on el7
-%if 0%{?rhel} == 7
-BuildRequires:  devtoolset-7-build
-BuildRequires:  devtoolset-7-binutils
-BuildRequires:  devtoolset-7-gcc
+BuildRequires:  gcc make
+BuildRequires:  git-core
+BuildRequires:  openssl-devel
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-libfdt
-%else
-BuildRequires:  gcc
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-libfdt
-%endif
-BuildRequires:  flex bison
-BuildRequires:  openssl-devel
+BuildRequires:  python2-pyelftools
 BuildRequires:  SDL-devel
 BuildRequires:  swig
 %ifarch %{arm} aarch64
@ -63,7 +56,9 @@ BuildRequires:  vboot-utils
 %ifarch aarch64
 BuildRequires:  arm-trusted-firmware-armv8
 %endif
+
 Requires:       dtc
+Requires:       systemd

 %description
 This package contains a few U-Boot utilities - mkimage for creating boot images
@ -71,70 +66,84 @@ and fw_printenv/fw_setenv for manipulating the boot environment variables.

 %ifarch aarch64
 %package     -n uboot-images-armv8
-Summary:     U-Boot firmware images for aarch64 boards
+Summary:     u-boot bootloader images for aarch64 boards
+Requires:    uboot-tools
 BuildArch:   noarch

 %description -n uboot-images-armv8
-U-Boot firmware binaries for aarch64 boards
+u-boot bootloader binaries for aarch64 boards
 %endif

 %ifarch %{arm}
 %package     -n uboot-images-armv7
-Summary:     U-Boot firmware images for armv7 boards
+Summary:     u-boot bootloader images for armv7 boards
+Requires:    uboot-tools
 BuildArch:   noarch

 %description -n uboot-images-armv7
-U-Boot firmware binaries for armv7 boards
+u-boot bootloader binaries for armv7 boards
+%endif
+
+%ifarch %{arm} aarch64
+%package     -n uboot-images-elf
+Summary:     u-boot bootloader images for armv7 boards
+Requires:    uboot-tools
+Obsoletes:   uboot-images-qemu
+Provides:    uboot-images-qemu
+
+%description -n uboot-images-elf
+u-boot bootloader ELF binaries for use with qemu and other platforms
 %endif

 %prep
-%autosetup -p1 -n u-boot-%{version}%{?candidate:-%{candidate}}
+%setup -q -n u-boot-%{version}%{?candidate:-%{candidate}}
+
+git init
+git config --global gc.auto 0
+git config user.email "noone@example.com" 
+git config user.name "no one" 
+git add . 
+git commit -a -q -m "%{version} baseline" 
+git am %{patches} </dev/null 
+git config --unset user.email 
+git config --unset user.name 
+rm -rf .git

 cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 .

 %build
 mkdir builds

-%if 0%{?rhel} == 7
-#Enabling DTS for .el7
-%{?enable_devtoolset7:%{enable_devtoolset7}}
-%endif
-
 %ifarch aarch64 %{arm}
 for board in $(cat %{_arch}-boards)
 do
  echo "Building board: $board"
  mkdir builds/$(echo $board)/
  # ATF selection, needs improving, suggestions of ATF SoC to Board matrix welcome
-  sun50i=(a64-olinuxino amarula_a64_relic bananapi_m2_plus_h5 bananapi_m64 libretech_all_h3_cc_h5 nanopi_a64 nanopi_neo2 nanopi_neo_plus2 orangepi_pc2 orangepi_prime orangepi_win orangepi_zero_plus orangepi_zero_plus2 pine64-lts pine64_plus pinebook pinephone pinetab sopine_baseboard teres_i)
+  sun50i=(pine64_plus a64-olinuxino bananapi_m64 nanopi_a64 nanopi_neo2 orangepi_pc2 orangepi_prime orangepi_win orangepi_zero_plus2 sopine_baseboard)
  if [[ " ${sun50i[*]} " == *" $board "* ]]; then
-    echo "Board: $board using sun50i_a64"
-    cp /usr/share/arm-trusted-firmware/sun50i_a64/* builds/$(echo $board)/
+    echo "Board: $board using sun50iw1p1"
+    cp /usr/share/arm-trusted-firmware/sun50iw1p1/* builds/$(echo $board)/
  fi
-  sun50h6=(orangepi_lite2 orangepi_one_plus pine_h64)
-  if [[ " ${sun50h6[*]} " == *" $board "* ]]; then
-    echo "Board: $board using sun50i_h6"
-    cp /usr/share/arm-trusted-firmware/sun50i_h6/* builds/$(echo $board)/
-  fi
-  rk3328=(evb-rk3328 rock64-rk3328 rock-pi-e-rk3328 roc-cc-rk3328)
-  if [[ " ${rk3328[*]} " == *" $board "* ]]; then
-    echo "Board: $board using rk3328"
-    cp /usr/share/arm-trusted-firmware/rk3328/* builds/$(echo $board)/
-  fi
-  rk3399=(evb-rk3399 ficus-rk3399 firefly-rk3399 khadas-edge-captain-rk3399 khadas-edge-rk3399 khadas-edge-v-rk3399 nanopc-t4-rk3399 nanopi-m4-2gb-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 orangepi-rk3399 pinebook-pro-rk3399 puma-rk3399 rock960-rk3399 rock-pi-4c-rk3399 rock-pi-4-rk3399 rock-pi-n10-rk3399pro rockpro64-rk3399 roc-pc-mezzanine-rk3399 roc-pc-rk3399)
+  rk3399=(evb-rk3399 firefly-rk3399)
  if [[ " ${rk3399[*]} " == *" $board "* ]]; then
    echo "Board: $board using rk3399"
    cp /usr/share/arm-trusted-firmware/rk3399/* builds/$(echo $board)/
  fi
  # End ATF
  make $(echo $board)_defconfig O=builds/$(echo $board)/
-  %make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" O=builds/$(echo $board)/
+  make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/$(echo $board)/
+  rk33xx=(evb-rk3399 firefly-rk3399)
+  if [[ " ${rk33xx[*]} " == *" $board "* ]]; then
+    echo "Board: $board using rk33xx"
+    make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" u-boot.itb V=1 O=builds/$(echo $board)/
+  fi
 done

 %endif

-%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" tools-only_defconfig O=builds/
-%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" tools-all O=builds/
+make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" defconfig V=1 O=builds/
+make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" tools-all V=1 O=builds/

 %install
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@ -146,7 +155,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/
 for board in $(cat %{_arch}-boards)
 do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
- for file in u-boot.bin u-boot.dtb u-boot.img u-boot-dtb.img u-boot.itb u-boot-sunxi-with-spl.bin u-boot-rockchip.bin idbloader.img spl/boot.bin spl/sunxi-spl.bin
+ for file in spl/*spl.bin u-boot.bin u-boot.dtb u-boot-dtb.img u-boot.img u-boot.itb spl/sunxi-spl.bin
 do
  if [ -f builds/$(echo $board)/$(echo $file) ]; then
    install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
@ -159,7 +168,7 @@ done
 for board in $(cat %{_arch}-boards)
 do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
- for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/*spl.bin u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx u-boot-spl.kwb u-boot-rockchip.bin u-boot-sunxi-with-spl.bin spl/boot.bin
+ for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/smdkv310-spl.bin spl/*spl.bin u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx u-boot-nodtb-tegra.bin u-boot-spl.kwb u-boot-sunxi-with-spl.bin
 do
  if [ -f builds/$(echo $board)/$(echo $file) ]; then
    install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
@ -186,7 +195,47 @@ do
 done
 %endif

-for tool in bmp_logo dumpimage env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr gen_ethaddr_crc img2srec mkenvimage mkimage mksunxiboot ncb proftool sunxi-spl-image-builder ubsha1 xway-swap-bytes
+%ifarch aarch64
+for board in $(cat %{_arch}-boards)
+do
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
+ for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/smdkv310-spl.bin u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx u-boot-nodtb-tegra.bin u-boot-spl.kwb u-boot-sunxi-with-spl.bin
+ do
+  if [ -f builds/$(echo $board)/$(echo $file) ]; then
+    install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
+  fi
+ done
+done
+%endif
+
+# ELF binaries
+%ifarch %{arm}
+for board in vexpress_ca15_tc2 vexpress_ca9x4
+do
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
+ for file in u-boot
+ do
+  if [ -f builds/$(echo $board)/$(echo $file) ]; then
+    install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
+  fi
+ done
+done
+%endif
+
+%ifarch aarch64
+for board in $(cat %{_arch}-boards)
+do
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
+ for file in u-boot
+ do
+  if [ -f builds/$(echo $board)/$(echo $file) ]; then
+    install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
+  fi
+ done
+done
+%endif
+
+for tool in bmp_logo dumpimage easylogo/easylogo env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr gen_ethaddr_crc img2srec mkenvimage mkimage mksunxiboot ncb proftool sunxi-spl-image-builder ubsha1 xway-swap-bytes
 do
 install -p -m 0755 builds/tools/$tool $RPM_BUILD_ROOT%{_bindir}
 done
@ -197,8 +246,13 @@ install -p -m 0755 builds/tools/env/fw_printenv $RPM_BUILD_ROOT%{_bindir}

 install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}

+# systemd kernel-install script for device tree
+mkdir -p $RPM_BUILD_ROOT/lib/kernel/install.d/
+install -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/lib/kernel/install.d/
+
 # Copy sone useful docs over
 mkdir -p builds/docs
+cp -p board/amlogic/odroid-c2/README builds/docs/README.odroid-c2
 cp -p board/hisilicon/hikey/README builds/docs/README.hikey
 cp -p board/hisilicon/hikey/README builds/docs/README.hikey
 cp -p board/Marvell/db-88f6820-gp/README builds/docs/README.mvebu-db-88f6820
@ -215,135 +269,132 @@ cp -p board/warp/README builds/docs/README.warp
 cp -p board/warp7/README builds/docs/README.warp7

 %files
-%doc README doc/README.kwbimage doc/README.distro doc/README.gpt
-%doc doc/README.odroid doc/README.rockchip doc/uefi doc/uImage.FIT doc/arch/arm64.rst
+%doc README doc/README.imximage doc/README.kwbimage doc/README.distro doc/README.gpt
+%doc doc/README.odroid doc/README.rockchip doc/README.efi doc/uImage.FIT doc/README.arm64
 %doc doc/README.chromium builds/docs/*
-%doc doc/board/amlogic/ doc/board/rockchip/
 %{_bindir}/*
 %{_mandir}/man1/mkimage.1*
+/lib/kernel/install.d/10-devicetree.install
 %dir %{_datadir}/uboot/
 %config(noreplace) %{_sysconfdir}/fw_env.config

 %ifarch aarch64
 %files -n uboot-images-armv8
 %{_datadir}/uboot/*
+%exclude %{_datadir}/uboot/elf
 %endif

 %ifarch %{arm}
 %files -n uboot-images-armv7
 %{_datadir}/uboot/*
+%exclude %{_datadir}/uboot/elf
+%endif
+
+%ifarch %{arm} aarch64
+%files -n uboot-images-elf
+%{_datadir}/uboot/elf
 %endif

 %changelog
-* Sun Dec 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.4.rc4
- Update to 2021.01 RC4
- Latest RPi-400/CM4 support patch
+* Tue Jun 19 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-6
+- Patch to improve MMC on AllWinner A64 SoCs
+- Patch to fix RPi3B+ network errors (rhbz 1573261)
+- Fix incorrect colours in uEFI console in Linux

-* Tue Dec 15 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.3.rc3
- Update to 2021.01 RC3
- Latest RPi-400/CM4 support patch
- Re-enable previously disabled device support
+* Sun Apr 15 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-5
+- Raspberry Pi fixes
+- Enable a few AllWinner Tablets

-* Mon Dec 14 2020 Javier Martinez Canillas <javierm@redhat.com> - 2021.01-0.2.rc2
- Fix a "scan_dev_for_efi" not defined error
+* Fri Apr  6 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-4
+- Improvements for Raspberry Pi, AllWinner MMC perf, mvebu devices

-* Sun Nov 22 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.1.rc2
- Update to 2021.01 RC2
- Latest Pinebook Pro display patches
- Initial RPi-400 support patch
- Update Fedora specific patches
+* Tue Mar 20 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-3
+- Fix issue with certain MMC cards on Raspberry Pi

-* Sun Nov  8 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-3
- Fix SPI on Rockchip devices
- Latest Pinebook Pro display patches
- Fix Keyboard and USB-A ports on Pinebook Pro
+* Fri Mar 16 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-2
+- Add support for Raspberry Pi 3+

-* Wed Oct 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-2
- Fix kernel installs for non EBBR systems
- Fix for wired networks on some Allwinner devices
+* Tue Mar 13 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-1
+- 2018.03 GA

-* Tue Oct 06 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-1
- Update to 2020.10
+* Fri Mar  9 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.11.rc4
+- Enable support for Jetson TX2

-* Sun Sep 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.6.rc5
- Initial support for display output on Pinebook Pro
+* Thu Mar  8 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.10.rc4
+- Fix for Raspberry Pi 2 boot

-* Tue Sep 22 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.5.rc5
- Update to 2020.10 RC5
+* Wed Mar  7 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.9.rc4
+- 2018.03 RC4
+- Fixes for Raspberry Pi 3 boot
+- Minor kernel install fixes
+- Enable am335x_evm_usbspl for Beagle Pocket
+- DragonBoard patch rebase

-* Wed Sep 09 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.4.rc4
- Update to 2020.10 RC4
+* Sun Mar  4 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.8.rc3
+- Add support for SoM rev 1.5 to mx6cuboxi
+- Rebuild for new ATF 1.5 rc0 release

-* Wed Aug 19 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.3.rc2
- Enable a number of new Rockchip devices
+* Sun Feb 25 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.7.rc3
+- Build 64 bit Rockchips FIT images with ARM Trusted Firmware

-* Mon Aug 10 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.2.rc2
- Update to 2020.10 RC2
+* Tue Feb 20 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.6.rc3
+- 2018.03 RC3

-* Tue Jul 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.1.rc1
- 2020.10 RC1
+* Fri Feb 16 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.5.rc2
+- A few upstream fixes

-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2020.07-2
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+* Thu Feb 15 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.4.rc2
+- Fix for GBps network on some AllWinner devices

-* Mon Jul 06 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-1
- 2020.07 GA
+* Tue Feb 13 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.3.rc2
+- 2018.03 RC2

-* Tue Jun 23 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.5.rc5
- 2020.07 RC5
+* Wed Feb  7 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.2.rc1
+- Update uEFI patches

-* Thu Jun 18 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.4.rc4
- Update various patches to latest upstream
+* Tue Jan 30 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.1.rc1
+- 2018.03 RC1

-* Wed Jun 10 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.3.rc4
- 2020.07 RC4
- Minor updates and other fixes
+* Tue Jan  9 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.01-1
+- 2018.01

-* Tue May 12 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.2.rc2
- 2020.07 RC2
- Minor device updates
+* Tue Jan  2 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.01-0.2.rc3
+- 2018.01 RC3

-* Wed Apr 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.1.rc1
- 2020.07 RC1
+* Tue Dec 19 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2018.01-0.1.rc2
+- 2018.01 RC2

-* Tue Apr 21 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-4
- Initial support for USB on Rasperry Pi 4
+* Thu Nov 23 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.11-3
+- Newer EFI loader fix patch
+- Fix static MAC on omap3/omap4 devices

-* Tue Apr 21 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-3
- Ship u-boot-rockchip.bin for SPI flash
+* Tue Nov 21 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.11-2
+- Add EFI loader fix

-* Mon Apr 20 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-2
- Fix ATF for new aarch64 devices
- Fix Wandboard board detection (rhbz 1825247)
- Fix mSD card on RockPro64
- Enable (inital) Pinebook Pro
+* Wed Nov 15 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.11-1
+- 2017.11

-* Tue Apr 14 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-1
- 2020.04
+* Tue Nov  7 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.11-0.4.rc4
+- 2017.11 RC4

-* Tue Apr  7 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.7-rc5
- 2020.04 RC5
+* Sat Nov  4 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.11-0.3.rc3
+- 2017.11 RC3

-* Tue Mar 31 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.6-rc4
- 2020.04 RC4
- Updates for NVIDIA Jetson platforms
- Support RNG for random seed for KASLR on some Rockchip devices
+* Tue Oct 17 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.11-0.2.rc2
+- Update / rebase a couple of patches

-* Thu Mar 26 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.5-rc3
- Fix ext4 alignment issue seen on some NXP i.MX devices
+* Tue Oct 17 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.11-0.1.rc2
+- 2017.11 RC2

-* Wed Feb 26 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.4-rc3
- 2020.04 RC3
+* Tue Oct 10 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.09-4
+- Improve uEFI partition detection for some devices

-* Thu Feb 13 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.3-rc2
- 2020.04 RC2
+* Thu Oct  5 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.09-3
+- Fix regression in i.MX6 and omap4 devices
+- Improve DT detection support on aarch64
+- uEFI fixes and improvements
+- ENable Sinovoip BPI devices

-* Sun Feb  2 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.2-rc1
- Update genet NIC driver
-
-* Wed Jan 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.1-rc1
- 2020.04 RC1
-
-* Tue Jan  7 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.01-1
- 2020.01
+* Wed Sep 27 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.09-2
+- Add patch to fix some uEFI console output
+- Minor other tweaks
--- a/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
+++ b/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
@ -1,7 +1,7 @@
-From cc3700b5c65494547308df395fe63166ff48a1e3 Mon Sep 17 00:00:00 2001
+From 8bc6f62541436ebaf87133792726d9b48f878d09 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
-Date: Tue, 24 Nov 2020 10:35:48 +0000
-Subject: [PATCH 1/2] distro: load FDT from any partition on boot device
+Date: Tue, 5 Dec 2017 00:11:08 +0000
+Subject: [PATCH] distro: load FDT from any partition on boot device

 In the EFI_LOADER boot path, we were only checking the FAT partition
 containing the EFI payload for dtb files.  But this is somewhat of a
@ -22,17 +22,19 @@ knows) and SoC/board specific ${fdtfile} (which grub does not know).
 Signed-off-by: Rob Clark <robdclark@gmail.com>
 Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
- include/config_distro_bootcmd.h | 33 +++++++++++++++++++++++----------
- 1 file changed, 23 insertions(+), 10 deletions(-)
+ include/config_distro_bootcmd.h | 34 +++++++++++++++++++++++-----------
+ 1 file changed, 23 insertions(+), 11 deletions(-)

 diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-index ff29ef5a905..769477cd80e 100644
+index 7746366ec8..c87f7c2a42 100644
 --- a/include/config_distro_bootcmd.h
 +++ b/include/config_distro_bootcmd.h
-@@ -142,24 +142,37 @@
+@@ -135,25 +135,37 @@
+ 		"fi\0"                                                    \
+ 	\
 	"load_efi_dtb="                                                   \
- 		"load ${devtype} ${devnum}:${distro_bootpart} "           \
- 			"${fdt_addr_r} ${prefix}${efi_fdtfile}\0"         \
+-		"load ${devtype} ${devnum}:${distro_bootpart} "           \
+-			"${fdt_addr_r} ${prefix}${efi_fdtfile}\0"         \
 +		"load ${devtype} ${devnum}:${dtb_devp} "                  \
 +			"${fdt_addr_r} ${prefix}${efi_fdtfile} && "       \
 +		"run boot_efi_binary\0"                                   \
@ -49,7 +51,6 @@ index ff29ef5a905..769477cd80e 100644
 -				"run load_efi_dtb; "                      \
 -			"fi;"                                             \
 -		"done;"                                                   \
-		"run boot_efi_bootmgr;"                                   \
 +		"part list ${devtype} ${devnum} dtb_devplist; "           \
 +		"env exists dtb_devplist || setenv dtb_devplist "         \
 +			"${distro_bootpart}; "                            \
@ -66,17 +67,17 @@ index ff29ef5a905..769477cd80e 100644
 +				"fi;"                                     \
 +			"done; "                                          \
 +		"done; "                                                  \
-+		"run boot_efi_bootmgr\0"                                  \
+		"run boot_efi_binary\0"                                   \
 +	"scan_dev_for_efi="                                               \
 		"if test -e ${devtype} ${devnum}:${distro_bootpart} "     \
- 					"efi/boot/"BOOTEFI_NAME"; then "  \
+ 					"efi/fedora/"BOOTEFI_NAME"; then "  \
 				"echo Found EFI removable media binary "  \
- 					"efi/boot/"BOOTEFI_NAME"; "       \
+ 					"efi/fedora/"BOOTEFI_NAME"; "       \
 -				"run boot_efi_binary; "                   \
 +				"run scan_dev_for_dtb; "                  \
 				"echo EFI LOAD FAILED: continuing...; "   \
 		"fi; "                                                    \
 		"setenv efi_fdtfile\0"
 -- 
-2.29.2
+2.14.3

--- a/uefi-efi_loader-Fix-GOP-32bpp-exposure.patch
+++ b/uefi-efi_loader-Fix-GOP-32bpp-exposure.patch
@ -0,0 +1,37 @@
+From patchwork Tue Jun 19 11:47:01 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot] efi_loader: Fix GOP 32bpp exposure
+X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
+X-Patchwork-Id: 931555
+Message-Id: <20180619114701.87820-1-agraf@suse.de>
+To: u-boot@lists.denx.de
+Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>, Fabian Vogt <fvogt@suse.com>
+Date: Tue, 19 Jun 2018 13:47:01 +0200
+From: Alexander Graf <agraf@suse.de>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+We store pixels as BGRA in memory, as can be seen from struct efi_gop_pixel.
+So we need to expose the same format to UEFI payloads to actually have them
+use the correct colors.
+
+Reported-by: Fabian Vogt <fvogt@suse.com>
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ lib/efi_loader/efi_gop.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
+index 1afe8418e1..3a36bbcbfa 100644
+--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
+@@ -472,7 +472,7 @@ efi_status_t efi_gop_register(void)
+ 	gopobj->info.version = 0;
+ 	gopobj->info.width = col;
+ 	gopobj->info.height = row;
+-	gopobj->info.pixel_format = EFI_GOT_RGBA8;
+	gopobj->info.pixel_format = EFI_GOT_BGRA8;
+ 	gopobj->info.pixels_per_scanline = col;
+ 
+ 	gopobj->bpix = bpix;
--- a/uefi-fixes.patch
+++ b/uefi-fixes.patch
@ -0,0 +1,84 @@
+From patchwork Thu Mar 15 16:33:38 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot] efi_loader: Fix network DP with DM_ETH
+X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
+X-Patchwork-Id: 886355
+Message-Id: <20180315163338.77456-1-agraf@suse.de>
+To: u-boot@lists.denx.de
+Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
+Date: Thu, 15 Mar 2018 17:33:38 +0100
+From: Alexander Graf <agraf@suse.de>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+When CONFIG_DM_ETH is set, we assemble the device path properly with a
+full device hierarchy. Our helper function dp_fill() even put the MAC
+node itself in it for us.
+
+However, for non-DM compatibility we also have code in that added the
+MAC node manually. That code now runs on top of the existing MAC node:
+
+  Handle 0x3db2f6b0
+    /HardwareVendor(e61d73b9-a384-4acc-aeab-82e828f3628b)[0: ]
+    /USBClass(0,0,9,0,0)/USBClass(424,9514,9,0,2)/MacAddr(b8:27:eb:e1:81:47,1)
+    /MacAddr(b8:27:eb:e1:81:47,57)/EndEntire
+
+We obviously don't need the additional node and in fact, grub chokes on
+it and fails to match the DP against the ethernet device node. So this
+patch moves the additional MAC node into the non-DM code path:
+
+  Handle 0x3db3fde0
+    /HardwareVendor(e61d73b9-a384-4acc-aeab-82e828f3628b)[0: ]
+    /USBClass(0,0,9,0,0)/USBClass(424,9514,9,0,2)/MacAddr(b8:27:eb:e1:81:47,1)
+    /EndEntire
+
+While at it, we also mark the non-DM MAC node as ethernet.
+
+Fixes: b66c60dde9d ("efi_loader: add device-path utils")
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ lib/efi_loader/efi_device_path.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
+index 3c735e60d3..22627824f0 100644
+--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
+@@ -749,7 +749,9 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part,
+ #ifdef CONFIG_CMD_NET
+ struct efi_device_path *efi_dp_from_eth(void)
+ {
+#ifndef CONFIG_DM_ETH
+ 	struct efi_device_path_mac_addr *ndp;
+#endif
+ 	void *buf, *start;
+ 	unsigned dpsize = 0;
+ 
+@@ -759,8 +761,8 @@ struct efi_device_path *efi_dp_from_eth(void)
+ 	dpsize += dp_size(eth_get_dev());
+ #else
+ 	dpsize += sizeof(ROOT);
+-#endif
+ 	dpsize += sizeof(*ndp);
+#endif
+ 
+ 	start = buf = dp_alloc(dpsize + sizeof(END));
+ 	if (!buf)
+@@ -771,14 +773,15 @@ struct efi_device_path *efi_dp_from_eth(void)
+ #else
+ 	memcpy(buf, &ROOT, sizeof(ROOT));
+ 	buf += sizeof(ROOT);
+-#endif
+ 
+ 	ndp = buf;
+ 	ndp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE;
+ 	ndp->dp.sub_type = DEVICE_PATH_SUB_TYPE_MSG_MAC_ADDR;
+ 	ndp->dp.length = sizeof(*ndp);
+	ndp->if_type = 1; /* Ethernet */
+ 	memcpy(ndp->mac.addr, eth_get_ethaddr(), ARP_HLEN);
+ 	buf = &ndp[1];
+#endif
+ 
+ 	*((struct efi_device_path *)buf) = END;
+ 
--- a/uefi-use-Fedora-specific-path-name.patch
+++ b/uefi-use-Fedora-specific-path-name.patch
@ -1,50 +1,47 @@
-From d8fcb72d566b0ebca1613555ac13c0798817487e Mon Sep 17 00:00:00 2001
+From 2b411f6edf298899098e2077a5ca2dfdaf3d882f Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
-Date: Tue, 24 Nov 2020 10:37:28 +0000
-Subject: [PATCH 2/2] use Fedora specific EFI path/name
+Date: Wed, 7 Feb 2018 12:37:58 +0000
+Subject: [PATCH] use Fedora specific EFI path/name

 Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
- include/config_distro_bootcmd.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ include/config_distro_bootcmd.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)

 diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-index 769477cd80e..22ce3685758 100644
+index f567cebd38..7746366ec8 100644
 --- a/include/config_distro_bootcmd.h
 +++ b/include/config_distro_bootcmd.h
-@@ -92,9 +92,9 @@
+@@ -93,7 +93,7 @@
 
 #ifdef CONFIG_EFI_LOADER
 #if defined(CONFIG_ARM64)
 -#define BOOTEFI_NAME "bootaa64.efi"
 +#define BOOTEFI_NAME "grubaa64.efi"
 #elif defined(CONFIG_ARM)
-#define BOOTEFI_NAME "bootarm.efi"
-+#define BOOTEFI_NAME "grubarm.efi"
+ #define BOOTEFI_NAME "bootarm.efi"
 #elif defined(CONFIG_X86_RUN_32BIT)
- #define BOOTEFI_NAME "bootia32.efi"
- #elif defined(CONFIG_X86_RUN_64BIT)
-@@ -132,7 +132,7 @@
- 	\
- 	"boot_efi_binary="                                                \
+@@ -127,7 +127,7 @@
+ 			"bootefi bootmgr ${fdtcontroladdr};"              \
+ 		"fi;"                                                     \
 		"load ${devtype} ${devnum}:${distro_bootpart} "           \
 -			"${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; "      \
 +			"${kernel_addr_r} efi/fedora/"BOOTEFI_NAME"; "      \
 		"if fdt addr ${fdt_addr_r}; then "                        \
 			"bootefi ${kernel_addr_r} ${fdt_addr_r};"         \
 		"else "                                                   \
-@@ -169,9 +169,9 @@
-		"run boot_efi_bootmgr\0"                                  \
- 	"scan_dev_for_efi="                                               \
+@@ -150,9 +150,9 @@
+ 			"fi;"                                             \
+ 		"done;"                                                   \
 		"if test -e ${devtype} ${devnum}:${distro_bootpart} "     \
 -					"efi/boot/"BOOTEFI_NAME"; then "  \
-+					"efi/fedora/"BOOTEFI_NAME"; then " \
+					"efi/fedora/"BOOTEFI_NAME"; then "  \
 				"echo Found EFI removable media binary "  \
 -					"efi/boot/"BOOTEFI_NAME"; "       \
-+					"efi/fedora/"BOOTEFI_NAME"; "     \
- 				"run scan_dev_for_dtb; "                  \
+					"efi/fedora/"BOOTEFI_NAME"; "       \
+ 				"run boot_efi_binary; "                   \
 				"echo EFI LOAD FAILED: continuing...; "   \
 		"fi; "                                                    \
 -- 
-2.29.2
+2.14.3

--- a/usb-kbd-fixes.patch
+++ b/usb-kbd-fixes.patch
@ -1,19 +1,19 @@
-From a49845f198af088c4e5e0019edbf519344d78c97 Mon Sep 17 00:00:00 2001
+From 1a8fa60aedff8a2368ac357a51dc15357065fabe Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
-Date: Tue, 4 Dec 2018 15:29:14 +0000
-Subject: [PATCH] usb kbd fixes
+Date: Tue, 5 Dec 2017 00:11:54 +0000
+Subject: [PATCH 3/5] usb kbd fixes

 Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
- common/usb_kbd.c  | 66 +++++++++++++++++++++++++++++++++++------------
+ common/usb_kbd.c  | 66 +++++++++++++++++++++++++++++++++++++++++--------------
 include/console.h |  2 --
 2 files changed, 50 insertions(+), 18 deletions(-)

 diff --git a/common/usb_kbd.c b/common/usb_kbd.c
-index 020f0d4117f..47674ce4458 100644
+index 8cbdba6ac2..82ad93f6ca 100644
 --- a/common/usb_kbd.c
 +++ b/common/usb_kbd.c
-@@ -518,25 +518,59 @@ static int probe_usb_keyboard(struct usb_device *dev)
+@@ -516,25 +516,59 @@ static int probe_usb_keyboard(struct usb_device *dev)
 		return error;
 
 	stdinname = env_get("stdin");
@ -87,8 +87,8 @@ index 020f0d4117f..47674ce4458 100644
 +#endif
 }
 
- #if !CONFIG_IS_ENABLED(DM_USB)
-@@ -642,7 +676,7 @@ static int usb_kbd_remove(struct udevice *dev)
+ #ifndef CONFIG_DM_USB
+@@ -640,7 +674,7 @@ static int usb_kbd_remove(struct udevice *dev)
 
 	return 0;
 err:
@ -98,10 +98,10 @@ index 020f0d4117f..47674ce4458 100644
 }
 
 diff --git a/include/console.h b/include/console.h
-index e935c601f12..6382ec8e0d6 100644
+index cea29ed6dc..7dfd36d7d1 100644
 --- a/include/console.h
 +++ b/include/console.h
-@@ -56,8 +56,6 @@ int console_announce_r(void);
+@@ -57,8 +57,6 @@ int console_announce_r(void);
 /*
  * CONSOLE multiplexing.
  */
@ -111,5 +111,5 @@ index e935c601f12..6382ec8e0d6 100644
 
 #endif
 -- 
-2.19.2
+2.14.3
Author	SHA1	Message	Date
Peter Robinson	1ec6d71a02	improve MMC on AllWinner A64 SoCs, fix RPi3B+ network errors (rhbz 1573261), Fix incorrect colours in uEFI console in Linux	2018-06-19 17:25:12 +01:00
Peter Robinson	dfca432980	improve MMC on AllWinner A64 SoCs	2018-05-01 14:40:55 +01:00
Peter Robinson	eb1c45dfc4	add AllWinner 64 bit enable usb kbd patch	2018-04-15 13:22:14 +01:00
Peter Robinson	2591231cce	Raspberry Pi fixes, Enable a few AllWinner Tablets	2018-04-15 12:31:00 +01:00