34 changed files with 3011 additions and 4947 deletions
--- a/0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch
+++ b/0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch
@ -0,0 +1,87 @@
 From 47bcc5136fe4e9f5bcc352395a723a8e4ac1aef7 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Wed, 3 Feb 2016 09:08:39 +0000
 Subject: [PATCH] Copy gcc5 over to compiler-gcc6.h as a beginning of support
 Add initial support for gcc6 by taking a copy of compiler-gcc5.h
 Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
 include/linux/compiler-gcc6.h | 65 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 include/linux/compiler-gcc6.h
 diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h
 new file mode 100644
 index 0000000..622117b
 --- /dev/null
 +++ b/include/linux/compiler-gcc6.h
@@ -0,0 +1,65 @@
 +#ifndef __LINUX_COMPILER_H
 +#error "Please don't include <linux/compiler-gcc6.h> directly, include <linux/compiler.h> instead."
 +#endif
 +
 +#define __used				__attribute__((__used__))
 +#define __must_check			__attribute__((warn_unused_result))
 +#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
 +
 +/* Mark functions as cold. gcc will assume any path leading to a call
 +   to them will be unlikely.  This means a lot of manual unlikely()s
 +   are unnecessary now for any paths leading to the usual suspects
 +   like BUG(), printk(), panic() etc. [but let's keep them for now for
 +   older compilers]
 +
 +   Early snapshots of gcc 4.3 don't support this and we can't detect this
 +   in the preprocessor, but we can live with this because they're unreleased.
 +   Maketime probing would be overkill here.
 +
 +   gcc also has a __attribute__((__hot__)) to move hot functions into
 +   a special section, but I don't see any sense in this right now in
 +   the kernel context */
 +#define __cold			__attribute__((__cold__))
 +
 +#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
 +
 +#ifndef __CHECKER__
 +# define __compiletime_warning(message) __attribute__((warning(message)))
 +# define __compiletime_error(message) __attribute__((error(message)))
 +#endif /* __CHECKER__ */
 +
 +/*
 + * Mark a position in code as unreachable.  This can be used to
 + * suppress control flow warnings after asm blocks that transfer
 + * control elsewhere.
 + *
 + * Early snapshots of gcc 4.5 don't support this and we can't detect
 + * this in the preprocessor, but we can live with this because they're
 + * unreleased.  Really, we need to have autoconf for the kernel.
 + */
 +#define unreachable() __builtin_unreachable()
 +
 +/* Mark a function definition as prohibited from being cloned. */
 +#define __noclone	__attribute__((__noclone__))
 +
 +/*
 + * Tell the optimizer that something else uses this function or variable.
 + */
 +#define __visible __attribute__((externally_visible))
 +
 +/*
 + * GCC 'asm goto' miscompiles certain code sequences:
 + *
 + *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
 + *
 + * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
 + *
 + * (asm goto is automatically volatile - the naming reflects this.)
 + */
 +#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
 +
 +#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
 +#define __HAVE_BUILTIN_BSWAP32__
 +#define __HAVE_BUILTIN_BSWAP64__
 +#define __HAVE_BUILTIN_BSWAP16__
 +#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
 -- 
 2.5.0
--- 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/0001-clearfog-needs-HUSH-parser-for-distro-boot.patch
+++ b/0001-clearfog-needs-HUSH-parser-for-distro-boot.patch
@ -0,0 +1,24 @@
 From 8e1dd4390d9a9c7453b7687d1f3a1d611a978b9f Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Thu, 19 May 2016 00:28:30 +0100
 Subject: [PATCH] clearfog needs HUSH parser for distro boot
 ---
 configs/clearfog_defconfig | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
 index 0fde640..75ea200 100644
 --- a/configs/clearfog_defconfig
 +++ b/configs/clearfog_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_CLEARFOG=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
 +CONFIG_HUSH_PARSER=y
 CONFIG_SPL=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 -- 
 2.7.4
--- a/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
+++ b/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
@ -0,0 +1,38 @@
 From 6e9ac1e8c6b51189dc0908585eb2b0240f213821 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Thu, 2 Jul 2015 23:28:56 +0100
 Subject: [PATCH 2/5] Add BOOTENV_INIT_COMMAND for commands that may be needed
 to run before bootcmd, such as setting the fdt file variables for platfroms
 that detect on boot.
 ---
 include/config_distro_bootcmd.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
 diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
 index 3a360ca4..dcad4c8 100644
 --- a/include/config_distro_bootcmd.h
 +++ b/include/config_distro_bootcmd.h
@@ -176,6 +176,10 @@
 #define BOOTENV_BOOT_TARGETS \
 	"boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
 +#ifndef BOOTENV_INIT_COMMAND
 +#define BOOTENV_INIT_COMMAND
 +#endif
 +
 #define BOOTENV_DEV(devtypeu, devtypel, instance) \
 	BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance)
 #define BOOTENV \
@@ -237,7 +241,7 @@
 	\
 	BOOT_TARGET_DEVICES(BOOTENV_DEV)                                  \
 	\
 -	"distro_bootcmd=" BOOTENV_SET_SCSI_NEED_INIT                      \
 +	"distro_bootcmd=" BOOTENV_INIT_COMMAND BOOTENV_SET_SCSI_NEED_INIT                      \
 		"for target in ${boot_targets}; do "                      \
 			"run bootcmd_${target}; "                         \
 		"done\0"
 -- 
 2.5.0
--- a/0005-port-utilite-to-distro-generic-boot-commands.patch
+++ b/0005-port-utilite-to-distro-generic-boot-commands.patch
@ -0,0 +1,148 @@
 From ad8f78f7df2cbfd271d73afc5296941972b38119 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Tue, 4 Aug 2015 09:37:38 +0100
 Subject: [PATCH 3/5] port utilite to distro generic boot commands
 ---
 include/configs/cm_fx6.h | 107 ++++++++++++-----------------------------------
 1 file changed, 27 insertions(+), 80 deletions(-)
 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
 index 12734a1..602c178 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 */
@@ -64,97 +65,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" \
 -	"kernel=uImage-cm-fx6\0" \
 -	"script=boot.scr\0" \
 	"dtb=cm-fx6.dtb\0" \
 -	"bootm_low=18000000\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" \
 -	"setboottypez=setenv kernel zImage-cm-fx6;" \
 -		"setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
 -		"setenv doloadfdt true;\0" \
 -	"setboottypem=setenv kernel uImage-cm-fx6;" \
 -		"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}\0" \
 -	"sataargs=setenv bootargs console=${console} root=${sataroot} " \
 -		"${video}\0" \
 -	"nandargs=setenv bootargs console=${console} " \
 -		"root=${nandroot} " \
 -		"rootfstype=${nandrootfstype} " \
 -		"${video}\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"
 +	BOOTENV
 -#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;"
 +#else /* ifndef CONFIG_SPL_BUILD */
 +#define CONFIG_EXTRA_ENV_SETTINGS
 +#endif
 #define CONFIG_PREBOOT		"usb start"
 -- 
 2.5.0
--- 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/Raspberry-Pi-400-Compute-Module-4-support.patch
+++ b/Raspberry-Pi-400-Compute-Module-4-support.patch
--- a/U-Boot-2-6-Revert-sunxi-Reserve-ATF-memory-space-on-A64.patch
+++ b/U-Boot-2-6-Revert-sunxi-Reserve-ATF-memory-space-on-A64.patch
@ -0,0 +1,43 @@
 From patchwork Wed May  4 21:15:30 2016
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [U-Boot,2/6] Revert "sunxi: Reserve ATF memory space on A64"
 From: Andre Przywara <andre.przywara@arm.com>
 X-Patchwork-Id: 618676
 Message-Id: <1462396534-32390-3-git-send-email-andre.przywara@arm.com>
 To: Hans de Goede <hdegoede@redhat.com>,
 	Ian Campbell <ijc@hellion.org.uk>
 Cc: Andre Przywara <andre.przywara@arm.com>, u-boot@lists.denx.de
 Date: Wed,  4 May 2016 22:15:30 +0100
 The ARM Trusted Firmware (ATF) code now lives in SRAM on the Pine64/A64,
 so we can claim the whole of DRAM for OS use.
 This reverts commit 3ffe39ed2b66af71c7271d0cef2a248b5bf7dfdb.
 Signed-off-by: Andre Przywara <andre.przywara@arm.com>
 ---
 board/sunxi/board.c | 9 ---------
 1 file changed, 9 deletions(-)
 diff --git a/board/sunxi/board.c b/board/sunxi/board.c
 index 3cf3614..ccf4129 100644
 --- a/board/sunxi/board.c
 +++ b/board/sunxi/board.c
@@ -133,15 +133,6 @@ int dram_init(void)
 	return 0;
 }
 -#ifdef CONFIG_MACH_SUN50I
 -void dram_init_banksize(void)
 -{
 -	/* We need to reserve the first 16MB of RAM for ATF */
 -	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE + (16 * 1024 * 1024);
 -	gd->bd->bi_dram[0].size = get_effective_memsize() - (16 * 1024 * 1024);
 -}
 -#endif
 -
 #if defined(CONFIG_NAND_SUNXI) && defined(CONFIG_SPL_BUILD)
 static void nand_pinmux_setup(void)
 {
--- a/U-Boot-3-6-arm64-sunxi-reserve-space-for-boot0-header.patch
+++ b/U-Boot-3-6-arm64-sunxi-reserve-space-for-boot0-header.patch
@ -0,0 +1,42 @@
 From patchwork Wed May  4 21:15:31 2016
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [U-Boot,3/6] arm64: sunxi: reserve space for boot0 header
 From: Andre Przywara <andre.przywara@arm.com>
 X-Patchwork-Id: 618678
 Message-Id: <1462396534-32390-4-git-send-email-andre.przywara@arm.com>
 To: Hans de Goede <hdegoede@redhat.com>,
 	Ian Campbell <ijc@hellion.org.uk>
 Cc: Andre Przywara <andre.przywara@arm.com>, u-boot@lists.denx.de
 Date: Wed,  4 May 2016 22:15:31 +0100
 The Allwinner provided boot0 boot loader requires a header before the
 U-Boot binary to both check its validity and to find other blobs to
 load. There is a tool called boot0img which fills the header
 appropriately.
 Reserve some space at the beginning of the binary to later hold the
 header if needed.
 Please note that the header is jumped over already by U-Boot anyway,
 so filling the header is optional and can be skipped if for instance
 boot0 is not used.
 Signed-off-by: Andre Przywara <andre.przywara@arm.com>
 ---
 arch/arm/cpu/armv8/start.S | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S
 index deb44a8..b4c4867 100644
 --- a/arch/arm/cpu/armv8/start.S
 +++ b/arch/arm/cpu/armv8/start.S
@@ -21,6 +21,9 @@
 _start:
 	b	reset
 +#ifdef CONFIG_ARCH_SUNXI
 +	.space 0x5fc	/* can be filled with a boot0 header if needed */
 +#endif
 	.align 3
 .globl	_TEXT_BASE
--- a/U-Boot-4-6-arm64-sunxi-adjust-default-load-addresses.patch
+++ b/U-Boot-4-6-arm64-sunxi-adjust-default-load-addresses.patch
@ -0,0 +1,59 @@
 From patchwork Wed May  4 21:15:32 2016
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [U-Boot,4/6] arm64: sunxi: adjust default load addresses
 From: Andre Przywara <andre.przywara@arm.com>
 X-Patchwork-Id: 618679
 Message-Id: <1462396534-32390-5-git-send-email-andre.przywara@arm.com>
 To: Hans de Goede <hdegoede@redhat.com>,
 	Ian Campbell <ijc@hellion.org.uk>
 Cc: Andre Przywara <andre.przywara@arm.com>, u-boot@lists.denx.de
 Date: Wed,  4 May 2016 22:15:32 +0100
 As arm64 has slightly different expectations about load addresses, lets
 use a different set of default addresses for things like the kernel.
 As arm64 kernels don't come with a decompressor right now, reserve some
 more space for really big uncompressed kernels.
 Signed-off-by: Andre Przywara <andre.przywara@arm.com>
 ---
 include/configs/sunxi-common.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
 index 2406115..16f1a2c 100644
 --- a/include/configs/sunxi-common.h
 +++ b/include/configs/sunxi-common.h
@@ -390,6 +390,23 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_PRE_CONSOLE_BUFFER
 #define CONFIG_PRE_CON_BUF_SZ		4096 /* Aprox 2 80*25 screens */
 +#ifdef CONFIG_ARM64
 +/*
 + * Boards seem to come with at least 512MB of DRAM.
 + * The kernel should go at 512K, which is the default text offset (that will
 + * be adjusted at runtime if needed).
 + * There is no compression for arm64 kernels (yet), so leave some space
 + * for really big kernels, say 256MB for now.
 + * Scripts, PXE and DTBs should go afterwards, leaving the rest for the initrd.
 + * Align the initrd to a 2MB page.
 + */
 +#define KERNEL_ADDR_R	__stringify(SDRAM_OFFSET(0080000))
 +#define FDT_ADDR_R	__stringify(SDRAM_OFFSET(FA00000))
 +#define SCRIPT_ADDR_R	__stringify(SDRAM_OFFSET(FC00000))
 +#define PXEFILE_ADDR_R	__stringify(SDRAM_OFFSET(FD00000))
 +#define RAMDISK_ADDR_R	__stringify(SDRAM_OFFSET(FE00000))
 +
 +#else
 /*
  * 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc.
  * 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
@@ -401,6 +418,7 @@ extern int soft_i2c_gpio_scl;
 #define SCRIPT_ADDR_R  __stringify(SDRAM_OFFSET(3100000))
 #define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000))
 #define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3300000))
 +#endif
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"bootm_size=0xa000000\0" \
--- a/U-Boot-5-6-arm64-Pine64-update-FDT-files.patch
+++ b/U-Boot-5-6-arm64-Pine64-update-FDT-files.patch
--- a/U-Boot-6-6-Pine64-rename-defconfig.patch
+++ b/U-Boot-6-6-Pine64-rename-defconfig.patch
@ -0,0 +1,80 @@
 From patchwork Wed May  4 21:15:34 2016
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [U-Boot,6/6] Pine64: rename defconfig
 From: Andre Przywara <andre.przywara@arm.com>
 X-Patchwork-Id: 618681
 Message-Id: <1462396534-32390-7-git-send-email-andre.przywara@arm.com>
 To: Hans de Goede <hdegoede@redhat.com>,
 	Ian Campbell <ijc@hellion.org.uk>
 Cc: Andre Przywara <andre.przywara@arm.com>, u-boot@lists.denx.de
 Date: Wed,  4 May 2016 22:15:34 +0100
 Rename the defconfig file for the Pine64 from pine64_plus_defconfig to
 pine64_defconfig.
 The differences between the two versions (more RAM and a different
 Ethernet PHY) don't justify two board versions, so lets stick with the
 generic name and try to differentiate between the versions at runtime
 if this is needed later.
 Signed-off-by: Andre Przywara <andre.przywara@arm.com>
 ---
 configs/pine64_defconfig      | 20 ++++++++++++++++++++
 configs/pine64_plus_defconfig | 20 --------------------
 2 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 configs/pine64_defconfig
 delete mode 100644 configs/pine64_plus_defconfig
 diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
 new file mode 100644
 index 0000000..0977334
 --- /dev/null
 +++ b/configs/pine64_defconfig
@@ -0,0 +1,20 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_SUNXI=y
 +CONFIG_MACH_SUN50I=y
 +CONFIG_DRAM_CLK=672
 +CONFIG_DRAM_ZQ=3881915
 +# CONFIG_VIDEO is not set
 +CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus"
 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 +CONFIG_HUSH_PARSER=y
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_MMC=y
 +# CONFIG_CMD_FPGA is not set
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_MII=y
 +CONFIG_CMD_PING=y
 +CONFIG_CMD_EXT2=y
 +CONFIG_CMD_EXT4=y
 +CONFIG_CMD_FAT=y
 +CONFIG_CMD_FS_GENERIC=y
 diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig
 deleted file mode 100644
 index 0977334..0000000
 --- a/configs/pine64_plus_defconfig
 +++ /dev/null
@@ -1,20 +0,0 @@
 -CONFIG_ARM=y
 -CONFIG_ARCH_SUNXI=y
 -CONFIG_MACH_SUN50I=y
 -CONFIG_DRAM_CLK=672
 -CONFIG_DRAM_ZQ=3881915
 -# CONFIG_VIDEO is not set
 -CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus"
 -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 -CONFIG_HUSH_PARSER=y
 -# CONFIG_CMD_IMLS is not set
 -# CONFIG_CMD_FLASH is not set
 -CONFIG_CMD_MMC=y
 -# CONFIG_CMD_FPGA is not set
 -CONFIG_CMD_DHCP=y
 -CONFIG_CMD_MII=y
 -CONFIG_CMD_PING=y
 -CONFIG_CMD_EXT2=y
 -CONFIG_CMD_EXT4=y
 -CONFIG_CMD_FAT=y
 -CONFIG_CMD_FS_GENERIC=y
--- a/U-Boot-efi_loader-Clean-up-system-table-on-exit.patch
+++ b/U-Boot-efi_loader-Clean-up-system-table-on-exit.patch
@ -0,0 +1,52 @@
 From patchwork Tue May 17 22:54:47 2016
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [U-Boot] efi_loader: Clean up system table on exit
 From: Alexander Graf <agraf@suse.de>
 X-Patchwork-Id: 623319
 Message-Id: <1463525687-231924-1-git-send-email-agraf@suse.de>
 To: u-boot@lists.denx.de
 Cc: leif.lindholm@linaro.org
 Date: Wed, 18 May 2016 00:54:47 +0200
 We put the system table into our runtime services data section so that
 payloads may still access it after exit_boot_services. However, most fields
 in it are quite useless once we're in that state, so let's just patch them
 out.
 With this patch we don't get spurious warnings when running EFI binaries
 anymore.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
 lib/efi_loader/efi_runtime.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
 index 3ee27ca..11d0126 100644
 --- a/lib/efi_loader/efi_runtime.c
 +++ b/lib/efi_loader/efi_runtime.c
@@ -125,6 +125,22 @@ static const struct efi_runtime_detach_list_struct efi_runtime_detach_list[] = {
 		/* RTC accessors are gone */
 		.ptr = &efi_runtime_services.get_time,
 		.patchto = &efi_device_error,
 +	}, {
 +		/* Clean up system table */
 +		.ptr = &systab.con_in,
 +		.patchto = NULL,
 +	}, {
 +		/* Clean up system table */
 +		.ptr = &systab.con_out,
 +		.patchto = NULL,
 +	}, {
 +		/* Clean up system table */
 +		.ptr = &systab.std_err,
 +		.patchto = NULL,
 +	}, {
 +		/* Clean up system table */
 +		.ptr = &systab.boottime,
 +		.patchto = NULL,
 	},
 };
--- a/U-Boot-efi_loader-gop-Don-t-expose-fb-address.patch
+++ b/U-Boot-efi_loader-gop-Don-t-expose-fb-address.patch
@ -0,0 +1,42 @@
 From patchwork Wed May 18 00:04:24 2016
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [U-Boot] efi_loader: gop: Don't expose fb address
 From: Alexander Graf <agraf@suse.de>
 X-Patchwork-Id: 623328
 Message-Id: <1463529864-31027-1-git-send-email-agraf@suse.de>
 To: u-boot@lists.denx.de
 Cc: leif.lindholm@linaro.org, Ard Biesheuvel <ard.biesheuvel@linaro.org>
 Date: Wed, 18 May 2016 02:04:24 +0200
 Recently Linux is gaining support for efifb on AArch64 and that support actually
 tries to make use of the frame buffer address we expose to it via gop.
 While this wouldn't be bad in theory, in practice it means a few bad things
  1) We expose 16bit frame buffers as 32bit today
  2) Linux can't deal with overlapping non-PCI regions between efifb and
     a different frame buffer driver
 For now, let's just disable exposure of the frame buffer address. Most OSs that
 get booted will have a native driver for the GPU anyway.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
 lib/efi_loader/efi_gop.c | 2 --
 1 file changed, 2 deletions(-)
 diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
 index bdd62bc..6c3115c 100644
 --- a/lib/efi_loader/efi_gop.c
 +++ b/lib/efi_loader/efi_gop.c
@@ -136,8 +136,6 @@ int efi_gop_register(void)
 	gopobj->mode.max_mode = 1;
 	gopobj->mode.info = &gopobj->info;
 	gopobj->mode.info_size = sizeof(gopobj->info);
 -	gopobj->mode.fb_base = gd->fb_base;
 -	gopobj->mode.fb_size = lcd_get_size(&line_len);
 	gopobj->info.version = 0;
 	gopobj->info.width = panel_info.vl_col;
--- a/U-Boot-video-ipu_common-fix-build-error.patch
+++ b/U-Boot-video-ipu_common-fix-build-error.patch
@ -0,0 +1,57 @@
 From patchwork Thu Apr 28 02:07:53 2016
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [U-Boot] video: ipu_common: fix build error
 From: Peng Fan <van.freenix@gmail.com>
 X-Patchwork-Id: 615976
 Message-Id: <1461809273-4603-1-git-send-email-van.freenix@gmail.com>
 To: u-boot@lists.denx.de
 Cc: Tom Rini <trini@konsulko.com>, Fabio Estevam <fabio.estevam@nxp.com>
 Date: Thu, 28 Apr 2016 10:07:53 +0800
 Some toolchains fail to build
 "clk->rate = (u64)(clk->parent->rate * 16) / div;"
 And the cast usage is wrong.
 Use the following code to fix the issue,
 "
  do_div(parent_rate, div);
  clk->rate = parent_rate;
 "
 Reported-by: Peter Robinson <pbrobinson@gmail.com>
 Signed-off-by: Peng Fan <van.freenix@gmail.com>
 Cc: Stefano Babic <sbabic@denx.de>
 Cc: Fabio Estevam <fabio.estevam@nxp.com>
 Cc: Tom Rini <trini@konsulko.com>
 Cc: Anatolij Gustschin <agust@denx.de>
 Cc: Peter Robinson <pbrobinson@gmail.com>
 ---
 Hi Peter,
 Please help test this patch to see whether this fix your issue or not.
 Thanks for pointing out this issue.
 Thanks,
 Peng.
 drivers/video/ipu_common.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c
 index 36d4b23..5676a0f 100644
 --- a/drivers/video/ipu_common.c
 +++ b/drivers/video/ipu_common.c
@@ -352,7 +352,9 @@ static int ipu_pixel_clk_set_rate(struct clk *clk, unsigned long rate)
 	 */
 	__raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id));
 -	clk->rate = (u64)(clk->parent->rate * 16) / div;
 +	do_div(parent_rate, div);
 +
 +	clk->rate = parent_rate;
 	return 0;
 }
--- a/75
+++ b/75
@ -1,75 +0,0 @@
 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_juno
 xilinx_zynqmp_virt
--- a/0
+++ b/0
--- a/8
+++ b/8
@ -1,8 +0,0 @@
 chromebit_mickey_defconfig
 chromebook_jerry_defconfig
 chromebook_minnie_defconfig
 nyan-big_defconfig
 peach-pi_defconfig
 peach-pit_defconfig
 snow_defconfig
 spring_defconfig
--- 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/59
+++ b/59
@ -6,23 +6,15 @@ A20-Olimex-SOM-EVB
 A20-OLinuXino-Lime
 A20-OLinuXino-Lime2
 A20-OLinuXino_MICRO
-am335x_evm
+am335x_boneblack
 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
@ -32,38 +24,26 @@ colorfly_e708_q1
 CSQ_CS908
 Cubieboard
 Cubieboard2
 Cubieboard4
 Cubietruck
 Cubietruck_plus
 db-mv784mp-gp
 difrnce_dit4350
 dserve_dsrv9703c
 evb-rk3229
 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
 Itead_Ibox_A20
 jesurun_q5
 jetson-tk1
 kc1
 Lamobo_R1
 libretech_all_h3_cc_h2_plus
 Linksprite_pcDuino
 Linksprite_pcDuino3
 Linksprite_pcDuino3_Nano
 liteboard
 marsboard
 Marsboard_A10
 Mele_A1000
@ -80,64 +60,49 @@ MK808C
 MSI_Primo73
 MSI_Primo81
 mx6cuboxi
 nanopi_m1
 nanopi_m1_plus
 nanopi_neo
 novena
 nyan-big
 odroid
 odroid-xu3
 omap3_beagle
 omap3_pandora
 omap4_panda
 omap5_uevm
 Orangepi
 orangepi_2
 orangepi_lite
 Orangepi_mini
 orangepi_one
 orangepi_pc
 orangepi_pc_plus
 orangepi_plus
 orangepi_plus2e
 orangepi_r1
 orangepi_zero
 origen
 paz00
-pinecube
+peach-pi
 peach-pit
 polaroid_mid2809pxe04
 pov_protab2_ips9
 q8_a13_tablet
 q8_a23_tablet_800x480
 q8_a33_tablet_1024x600
 q8_a33_tablet_800x480
 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
+smdkv310
-Sinovoip_BPI_M3
+snow
-stih410-b2260
+spring
 stm32mp15_basic
 sunxi_Gemei_G9
 tbs_a711
 tinker-rk3288
 tinker-s-rk3288
 trimslice
 udoo
 udoo_neo
 usbarmory
 UTOO_P66
 vexpress_ca15_tc2
 vexpress_ca9x4
 wandboard
 warp
 warp7
 Wexler_TAB7200
 Wits_Pro_A20_DKT
 Yones_Toptech_BS1078_V2
-xilinx_zynq_virt
+zynq_microzed
 zynq_zed
 zynq_zybo
--- a/8
+++ b/8
@ -0,0 +1,8 @@
 dragonboard410c
 hikey
 p2371-2180
 pine64
 rpi_3
 vexpress_aemv8a_dram
 vexpress_aemv8a_juno
 vexpress_aemv8a_semi
--- a/dragonboard-fixes.patch
+++ b/dragonboard-fixes.patch
@ -1,115 +0,0 @@
 From 8b0274a733cd1ce39ad9ad18e1bd8efdd02a40b7 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
 ---
 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
 --- 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)
 static int usb_test_unit_ready(struct scsi_cmd *srb, struct us_data *ss)
 {
 -	int retries = 10;
 +	int retries = 20;
 	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)
 		if ((srb->sense_buf[2] == 0x02) &&
 		    (srb->sense_buf[12] == 0x3a))
 			return -1;
 -		mdelay(100);
 +		mdelay(250);
 	} while (retries--);
 	return -1;
 -- 
 2.19.1
 From 7bf41d74ca9d58bc2243b7688f8987c1d373ea56 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
 Hitting some timeout which makes boot take much longer.  And
 uefi/boot/rootfs partitions will be on sd-card or usb disk, etc,
 so we can just ignore emmc.
 ---
 arch/arm/dts/dragonboard410c.dts | 2 ++
 1 file changed, 2 insertions(+)
 diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts
 index fa348bc621e..bfe7f15d5ed 100644
 --- a/arch/arm/dts/dragonboard410c.dts
 +++ b/arch/arm/dts/dragonboard410c.dts
@@ -106,6 +106,7 @@
 			#phy-cells = <0>;
 		};
 +/*
 		sdhci@07824000 {
 			compatible = "qcom,sdhci-msm-v4";
 			reg = <0x7824900 0x11c 0x7824000 0x800>;
@@ -115,6 +116,7 @@
 			clock = <&clkc 0>;
 			clock-frequency = <100000000>;
 		};
 +*/
 		sdhci@07864000 {
 			compatible = "qcom,sdhci-msm-v4";
 -- 
 2.19.1
 From 871fe802cf3ab593b9332c4f36ab2b3f179d51ae 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
 ---
 configs/dragonboard410c_defconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)
 diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
 index a55abaf8df5..4ece0cafbe4 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
 +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_PMIC_PM8916=y
 CONFIG_MSM_SERIAL=y
 CONFIG_SPMI_MSM=y
 +CONFIG_DM_ETH=y
 +CONFIG_DM_KEYBOARD=y
 +CONFIG_DM_VIDEO=y
 +# 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_ETHER_ASIX=y
 CONFIG_USB_ETHER_ASIX88179=y
 CONFIG_USB_ETHER_MCS7830=y
 +CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 -- 
 2.19.1
--- a/mvebu-enable-generic-distro-boot-config.patch
+++ b/mvebu-enable-generic-distro-boot-config.patch
@ -0,0 +1,136 @@
 From 24fcb059b32a34f772e4de114671973f603c4493 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Thu, 28 Apr 2016 11:02:53 +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>
 ---
 include/configs/clearfog.h  |  5 ---
 include/configs/mv-common.h | 86 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 6 deletions(-)
 diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
 index ffaeedb..fd0114e 100644
 --- a/include/configs/clearfog.h
 +++ b/include/configs/clearfog.h
@@ -90,11 +90,6 @@
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_ALT_MEMTEST
 -/* Keep device tree and initrd in lower memory so the kernel can access them */
 -#define CONFIG_EXTRA_ENV_SETTINGS	\
 -	"fdt_high=0x10000000\0"		\
 -	"initrd_high=0x10000000\0"
 -
 /* SPL */
 /*
  * Select the boot device here
 diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
 index 6d4bbd1..7050a83 100644
 --- a/include/configs/mv-common.h
 +++ b/include/configs/mv-common.h
@@ -57,7 +57,7 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, \
 					  115200,230400, 460800, 921600 }
 /* auto boot */
 -#define CONFIG_BOOTDELAY	3	/* default enable autoboot */
 +#define CONFIG_BOOTDELAY	2	/* default enable autoboot */
 #define CONFIG_PREBOOT
 /*
@@ -148,4 +148,88 @@
 #define CONFIG_LZO
 #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.7.4
--- a/rk3399-Pinebook-pro-EDP-support.patch
+++ b/rk3399-Pinebook-pro-EDP-support.patch
--- 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-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
+3a8613d753dfa707c937991a35404510  u-boot-2016.05.tar.bz2
--- 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/uboot-tools.spec
+++ b/uboot-tools.spec
@ -1,68 +1,40 @@
-%global candidate rc4
+#global candidate rc3
-Name:     uboot-tools
+Name:      uboot-tools
-Version:  2021.01
+Version:   2016.05
-Release:  0.4%{?candidate:.%{candidate}}%{?dist}
+Release:   3%{?candidate:.%{candidate}}%{?dist}
-Summary:  U-Boot utilities
+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
+Group:     Development/Tools
-Source1:  arm-boards
+License:   GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
-Source2:  arm-chromebooks
+URL:       http://www.denx.de/wiki/U-Boot
-Source3:  aarch64-boards
+Source0:   ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
-Source4:  aarch64-chromebooks
+Source1:   armv7-boards
 Source2:   armv8-boards
-# Fedoraisms patches
+Patch1:    0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch
-# Needed to find DT on boot partition that's not the first partition
+Patch2:    0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
-Patch1:   uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
+Patch3:    0005-port-utilite-to-distro-generic-boot-commands.patch
-# Needed due to issues with shim
+Patch4:    mvebu-enable-generic-distro-boot-config.patch
-Patch2:   uefi-use-Fedora-specific-path-name.patch
+Patch5:    U-Boot-video-ipu_common-fix-build-error.patch
-# RPi - uses RPI firmware device tree for HAT support
+Patch6:    0001-clearfog-needs-HUSH-parser-for-distro-boot.patch
-Patch3:   rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
+
-# Ajust the U-Boot offsets in SPL to take less space
+Patch11:   U-Boot-2-6-Revert-sunxi-Reserve-ATF-memory-space-on-A64.patch
-#Patch4:   rockchip-spl-u-boot-itb-offset.patch
+Patch12:   U-Boot-3-6-arm64-sunxi-reserve-space-for-boot0-header.patch
 Patch13:   U-Boot-4-6-arm64-sunxi-adjust-default-load-addresses.patch
 Patch14:   U-Boot-5-6-arm64-Pine64-update-FDT-files.patch
 Patch15:   U-Boot-6-6-Pine64-rename-defconfig.patch
 Patch16:   U-Boot-efi_loader-Clean-up-system-table-on-exit.patch
 Patch17:   U-Boot-efi_loader-gop-Don-t-expose-fb-address.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
 BuildRequires:  bc
 BuildRequires:  dtc
-BuildRequires:  make
+BuildRequires:  fedora-logos
-# Requirements for building on el7
+BuildRequires:  git
-%if 0%{?rhel} == 7
+BuildRequires:  netpbm-progs
 BuildRequires:  devtoolset-7-build
 BuildRequires:  devtoolset-7-binutils
 BuildRequires:  devtoolset-7-gcc
 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:  SDL-devel
 BuildRequires:  swig
 %ifarch %{arm} aarch64
 BuildRequires:  vboot-utils
 %endif
 %ifarch aarch64
 BuildRequires:  arm-trusted-firmware-armv8
 %endif
 Requires:       dtc
 %description
@ -71,70 +43,71 @@ 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 armv8 boards
 Requires:    uboot-tools
 BuildArch:   noarch
 %description -n uboot-images-armv8
-U-Boot firmware binaries for aarch64 boards
+u-boot bootloader binaries for the aarch64 vexpress_aemv8a
 %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
 %prep
-%autosetup -p1 -n u-boot-%{version}%{?candidate:-%{candidate}}
+%setup -q -n u-boot-%{version}%{?candidate:-%{candidate}}
-cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 .
+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
 %build
 mkdir builds
 # convert fedora logo to bmp for use in u-boot
 # pngtopnm /usr/share/pixmaps/fedora-logo.png | ppmquant 256 | ppmtobmp -bpp 8 >fedora.bmp
-%if 0%{?rhel} == 7
+#replace the logos with fedora's
-#Enabling DTS for .el7
+#for bmp in tools/logos/*bmp
-%{?enable_devtoolset7:%{enable_devtoolset7}}
+#do
-%endif
+#cp fedora.bmp $bmp
 #done
-%ifarch aarch64 %{arm}
+%ifarch aarch64
-for board in $(cat %{_arch}-boards)
+for board in $(cat %SOURCE2)
 do
-  echo "Building board: $board"
+make $(echo $board)_defconfig O=builds/$(echo $board)/
-  mkdir builds/$(echo $board)/
+make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=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)
  if [[ " ${sun50i[*]} " == *" $board "* ]]; then
    echo "Board: $board using sun50i_a64"
    cp /usr/share/arm-trusted-firmware/sun50i_a64/* 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)
  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)/
 done
 %endif
-%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" tools-only_defconfig O=builds/
+%ifarch %{arm}
-%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" tools-all O=builds/
+for board in $(cat %SOURCE1)
 do
 make $(echo $board)_defconfig V=1 O=builds/$(echo $board)/
 make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/$(echo $board)/
 done
 %endif
 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}
@ -143,10 +116,10 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/
 %ifarch aarch64
-for board in $(cat %{_arch}-boards)
+for board in $(cat %SOURCE2)
 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 MLO SPL 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)/
@ -156,20 +129,19 @@ done
 %endif
 %ifarch %{arm}
-for board in $(cat %{_arch}-boards)
+for board in $(cat %SOURCE1)
 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)/
  fi
 done
 done
 # Bit of a hack to remove binaries we don't use as they're large
-for board in $(cat %{_arch}-boards)
+for board in $(cat %SOURCE1)
 do
  if [ -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-sunxi-with-spl.bin ]; then
    rm -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.*
@ -186,7 +158,20 @@ 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 %SOURCE2)
 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
 for tool in bmp_logo dumpimage easylogo/easylogo env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr img2srec mkenvimage mkimage ncb proftool ubsha1 xway-swap-bytes
 do
 install -p -m 0755 builds/tools/$tool $RPM_BUILD_ROOT%{_bindir}
 done
@ -197,28 +182,11 @@ 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}
 # Copy sone useful docs over
 mkdir -p builds/docs
 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
 cp -p board/rockchip/evb_rk3399/README builds/docs/README.evb_rk3399
 cp -p board/solidrun/clearfog/README builds/docs/README.clearfog
 cp -p board/solidrun/mx6cuboxi/README builds/docs/README.mx6cuboxi
 cp -p board/sunxi/README.sunxi64 builds/docs/README.sunxi64
 cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
 cp -p board/ti/am335x/README builds/docs/README.am335x
 cp -p board/ti/omap5_uevm/README builds/docs/README.omap5_uevm
 cp -p board/udoo/README builds/docs/README.udoo
 cp -p board/wandboard/README builds/docs/README.wandboard
 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 README doc/README.imximage doc/README.kwbimage doc/README.imximage
-%doc doc/README.odroid doc/README.rockchip doc/uefi doc/uImage.FIT doc/arch/arm64.rst
+%doc doc/README.distro doc/README.gpt doc/README.efi doc/uImage.FIT
-%doc doc/README.chromium builds/docs/*
+%doc doc/README.odroid doc/README.rockchip
 %doc doc/board/amlogic/ doc/board/rockchip/
 %{_bindir}/*
 %{_mandir}/man1/mkimage.1*
 %dir %{_datadir}/uboot/
@ -235,115 +203,422 @@ cp -p board/warp7/README builds/docs/README.warp7
 %endif
 %changelog
-* Sun Dec 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.4.rc4
+* Mon May 23 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-3
- Update to 2021.01 RC4
+- Ship SPL for rockchips devices
 - Latest RPi-400/CM4 support patch
-* Tue Dec 15 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.3.rc3
+* Thu May 19 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-2
- Update to 2021.01 RC3
+- Fix distro boot on clearfog
- Latest RPi-400/CM4 support patch
+- arm64 EFI boot fixes
 - Re-enable previously disabled device support
-* Mon Dec 14 2020 Javier Martinez Canillas <javierm@redhat.com> - 2021.01-0.2.rc2
+* Mon May 16 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-1
- Fix a "scan_dev_for_efi" not defined error
+- Update to 2016.05 GA
-* Sun Nov 22 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.1.rc2
+* Thu May 12 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-0.5rc3
- Update to 2021.01 RC2
+- Add USB storage support to CHIP
- Latest Pinebook Pro display patches
+- Enhanced PINE64 support
 - Initial RPi-400 support patch
 - Update Fedora specific patches
-* Sun Nov  8 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-3
+* Thu Apr 28 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-0.4rc3
- Fix SPI on Rockchip devices
+- Upstream fix for i.MX6 breakage
- Latest Pinebook Pro display patches
+- Rebase mvebu distro boot patch
 - Fix Keyboard and USB-A ports on Pinebook Pro
-* Wed Oct 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-2
+* Wed Apr 27 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-0.3rc3
- Fix kernel installs for non EBBR systems
+- Add work around for imx6 and renable devices
 - Fix for wired networks on some Allwinner devices
-* Tue Oct 06 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-1
+* Tue Apr 26 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-0.2rc3
- Update to 2020.10
+- 2016.05 RC3
 - Add some useful device READMEs that contain locations of needed firmware blobs etc
 - Enable Jetson TX1
 - i.MX6 still disabled
-* Sun Sep 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.6.rc5
+* Thu Apr 21 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-0.1rc1
- Initial support for display output on Pinebook Pro
+- 2016.05 RC1
 - Build aarch64 u-boot for HiKey, DragonBoard, PINE64
 - Build new ARMv7 devices
 - Temp disable some i.MX6 devices as build broken
-* Tue Sep 22 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.5.rc5
+* Tue Apr 19 2016 Dennis Gilmore <dennis@ausil.us> - 2016.03-6
- Update to 2020.10 RC5
+- drop using the fedora logos for now rhbz#1328505
-* Wed Sep 09 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.4.rc4
+* Sat Apr  9 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.03-5
- Update to 2020.10 RC4
+- Add upstream fix for ARMv7 cache issues preventing some devices from booting
-* Wed Aug 19 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.3.rc2
+* Tue Mar 22 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.03-4
- Enable a number of new Rockchip devices
+- Add a better fix for network issue which caused follow on issues
-* Mon Aug 10 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.2.rc2
+* Mon Mar 21 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.03-3
- Update to 2020.10 RC2
+- Add a work around for ggc6 issue on some ARMv7 devices
 - Add fixes for AllWinner USB and some fixes for OrangePi devices
-* Tue Jul 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.1.rc1
+* Fri Mar 18 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.03-2
- 2020.10 RC1
+- Add upstream patches to fix some issues on some AllWinner devices
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2020.07-2
+* Mon Mar 14 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.03-1
- Use make macros
+- Update to 2016.03 GA
 - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-* Mon Jul 06 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-1
+* Sun Mar  6 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.03-0.4rc3
- 2020.07 GA
+- Minor cleanups and new devices
-* Tue Jun 23 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.5.rc5
+* Tue Mar  1 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.03-0.3rc3
- 2020.07 RC5
+- Update to 2016.03 RC3
-* Thu Jun 18 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.4.rc4
+* Tue Feb 16 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.03-0.2rc2
- Update various patches to latest upstream
+- Update to 2016.03 RC2
 - Enable SolidRun Clearfog
-* Wed Jun 10 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.3.rc4
+* Wed Feb  3 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.03-0.1rc1
- 2020.07 RC4
+- Update to 2016.03 RC1
 - Minor updates and other fixes
-* Tue May 12 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.2.rc2
+* Wed Jan 20 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.01-3
- 2020.07 RC2
+- Fix PXE boot on Wandboard (rhbz #1299957)
 - Minor device updates
-* Wed Apr 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.1.rc1
+* Tue Jan 19 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.01-2
- 2020.07 RC1
+- Add patch to fix PCI-e on Jetson TK1
 - Add patch fo serial junk on BeagleBone
-* Tue Apr 21 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-4
+* Tue Jan 12 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.01-1
- Initial support for USB on Rasperry Pi 4
+- Update to 2016.01 GA
-* Tue Apr 21 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-3
+* Sun Jan 10 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.01-0.4rc4
- Ship u-boot-rockchip.bin for SPI flash
+- Update to 2016.01 RC4
-* Mon Apr 20 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-2
+* Tue Dec 22 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2016.01-0.3rc3
- Fix ATF for new aarch64 devices
+- Update to 2016.01 RC3
- Fix Wandboard board detection (rhbz 1825247)
+- Enable Lamobo_R1
 - Fix mSD card on RockPro64
 - Enable (inital) Pinebook Pro
-* Tue Apr 14 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-1
+* Tue Dec  8 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2016.01-0.2rc2
- 2020.04
+- Update to 2016.01 RC2
 - Enable Orange Pi (original, mini, PC, plus)
-* Tue Apr  7 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.7-rc5
+* Tue Nov 17 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2016.01-0.1rc1
- 2020.04 RC5
+- Update to 2016.01 RC1
-* Tue Mar 31 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.6-rc4
+* Sat Nov 14 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.10-3
- 2020.04 RC4
+- Use upstream Wanboard distro boot patch
- Updates for NVIDIA Jetson platforms
+- Add support for BeagleBone Green
- Support RNG for random seed for KASLR on some Rockchip devices
+- Add initial support for C.H.I.P.
 - Enable Rockchips: Firefly, Jerry devices
 - Enable Exynos: Peach Pit/Pi, Sprint devices
-* Thu Mar 26 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.5-rc3
+* Tue Nov  3 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.10-2
- Fix ext4 alignment issue seen on some NXP i.MX devices
+- Fix boot on some devices
-* Wed Feb 26 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.4-rc3
+* Tue Oct 20 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.10-1
- 2020.04 RC3
+- Update to 2015.10 GA
 - Enable BeagleBoard X-15
 - Enable new AllWinner devices
-* Thu Feb 13 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.3-rc2
+* Mon Oct 12 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.10-0.4rc5
- 2020.04 RC2
+- Update to 2015.10 RC5
-* Sun Feb  2 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.2-rc1
+* Tue Sep 29 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.10-0.3rc4
- Update genet NIC driver
+- Update to 2015.10 RC4
-* Wed Jan 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.1-rc1
+* Fri Sep 11 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.10-0.2rc3
- 2020.04 RC1
+- Update to 2015.10 RC3
-* Tue Jan  7 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.01-1
+* Tue Aug  4 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.10-0.1rc1
- 2020.01
+- Update to 2015.10 RC1
 * Mon Aug  3 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-3
 - Drop some unused u-boot binaries
 - Minor cleanups
 * Thu Jul 16 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-2
 - Disable boot splash on Utilite (cm_fx6)
 * Wed Jul 15 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-1
 - Update to 2015.07 GA
 * Thu Jul  2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.4rc3
 - Update to 2015.07rc3
 - Some fixes for omap4/am33xx/imx6 devices
 * Mon Jun 22 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.3rc2
 - Initial rebase of BBB/panda/wandboard generic distro boot support
 * Tue Jun 16 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.2rc2
 - Enable i.MX6 marsboard and warp
 - Use upstream build fix
 - Add patch to fix Raspberry Pi timer speed
 * Tue Jun  9 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.1rc2
 - Initial rebase to 2015.07rc2
 - Enable mx6cuboxi, 32 bit vexpress
 - Update builds for name changes, merges etc
 * Wed May 27 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.04-3
 - Enable Zynq microzed, zed and zybo
 * Sun May 10 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.04-2
 - Build nyan-big
 * Fri Apr 17 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.04-1
 - Update to 2015.04 GA
 - Build Raspberry Pi 2 config
 * Tue Apr 07 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 2015.04-0.6.rc5
 - Build U-Boot for Juno and Foundation model instead of removed board
 * Thu Apr  2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.04-0.5.rc5
 - Update to 2015.04 rc5
 * Mon Mar 30 2015 Dennis Gilmore <dennis@ausil.us> - 2015.04-0.4.rc4
 - add patch to fix booting on omap4 devices
 - refeactor spec file
 - add all sunxi boards
 - add odroid and odroid-xu3
 * Sat Mar 21 2015 Dennis Gilmore <dennis@ausil.us> - 2015.04-0.3.rc4
 - fix up bbb and wandboard to autoboot again
 * Fri Mar 20 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.04-0.2.rc4
 - Update to 2015.04 rc4
 * Fri Mar  6 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.04-0.1.rc3
 - Update to 2015.04 rc3
 - Enable AllWinner: OLinuXino-Lime2 Mele_M3 Bananapro
 - Enable i.MX6: novena hummingboard
 - Build ext support into omap3 SPL
 * Sat Feb 21 2015 Till Maas <opensource@till.name> - 2015.01-4
 - Rebuilt for Fedora 23 Change
  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
 * Sat Feb 07 2015 Hans de Goede <hdegoede@redhat.com> - 2015.01-3
 - fix build with gcc5
 * Mon Feb 02 2015 Dennis Gilmore <dennis@ausil.us> - 2015.01-2
 - enable db-mv784mp-gp
 * Tue Jan 13 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.01-1
 - update to 2015.01
 * Fri Dec 12 2014 Dennis Gilmore <dennis@ausil.us> - 2015.01-0.2.rc3
 - update to 2015.01 rc3
 * Wed Nov 26 2014 Dennis Gilmore <dennis@ausil.us> - 2015.01-0.1.rc2
 - update to 2015.01 rc2
 * Tue Nov 11 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-5
 - switch the target used for beaglebone rhbz#1161619
 * Mon Oct 27 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-4
 - port panda board to upstreamed geneic boot commands
 - append the console line automatically again
 * Fri Oct 24 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-3
 - scan both the first and second partitions for boot configs on beaglebone
 * Thu Oct 16 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2014.10-2
 - Add upstream patch to fix Tegra Jetson K1 pci-e (for network)
 * Wed Oct 15 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-1
 - update to 2014.10 final release
 * Tue Oct 14 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-0.7.rc3
 - refacter making directories for images
 - make cm_fx6 image for utilite
 * Wed Oct  8 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2014.10-0.6.rc3
 - Update to 2014.10 rc3
 - Add proposed distro patches from Debian
 - Add BBone with distro support
 * Fri Oct  3 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2014.10-0.5.rc2
 - Enable some more AllWinner devices
 * Mon Sep 29 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2014.10-0.4.rc2
 - Add generic distro support to RIoT board
 - Add patch to stabilise BananaPi network
 - Spec cleanups
 * Fri Sep 19 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2014.10-0.3.rc2
 - Add Jetson K1, RIoT Board
 - Minor spec cleanups
 - use git to apply patches
 * Thu Sep 18 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-0.2.rc2
 - Add Cubieboard, Cubieboard2, Banana Pi, Mele_A1000 and Mele_A1000G images
 * Thu Sep 18 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-0.1.rc2
 - Update to 2014.10-rc2
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.04-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.04-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 * Sun Apr 27 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-5
 - fix up aarch64 image package naming
 - drop need for cross compiler to build tools
 * Sat Apr 26 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-4
 - add hyp support to cubietruck image
 - enables kvm support
 * Thu Apr 24 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-3
 - add cubietruck u-boot image
 * Wed Apr 23 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-2
 - automatically add console line from u-boot environment to bootargs
 - when there is no console argument in the extlinux.conf file
 * Mon Apr 21 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-1
 - update to final 2014.04
 - put all images into a single rpm
 - add udoo image
 * Wed Mar 19 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-0.4.rc2
 - apply fixes for panda and beaglebone
 * Sat Mar 15 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-0.3.rc2
 - Add missing header
 - pull in patches on their way upstream to fix some issues with ti
 - systems.
 - refactor beaglebone and pandaboard patches
 * Thu Mar 13 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-0.2.rc2
 - actually apply patches
 * Wed Mar 12 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-0.1.rc2
 - update to 2014.04-rc2 
 - add patches to convert some boards to generic distro configs
 * Sun Oct 20 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-3
 - fix ftbfs for wandboard
 - use _smp_mflags
 * Sat Oct 19 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-2
 - use ext2load for dtb loading
 - cleanup duplicate defines
 * Thu Oct 17 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-1
 - update to 2013.10 final
 - refactor where u-boot binaries are stored
 * Fri Oct 04 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-0.5.rc4
 - update to 2013.10-rc4
 * Fri Sep 20 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-0.4.rc3
 - install u-boot.map for trimslice and paz00
 * Fri Sep 20 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-0.3.rc3
 - install trimslice u-boot correctly
 * Fri Sep 20 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-0.2.rc3
 - enable arndale, paz00, snow, snowball and trimslice builds
 * Thu Sep 19 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-0.1.rc3
 - update to 2013.10-rc3
 - disable panda timing patch for now
 * Mon Sep 02 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-0.1.rc2
 - update  to 2013.10-rc2
 - enable extlinux.conf support on most boards
 - add distro generic configuration options
 * Sun Sep  1 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2013.07-2
 - Add patch for Panda ES memory type issue
 * Fri Jul 26 2013 Dennis Gilmore <dennis@ausil.us> - 2013.07-1
 - update to 2013.07 final 
 * Thu Jul 18 2013 Dennis Gilmore <dennis@ausil.us> - 2013.07-0.2.rc3
 - update to 2013.07 rc3
 - set wandboard to use extlinux.conf by default
 * Thu Jul 04 2013 Dennis Gilmore <dennis@ausil.us> - 2013.07-0.1.rc2
 - update beaglebone patches 
 - update wandboard quad patch
 - upstream 2013.07-rc2 update
 * Wed Jun 05 2013 Dennis Gilmore <dennis@ausil.us> - 2013.04-5
 - add patches to support ext filesystems in exynos and omap SPL's
 - drop bringing in arm-boot-config on arm systems
 - build a highbank u-boot (intention is to use in qemu)
 - add wandboard quad u-boot
 * Wed May 22 2013 Dennis Gilmore <dennis@ausil.us> - 2013.04-4
 - build vexpress image
 - add uEnv.txt files for various supported omap systems
 * Sat May 18 2013 Dennis Gilmore <dennis@ausil.us> - 2013.04-3
 - add uevm, the omap5 based pandaboard
 - Require arm-boot-config on arm arches 
 * Mon May 13 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2013.04-2
 - Add patches for initial support for the Beagle Bone Black
 * Sun Apr 21 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2013.04-1
 - Update to 2013.04 release
 - Build i.MX6 Wandboard Dual Lite and Solo Boards
 * Sun Mar 31 2013 Dennis Gilmore <dennis@ausil.us> - 2013.04-0.1.rc1
 - update to 2013.04-rc2
 * Fri Mar 01 2013 Dennis Gilmore <dennis@ausil.us> - 2013.01.01-1
 - update to 2013.01.01 for bug#907139
 * Thu Jan 24 2013 Dennis Gilmore <dennis@ausil.us> - 2013.01-1
 - update to 2013.01 release
 * Wed Oct 17 2012 Dennis Gilmore <dennis@ausil.us> - 2012.10-1
 - update to final 2012.10 release
 * Thu Oct 11 2012 Mauro Carvalho Chehab <mchehab@redhat.com>
 - Also generate uboot for SMDK310
 * Tue Oct 09 2012 Dennis Gilmore <dennis@ausil.us> - 2012.10-0.1.rc3
 - update to 2010.10 rc3
 * Fri Aug 24 2012 Dennis Gilmore <dennis@ausil.us> - 2012.01-1
 - update to 2012.07 release
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2012.07-0.2.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 * Thu Jul 12 2012 Dennis Gilmore <dennis@ausil.us> - 2012.07-0.1.rc1
 - update to rc1 of 2012.07 release
 * Sat Jul 07 2012 Dennis Gilmore <dennis@ausil.us> - 2012.04.01-4
 - still build the beagleboard image
 * Sat Jul 07 2012 Dennis Gilmore <dennis@ausil.us> - 2012.04.01-3
 - build beaglebone uboot images
 * Mon Jun 25 2012 Dennis Gilmore <dennis@ausil.us> - 2012.04.01-2
 - add patch so the MLO detects fat16 partitions correctly
 * Mon May 07 2012 Dennis Gilmore <dennis@ausil.us> - 2012.04.01-1
 - update to 2012.04.01 release
 - http://lists.denx.de/pipermail/u-boot/2012-April/123011.html
 * Tue Apr 24 2012 Dennis Gilmore <dennis@ausil.us> - 2012.04-1
 - update to final 2012.04 release
 * Thu Apr 19 2012 Dennis Gilmore <dennis@ausil.us> - 2012.04-0.1.rc3
 - update to 2012.04-rc3
 - build uboot binaries for beagle, panda and origen boards
 * Thu Mar 08 2012 Dennis Gilmore <dennis@ausil.us> - 2011.12-1
 - update to 2011.12 release
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2011.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 * Thu Apr 14 2011 Dan Horák <dan[at]danny.cz> - 2011.03-1
 - updated to to 2011.03
 - build the tool for manipulation with environment only on arm
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2010.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 * Thu May 27 2010 Dan Horák <dan[at]danny.cz> 2010.03-1
 - updated to to 2010.03
 - applied review feedback - added docs and expanded description
 - pass proper CFLAGS to the compiler
 * Sat Nov 14 2009 Dan Horák <dan[at]danny.cz> 2009.08-1
 - initial Fedora version
--- 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,82 +0,0 @@
 From cc3700b5c65494547308df395fe63166ff48a1e3 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
 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
 fiction.  In reality there will be one small (V)FAT partition containing
 grub (or whatever the payload may be), and a second boot partition
 containing kernel/initrd/fdt (typically ext4).  It is this second
 partition where we should be looking for a FDT to load.
 So instead scan all the partitions of the disk containing the EFI
 payload.  This matches where grub looks for kernel/initrd (barring
 custom grub.cfg, in which case the user can use grub's 'devicetree'
 command to load the correct FDT).
 The other option is somehow passing the ${fdtfile} to grub so that it
 can load the FDT based on selected kernel version location (which grub
 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(-)
 diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
 index ff29ef5a905..769477cd80e 100644
 --- a/include/config_distro_bootcmd.h
 +++ b/include/config_distro_bootcmd.h
@@ -142,24 +142,37 @@
 	"load_efi_dtb="                                                   \
 		"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"                                   \
 	\
 	"efi_dtb_prefixes=/ /dtb/ /dtb/current/\0"                        \
 -	"scan_dev_for_efi="                                               \
 +	"scan_dev_for_dtb="                                               \
 		"setenv efi_fdtfile ${fdtfile}; "                         \
 		BOOTENV_EFI_SET_FDTFILE_FALLBACK                          \
 -		"for prefix in ${efi_dtb_prefixes}; do "                  \
 -			"if test -e ${devtype} "                          \
 -					"${devnum}:${distro_bootpart} "   \
 -					"${prefix}${efi_fdtfile}; then "  \
 -				"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}; "                            \
 +		"for dtb_devp in ${dtb_devplist}; do "                    \
 +			"for prefix in ${efi_dtb_prefixes}; do "          \
 +				"if test -e ${devtype} "                  \
 +						"${devnum}:${dtb_devp} "  \
 +						"${prefix}${efi_fdtfile};"\
 +						" then "                  \
 +					"echo Found DTB ${devtype} "      \
 +						"${devnum}:${dtb_devp} "  \
 +						"${prefix}${efi_fdtfile};"\
 +					"run load_efi_dtb; "              \
 +				"fi;"                                     \
 +			"done; "                                          \
 +		"done; "                                                  \
 +		"run boot_efi_bootmgr\0"                                  \
 +	"scan_dev_for_efi="                                               \
 		"if test -e ${devtype} ${devnum}:${distro_bootpart} "     \
 					"efi/boot/"BOOTEFI_NAME"; then "  \
 				"echo Found EFI removable media binary "  \
 					"efi/boot/"BOOTEFI_NAME"; "       \
 -				"run boot_efi_binary; "                   \
 +				"run scan_dev_for_dtb; "                  \
 				"echo EFI LOAD FAILED: continuing...; "   \
 		"fi; "                                                    \
 		"setenv efi_fdtfile\0"
 -- 
 2.29.2
--- a/uefi-use-Fedora-specific-path-name.patch
+++ b/uefi-use-Fedora-specific-path-name.patch
@ -1,50 +0,0 @@
 From d8fcb72d566b0ebca1613555ac13c0798817487e 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
 Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
 include/config_distro_bootcmd.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
 index 769477cd80e..22ce3685758 100644
 --- a/include/config_distro_bootcmd.h
 +++ b/include/config_distro_bootcmd.h
@@ -92,9 +92,9 @@
 #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"
 #elif defined(CONFIG_X86_RUN_32BIT)
 #define BOOTEFI_NAME "bootia32.efi"
 #elif defined(CONFIG_X86_RUN_64BIT)
@@ -132,7 +132,7 @@
 	\
 	"boot_efi_binary="                                                \
 		"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="                                               \
 		"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 scan_dev_for_dtb; "                  \
 				"echo EFI LOAD FAILED: continuing...; "   \
 		"fi; "                                                    \
 -- 
 2.29.2
--- a/usb-kbd-fixes.patch
+++ b/usb-kbd-fixes.patch
@ -1,115 +0,0 @@
 From a49845f198af088c4e5e0019edbf519344d78c97 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
 Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
 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
 --- a/common/usb_kbd.c
 +++ b/common/usb_kbd.c
@@ -518,25 +518,59 @@ static int probe_usb_keyboard(struct usb_device *dev)
 		return error;
 	stdinname = env_get("stdin");
 -#if CONFIG_IS_ENABLED(CONSOLE_MUX)
 -	error = iomux_doenv(stdin, stdinname);
 -	if (error)
 -		return error;
 -#else
 -	/* Check if this is the standard input device. */
 -	if (strcmp(stdinname, DEVNAME))
 -		return 1;
 +	if (CONFIG_IS_ENABLED(CONSOLE_MUX)) {
 +		char *devname = DEVNAME;
 +		char *newstdin = NULL;
 +		/*
 +		 * stdin might not be set yet.. either way, with console-
 +		 * mux the sensible thing to do is add ourselves to the
 +		 * list of stdio devices:
 +		 */
 +		if (stdinname && !strstr(stdinname, DEVNAME)) {
 +			newstdin = malloc(strlen(stdinname) +
 +					strlen(","DEVNAME) + 1);
 +			sprintf(newstdin, "%s,"DEVNAME, stdinname);
 +			stdinname = newstdin;
 +		} else if (!stdinname) {
 +			stdinname = devname;
 +		}
 +		error = iomux_doenv(stdin, stdinname);
 +		free(newstdin);
 +		if (error)
 +			goto unregister_stdio;
 +	} else {
 +		/* Check if this is the standard input device. */
 +		if (strcmp(stdinname, DEVNAME)) {
 +			error = -1;
 +			goto unregister_stdio;
 +		}
 -	/* Reassign the console */
 -	if (overwrite_console())
 -		return 1;
 +		/* Reassign the console */
 +		if (overwrite_console()) {
 +			error = -1;
 +			goto unregister_stdio;
 +		}
 -	error = console_assign(stdin, DEVNAME);
 -	if (error)
 -		return error;
 -#endif
 +		error = console_assign(stdin, DEVNAME);
 +		if (error)
 +			goto unregister_stdio;
 +	}
 +
 +	return 0;
 +unregister_stdio:
 +	/*
 +	 * If probe fails, the device will be removed.. leaving dangling
 +	 * pointers if the stdio device is not unregistered.  If u-boot
 +	 * is built without stdio_deregister(), just pretend to succeed
 +	 * in order to avoid dangling pointers.
 +	 */
 +#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
 +	stdio_deregister(DEVNAME, 1);
 +	return error;
 +#else
 	return 0;
 +#endif
 }
 #if !CONFIG_IS_ENABLED(DM_USB)
@@ -642,7 +676,7 @@ static int usb_kbd_remove(struct udevice *dev)
 	return 0;
 err:
 -	printf("%s: warning, ret=%d", __func__, ret);
 +	printf("%s: warning, ret=%d\n", __func__, ret);
 	return ret;
 }
 diff --git a/include/console.h b/include/console.h
 index e935c601f12..6382ec8e0d6 100644
 --- a/include/console.h
 +++ b/include/console.h
@@ -56,8 +56,6 @@ int console_announce_r(void);
 /*
  * CONSOLE multiplexing.
  */
 -#ifdef CONFIG_CONSOLE_MUX
 #include <iomux.h>
 -#endif
 #endif
 -- 
 2.19.2
`@ -1 +1 @@`
	`SHA512 (u-boot-2021.01-rc4.tar.bz2) = 6de2c60d02276f4eed31b5baf2d8239ad0af30c9d341339a4cd7fa0786068cb5faa1ab8bd0b4155e536962e1a4869906f60f1d2a1e50b0ed15e98c2e84d6a97b`	`3a8613d753dfa707c937991a35404510 u-boot-2016.05.tar.bz2`