> Date: Sat, 6 May 2023 17:36:53 +0200
> From: Patrick Wildt <[email protected]>
>
> On Fri, Nov 18, 2022 at 12:53:44PM +0000, Klemens Nanni wrote:
> > On Mon, Nov 14, 2022 at 11:37:05PM +0100, Patrick Wildt wrote:
> > > Hi,
> > >
> > > the u-boot and dtb ports haven't been updated in a while, mostly because
> > > updating those regularly breaks working machines. I think it's time for
> > > another update, so here's a diff for both.
> > >
> > > Before this heads into the tree it would be nice to get some testing
> > > from people with Pinebook Pro, RockPro64, and/or especially a BeagleBone
> > > Black.
> > >
> > > I reverted the change that switches from the 'old' cpsw switch driver
> > > model to the 'new' one. This should allow is to update the dtbs.
> > >
> > > I've personally verified that U-Boot+DTB boot fine on NanoPi R2s, but
> > > we have many more combinations.
> > >
> > > I can provide pre-built unsigned packages upon request.
> >
> > I installed u-boot-aarch64-2022.10.tgz built with dtb-6.0.8.tgz and
> > followed INSTALL.arm64 to flash the new files onto my Pinebook Pro's
> > eMMC.
> >
> > There's a u-boot logo visible in the upper right corner and OpenBSD
> > still boots, but the screen remains black now.
> >
> > Previously, I'd see X when xenodm started, now I don't see anything.
> > No warnings or errors on serial console.
> >
> > I also can't switch to another TTY to get a shell.
> >
> > Reflashing u-boot from ports makes X work again, no OS changes needed.
> >
> > I had the same issue on the same device when trying u-boot 2022.07 some
> > months ago.
>
> While I did not find the root cause of this back then, a U-Boot 2023.04
> with a dtb from Linux 6.3 does seem to work on my machine. Maybe that
> was something caused by U-Boot that is now fixed.
>
> ok?
As I've said before, the u-boot developers have poor quality control
and this will almost certainly break some targets.
I think the way forward is to have a u-boot port per SoC such that we
can leave older SoCs using an older U-Boot version that we know to be
good while newer SoCs can switch to a newer version after testing a
few boards.
> diff --git a/sysutils/u-boot/Makefile b/sysutils/u-boot/Makefile
> index d2dd2fad980..4c8acde3638 100644
> --- a/sysutils/u-boot/Makefile
> +++ b/sysutils/u-boot/Makefile
> @@ -7,8 +7,7 @@ FLAVORS= aarch64 arm riscv64
> FLAVOR?= arm
>
> COMMENT= U-Boot firmware
> -VERSION= 2021.10
> -REVISION= 6
> +VERSION= 2023.04
> DISTNAME= u-boot-${VERSION}
> PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
> FULLPKGNAME= ${PKGNAME}
> @@ -24,7 +23,9 @@ PKG_ARCH= *
>
> BUILD_DEPENDS= devel/bison \
> devel/dtc \
> - devel/swig
> + devel/swig \
> + security/gnutls \
> + sysutils/e2fsprogs
>
> # for pkg_resources used in tools/binman/control.py
> BUILD_DEPENDS+= devel/py-setuptools${MODPY_FLAVOR}
> @@ -47,6 +48,7 @@ RK3328_BL31=
> "${LOCALBASE}/share/arm-trusted-firmware/rk3328-bl31.elf"
> RK3399_BL31= "${LOCALBASE}/share/arm-trusted-firmware/rk3399-bl31.elf"
> SUNXI_BL31= "${LOCALBASE}/share/arm-trusted-firmware/sun50i_a64-bl31.bin"
> SUNXI_H6_BL31=
> "${LOCALBASE}/share/arm-trusted-firmware/sun50i_h6-bl31.bin"
> +SUNXI_SCP= /dev/null
> .elif "${FLAVOR}" == "arm"
> BUILD_DEPENDS+= devel/arm-none-eabi/gcc,arm
> MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-"
> @@ -163,7 +165,7 @@ FILES=\
> u-boot-sunxi-with-spl.bin \
> u-boot.imx \
> u-boot-dtb.imx \
> - u-boot-spl.kwb \
> + u-boot-with-spl.kwb \
> u-boot-with-spl.bin \
> u-boot.itb \
> u-boot-rockchip.bin \
> @@ -210,20 +212,20 @@ do-build:
> .if "${BOARD:M*_h64*}"
> cd ${WRKSRC} && \
> mkdir -p build/${BOARD} && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} SCP=${SUNXI_SCP} \
> + ${MAKE_PROGRAM} ${MAKE_FLAGS} O="build/${BOARD}" \
> -f ${MAKE_FILE} "${BOARD}"_defconfig && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} SCP=${SUNXI_SCP} \
> + ${MAKE_PROGRAM} ${MAKE_FLAGS} O="build/${BOARD}" \
> -f ${MAKE_FILE} ${ALL_TARGET}
> .else
> cd ${WRKSRC} && \
> mkdir -p build/${BOARD} && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} SCP=${SUNXI_SCP} \
> + ${MAKE_PROGRAM} ${MAKE_FLAGS} O="build/${BOARD}" \
> -f ${MAKE_FILE} "${BOARD}"_defconfig && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} SCP=${SUNXI_SCP} \
> + ${MAKE_PROGRAM} ${MAKE_FLAGS} O="build/${BOARD}" \
> -f ${MAKE_FILE} ${ALL_TARGET}
> .endif
> if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
> diff --git a/sysutils/u-boot/distinfo b/sysutils/u-boot/distinfo
> index 674a428905c..b30e5967428 100644
> --- a/sysutils/u-boot/distinfo
> +++ b/sysutils/u-boot/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (u-boot-2021.10.tar.bz2) =
> zecj4ZJi5kbyZw0l5exLGzaEkN6VDU4mJ1qYjDbfC9Q=
> -SIZE (u-boot-2021.10.tar.bz2) = 17358295
> +SHA256 (u-boot-2023.04.tar.bz2) =
> 4xyskVRf9BtxzsXYwir9aVZFzW4qRCzNrKzWBTQGk0E=
> +SIZE (u-boot-2023.04.tar.bz2) = 19130089
> diff --git a/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> b/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> deleted file mode 100644
> index 408ea266e16..00000000000
> --- a/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -Hook up the dtb to the build for PINE H64 model B.
> -
> -Index: arch/arm/dts/Makefile
> ---- arch/arm/dts/Makefile.orig
> -+++ arch/arm/dts/Makefile
> -@@ -642,6 +642,7 @@ dtb-$(CONFIG_MACH_SUN50I_H6) += \
> - sun50i-h6-orangepi-lite2.dtb \
> - sun50i-h6-orangepi-one-plus.dtb \
> - sun50i-h6-pine-h64.dtb \
> -+ sun50i-h6-pine-h64-model-b.dtb \
> - sun50i-h6-tanix-tx6.dtb
> - dtb-$(CONFIG_MACH_SUN50I_H616) += \
> - sun50i-h616-orangepi-zero2.dtb
> diff --git
> a/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-pinebook-pro_dts
> b/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-pinebook-pro_dts
> index fd76b32ffd1..cbd341ca946 100644
> --- a/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-pinebook-pro_dts
> +++ b/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-pinebook-pro_dts
> @@ -1,7 +1,7 @@
> Index: arch/arm/dts/rk3399-pinebook-pro.dts
> --- arch/arm/dts/rk3399-pinebook-pro.dts.orig
> +++ arch/arm/dts/rk3399-pinebook-pro.dts
> -@@ -25,7 +25,7 @@
> +@@ -26,7 +26,7 @@
> };
>
> chosen {
> diff --git a/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-u-boot_dtsi
> b/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-u-boot_dtsi
> index bd5e3b91fe7..b197bef69e5 100644
> --- a/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-u-boot_dtsi
> +++ b/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-u-boot_dtsi
> @@ -6,7 +6,7 @@ fixes emmc boot on pinebook pro
> Index: arch/arm/dts/rk3399-u-boot.dtsi
> --- arch/arm/dts/rk3399-u-boot.dtsi.orig
> +++ arch/arm/dts/rk3399-u-boot.dtsi
> -@@ -88,6 +88,10 @@
> +@@ -93,6 +93,10 @@
> u-boot,dm-pre-reloc;
> };
>
> diff --git
> a/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h6-pine-h64-model-b_dts
> b/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h6-pine-h64-model-b_dts
> deleted file mode 100644
> index ca4cc0e0609..00000000000
> ---
> a/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h6-pine-h64-model-b_dts
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -Copy the device tree file for PINE H64 model B from Linux kernel:
> -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts?h=v5.14
> -
> -Index: arch/arm/dts/sun50i-h6-pine-h64-model-b.dts
> ---- arch/arm/dts/sun50i-h6-pine-h64-model-b.dts.orig
> -+++ arch/arm/dts/sun50i-h6-pine-h64-model-b.dts
> -@@ -0,0 +1,51 @@
> -+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> -+/*
> -+ * Copyright (C) 2019 Corentin LABBE <[email protected]>
> -+ */
> -+
> -+#include "sun50i-h6-pine-h64.dts"
> -+
> -+/ {
> -+ model = "Pine H64 model B";
> -+ compatible = "pine64,pine-h64-model-b", "allwinner,sun50i-h6";
> -+
> -+ /delete-node/ reg_gmac_3v3;
> -+
> -+ wifi_pwrseq: wifi_pwrseq {
> -+ compatible = "mmc-pwrseq-simple";
> -+ reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */
> -+ post-power-on-delay-ms = <200>;
> -+ };
> -+};
> -+
> -+&hdmi_connector {
> -+ /delete-property/ ddc-en-gpios;
> -+};
> -+
> -+&emac {
> -+ phy-supply = <®_aldo2>;
> -+};
> -+
> -+&mmc1 {
> -+ vmmc-supply = <®_cldo3>;
> -+ vqmmc-supply = <®_aldo1>;
> -+ mmc-pwrseq = <&wifi_pwrseq>;
> -+ bus-width = <4>;
> -+ non-removable;
> -+ status = "okay";
> -+};
> -+
> -+&uart1 {
> -+ pinctrl-names = "default";
> -+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
> -+ uart-has-rtscts;
> -+ status = "okay";
> -+
> -+ bluetooth {
> -+ compatible = "realtek,rtl8723bs-bt";
> -+ device-wake-gpios = <&r_pio 1 2 GPIO_ACTIVE_HIGH>; /* PM2 */
> -+ host-wake-gpios = <&r_pio 1 1 GPIO_ACTIVE_HIGH>; /* PM1 */
> -+ enable-gpios = <&r_pio 1 4 GPIO_ACTIVE_HIGH>; /* PM4 */
> -+ max-speed = <1500000>;
> -+ };
> -+};
> diff --git a/sysutils/u-boot/patches/patch-arch_riscv_Makefile
> b/sysutils/u-boot/patches/patch-arch_riscv_Makefile
> deleted file mode 100644
> index 5f116356ec6..00000000000
> --- a/sysutils/u-boot/patches/patch-arch_riscv_Makefile
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Index: arch/riscv/Makefile
> ---- arch/riscv/Makefile.orig
> -+++ arch/riscv/Makefile
> -@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y)
> - CMODEL = medany
> - endif
> -
> --ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \
> -+RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C)
> -+
> -+# Newer binutils versions default to ISA spec version 20191213 which moves
> some
> -+# instructions from the I extension to the Zicsr and Zifencei extensions.
> -+toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI)
> -march=$(RISCV_MARCH)_zicsr_zifencei)
> -+ifeq ($(toolchain-need-zicsr-zifencei),y)
> -+ RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei
> -+endif
> -+
> -+ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \
> - -mcmodel=$(CMODEL)
> -
> - PLATFORM_CPPFLAGS += $(ARCH_FLAGS)
> diff --git a/sysutils/u-boot/patches/patch-configs_firefly-rk3399_defconfig
> b/sysutils/u-boot/patches/patch-configs_firefly-rk3399_defconfig
> index fee35fbdc4e..3daaeecb30f 100644
> --- a/sysutils/u-boot/patches/patch-configs_firefly-rk3399_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_firefly-rk3399_defconfig
> @@ -1,12 +1,12 @@
> Index: configs/firefly-rk3399_defconfig
> --- configs/firefly-rk3399_defconfig.orig
> +++ configs/firefly-rk3399_defconfig
> -@@ -48,7 +48,7 @@ CONFIG_PWM_ROCKCHIP=y
> - CONFIG_DM_RESET=y
> +@@ -59,7 +59,7 @@ CONFIG_REGULATOR_RK8XX=y
> + CONFIG_PWM_ROCKCHIP=y
> CONFIG_DM_RNG=y
> CONFIG_RNG_ROCKCHIP=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> + CONFIG_SYS_NS16550_MEM32=y
> CONFIG_SYSRESET=y
> - CONFIG_USB=y
> diff --git a/sysutils/u-boot/patches/patch-configs_nanopc-t4-rk3399_defconfig
> b/sysutils/u-boot/patches/patch-configs_nanopc-t4-rk3399_defconfig
> index 663c7dceddd..247da860c67 100644
> --- a/sysutils/u-boot/patches/patch-configs_nanopc-t4-rk3399_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_nanopc-t4-rk3399_defconfig
> @@ -1,12 +1,12 @@
> Index: configs/nanopc-t4-rk3399_defconfig
> --- configs/nanopc-t4-rk3399_defconfig.orig
> +++ configs/nanopc-t4-rk3399_defconfig
> -@@ -42,7 +42,7 @@ CONFIG_REGULATOR_PWM=y
> +@@ -53,7 +53,7 @@ CONFIG_PMIC_RK8XX=y
> + CONFIG_REGULATOR_PWM=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> - CONFIG_DM_RESET=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> + CONFIG_SYS_NS16550_MEM32=y
> CONFIG_SYSRESET=y
> - CONFIG_USB=y
> diff --git
> a/sysutils/u-boot/patches/patch-configs_nanopi-neo4-rk3399_defconfig
> b/sysutils/u-boot/patches/patch-configs_nanopi-neo4-rk3399_defconfig
> index 99ed3a89fd3..ca9130920cf 100644
> --- a/sysutils/u-boot/patches/patch-configs_nanopi-neo4-rk3399_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_nanopi-neo4-rk3399_defconfig
> @@ -1,12 +1,12 @@
> Index: configs/nanopi-neo4-rk3399_defconfig
> --- configs/nanopi-neo4-rk3399_defconfig.orig
> +++ configs/nanopi-neo4-rk3399_defconfig
> -@@ -38,7 +38,7 @@ CONFIG_PMIC_RK8XX=y
> +@@ -49,7 +49,7 @@ CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> + CONFIG_SYS_NS16550_MEM32=y
> CONFIG_SYSRESET=y
> - CONFIG_USB=y
> diff --git
> a/sysutils/u-boot/patches/patch-configs_nanopi-r2s-rk3328_defconfig
> b/sysutils/u-boot/patches/patch-configs_nanopi-r2s-rk3328_defconfig
> index 0758aba962f..845ca861e30 100644
> --- a/sysutils/u-boot/patches/patch-configs_nanopi-r2s-rk3328_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_nanopi-r2s-rk3328_defconfig
> @@ -1,12 +1,12 @@
> Index: configs/nanopi-r2s-rk3328_defconfig
> --- configs/nanopi-r2s-rk3328_defconfig.orig
> +++ configs/nanopi-r2s-rk3328_defconfig
> -@@ -76,7 +76,7 @@ CONFIG_RAM=y
> +@@ -89,7 +89,7 @@ CONFIG_PWM_ROCKCHIP=y
> + CONFIG_RAM=y
> CONFIG_SPL_RAM=y
> CONFIG_TPL_RAM=y
> - CONFIG_DM_RESET=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> + CONFIG_SYS_NS16550_MEM32=y
> CONFIG_SYSINFO=y
> - CONFIG_SYSRESET=y
> diff --git
> a/sysutils/u-boot/patches/patch-configs_nanopi-r4s-rk3399_defconfig
> b/sysutils/u-boot/patches/patch-configs_nanopi-r4s-rk3399_defconfig
> index d1d5b16f616..75a0953e9eb 100644
> --- a/sysutils/u-boot/patches/patch-configs_nanopi-r4s-rk3399_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_nanopi-r4s-rk3399_defconfig
> @@ -1,12 +1,12 @@
> Index: configs/nanopi-r4s-rk3399_defconfig
> --- configs/nanopi-r4s-rk3399_defconfig.orig
> +++ configs/nanopi-r4s-rk3399_defconfig
> -@@ -39,7 +39,7 @@ CONFIG_REGULATOR_PWM=y
> +@@ -54,7 +54,7 @@ CONFIG_REGULATOR_PWM=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> - CONFIG_RAM_RK3399_LPDDR4=y
> + CONFIG_RAM_ROCKCHIP_LPDDR4=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> - CONFIG_SYSRESET=y
> - CONFIG_USB=y
> + CONFIG_SYS_NS16550_MEM32=y
> + CONFIG_SYSINFO=y
> diff --git a/sysutils/u-boot/patches/patch-configs_pine_h64-model-b_defconfig
> b/sysutils/u-boot/patches/patch-configs_pine_h64-model-b_defconfig
> index be5a9edecbf..168769b605c 100644
> --- a/sysutils/u-boot/patches/patch-configs_pine_h64-model-b_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_pine_h64-model-b_defconfig
> @@ -3,7 +3,7 @@ Add defconfig for PINE H64 model B.
> Index: configs/pine_h64-model-b_defconfig
> --- configs/pine_h64-model-b_defconfig.orig
> +++ configs/pine_h64-model-b_defconfig
> -@@ -0,0 +1,21 @@
> +@@ -0,0 +1,27 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_SUNXI=y
> +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-pine-h64-model-b"
> @@ -17,8 +17,14 @@ Index: configs/pine_h64-model-b_defconfig
> +CONFIG_SPL_SPI_SUNXI=y
> +# CONFIG_PSCI_RESET is not set
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> ++CONFIG_SPL_STACK=0x118000
> ++CONFIG_SYS_PBSIZE=1024
> ++CONFIG_SYS_BOOTM_LEN=0x2000000
> ++CONFIG_SUPPORT_EMMC_BOOT=y
> ++CONFIG_SPI_FLASH_WINBOND=y
> +CONFIG_SUN8I_EMAC=y
> +CONFIG_PHY_SUN50I_USB3=y
> ++CONFIG_SPI=y
> +CONFIG_USB_XHCI_HCD=y
> +CONFIG_USB_XHCI_DWC3=y
> +CONFIG_USB_EHCI_HCD=y
> diff --git
> a/sysutils/u-boot/patches/patch-configs_pinebook-pro-rk3399_defconfig
> b/sysutils/u-boot/patches/patch-configs_pinebook-pro-rk3399_defconfig
> index 45730a39d44..40ef8136ad7 100644
> --- a/sysutils/u-boot/patches/patch-configs_pinebook-pro-rk3399_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_pinebook-pro-rk3399_defconfig
> @@ -3,8 +3,8 @@ Disable CONFIG_USE_PREBOOT / usb start to fix boot.
> Index: configs/pinebook-pro-rk3399_defconfig
> --- configs/pinebook-pro-rk3399_defconfig.orig
> +++ configs/pinebook-pro-rk3399_defconfig
> -@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> - CONFIG_SPL_SPI_SUPPORT=y
> +@@ -20,7 +20,7 @@ CONFIG_SPL_SPI=y
> + CONFIG_SYS_LOAD_ADDR=0x800800
> CONFIG_DEBUG_UART=y
> CONFIG_BOOTDELAY=3
> -CONFIG_USE_PREBOOT=y
> @@ -12,12 +12,12 @@ Index: configs/pinebook-pro-rk3399_defconfig
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_MISC_INIT_R=y
> -@@ -67,7 +67,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
> - CONFIG_DM_RESET=y
> +@@ -78,7 +78,7 @@ CONFIG_PWM_ROCKCHIP=y
> + CONFIG_RAM_ROCKCHIP_LPDDR4=y
> CONFIG_DM_RNG=y
> CONFIG_RNG_ROCKCHIP=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> + CONFIG_SYS_NS16550_MEM32=y
> CONFIG_ROCKCHIP_SPI=y
> - CONFIG_SYSRESET=y
> diff --git a/sysutils/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
> b/sysutils/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
> index 9d28a6ca3e7..7c5ff36729d 100644
> --- a/sysutils/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
> @@ -1,12 +1,12 @@
> Index: configs/rock-pi-4-rk3399_defconfig
> --- configs/rock-pi-4-rk3399_defconfig.orig
> +++ configs/rock-pi-4-rk3399_defconfig
> -@@ -48,7 +48,7 @@ CONFIG_REGULATOR_RK8XX=y
> +@@ -66,7 +66,7 @@ CONFIG_REGULATOR_PWM=y
> + CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> - CONFIG_RAM_RK3399_LPDDR4=y
> - CONFIG_DM_RESET=y
> + CONFIG_RAM_ROCKCHIP_LPDDR4=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> + CONFIG_SYS_NS16550_MEM32=y
> CONFIG_SYSRESET=y
> - CONFIG_USB=y
> diff --git
> a/sysutils/u-boot/patches/patch-configs_rock-pi-n10-rk3399pro_defconfig
> b/sysutils/u-boot/patches/patch-configs_rock-pi-n10-rk3399pro_defconfig
> index 5d09712da56..7bc16ab0d94 100644
> --- a/sysutils/u-boot/patches/patch-configs_rock-pi-n10-rk3399pro_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_rock-pi-n10-rk3399pro_defconfig
> @@ -1,12 +1,12 @@
> Index: configs/rock-pi-n10-rk3399pro_defconfig
> --- configs/rock-pi-n10-rk3399pro_defconfig.orig
> +++ configs/rock-pi-n10-rk3399pro_defconfig
> -@@ -50,7 +50,7 @@ CONFIG_REGULATOR_RK8XX=y
> +@@ -61,7 +61,7 @@ CONFIG_REGULATOR_PWM=y
> + CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> # CONFIG_RAM_ROCKCHIP_DEBUG is not set
> - CONFIG_DM_RESET=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> + CONFIG_SYS_NS16550_MEM32=y
> CONFIG_SYSRESET=y
> - CONFIG_USB=y
> diff --git a/sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig
> b/sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig
> index 6875e5b6c41..5ffb5ca84d4 100644
> --- a/sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig
> @@ -1,12 +1,12 @@
> Index: configs/rock64-rk3328_defconfig
> --- configs/rock64-rk3328_defconfig.orig
> +++ configs/rock64-rk3328_defconfig
> -@@ -78,7 +78,7 @@ CONFIG_RAM=y
> +@@ -90,7 +90,7 @@ CONFIG_PWM_ROCKCHIP=y
> + CONFIG_RAM=y
> CONFIG_SPL_RAM=y
> CONFIG_TPL_RAM=y
> - CONFIG_DM_RESET=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> + CONFIG_SYS_NS16550_MEM32=y
> CONFIG_ROCKCHIP_SPI=y
> - CONFIG_SYSINFO=y
> diff --git a/sysutils/u-boot/patches/patch-configs_rock960-rk3399_defconfig
> b/sysutils/u-boot/patches/patch-configs_rock960-rk3399_defconfig
> index c31d35ebaa5..cf1ebb22abe 100644
> --- a/sysutils/u-boot/patches/patch-configs_rock960-rk3399_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_rock960-rk3399_defconfig
> @@ -3,21 +3,21 @@ Disable CONFIG_USE_PREBOOT / usb start to fix boot.
> Index: configs/rock960-rk3399_defconfig
> --- configs/rock960-rk3399_defconfig.orig
> +++ configs/rock960-rk3399_defconfig
> -@@ -8,7 +8,7 @@ CONFIG_TARGET_ROCK960_RK3399=y
> - CONFIG_DEBUG_UART_BASE=0xFF1A0000
> +@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
> CONFIG_DEBUG_UART_CLOCK=24000000
> + CONFIG_SYS_LOAD_ADDR=0x800800
> CONFIG_DEBUG_UART=y
> -CONFIG_USE_PREBOOT=y
> +# CONFIG_USE_PREBOOT is not set
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_MISC_INIT_R=y
> -@@ -51,7 +51,7 @@ CONFIG_PWM_ROCKCHIP=y
> - CONFIG_DM_RESET=y
> +@@ -63,7 +63,7 @@ CONFIG_REGULATOR_RK8XX=y
> + CONFIG_PWM_ROCKCHIP=y
> CONFIG_DM_RNG=y
> CONFIG_RNG_ROCKCHIP=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> + CONFIG_SYS_NS16550_MEM32=y
> CONFIG_SYSRESET=y
> - CONFIG_USB=y
> diff --git a/sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig
> b/sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig
> index 12095e3e47b..381c7697a0b 100644
> --- a/sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig
> @@ -3,21 +3,21 @@ Disable CONFIG_USE_PREBOOT / usb start to fix boot.
> Index: configs/rockpro64-rk3399_defconfig
> --- configs/rockpro64-rk3399_defconfig.orig
> +++ configs/rockpro64-rk3399_defconfig
> -@@ -12,7 +12,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000
> - CONFIG_SPL_SPI_FLASH_SUPPORT=y
> - CONFIG_SPL_SPI_SUPPORT=y
> +@@ -21,7 +21,7 @@ CONFIG_SYS_LOAD_ADDR=0x800800
> CONFIG_DEBUG_UART=y
> + CONFIG_BOOTSTAGE=y
> + CONFIG_BOOTSTAGE_REPORT=y
> -CONFIG_USE_PREBOOT=y
> +# CONFIG_USE_PREBOOT is not set
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_MISC_INIT_R=y
> -@@ -58,7 +58,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
> - CONFIG_DM_RESET=y
> - CONFIG_DM_RNG=y
> +@@ -80,7 +80,7 @@ CONFIG_DM_RNG=y
> CONFIG_RNG_ROCKCHIP=y
> + CONFIG_SCSI=y
> + CONFIG_DM_SCSI=y
> -CONFIG_BAUDRATE=1500000
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> + CONFIG_SYS_NS16550_MEM32=y
> CONFIG_ROCKCHIP_SPI=y
> - CONFIG_SYSRESET=y
> diff --git a/sysutils/u-boot/patches/patch-configs_rpi_2_defconfig
> b/sysutils/u-boot/patches/patch-configs_rpi_2_defconfig
> index afcec497e71..0fbfece1520 100644
> --- a/sysutils/u-boot/patches/patch-configs_rpi_2_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_rpi_2_defconfig
> @@ -17,7 +17,7 @@ to variants of RPi hardware.
> Index: configs/rpi_2_defconfig
> --- configs/rpi_2_defconfig.orig
> +++ configs/rpi_2_defconfig
> -@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
> +@@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y
> CONFIG_CMD_MMC=y
> CONFIG_CMD_USB=y
> CONFIG_CMD_FS_UUID=y
> diff --git a/sysutils/u-boot/patches/patch-configs_rpi_3_32b_defconfig
> b/sysutils/u-boot/patches/patch-configs_rpi_3_32b_defconfig
> index e7388e17631..bc108dd510d 100644
> --- a/sysutils/u-boot/patches/patch-configs_rpi_3_32b_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_rpi_3_32b_defconfig
> @@ -17,7 +17,7 @@ to variants of RPi hardware.
> Index: configs/rpi_3_32b_defconfig
> --- configs/rpi_3_32b_defconfig.orig
> +++ configs/rpi_3_32b_defconfig
> -@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
> +@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y
> CONFIG_CMD_MMC=y
> CONFIG_CMD_USB=y
> CONFIG_CMD_FS_UUID=y
> diff --git a/sysutils/u-boot/patches/patch-configs_rpi_3_defconfig
> b/sysutils/u-boot/patches/patch-configs_rpi_3_defconfig
> index 6c3e6862d5a..0ad704f21a0 100644
> --- a/sysutils/u-boot/patches/patch-configs_rpi_3_defconfig
> +++ b/sysutils/u-boot/patches/patch-configs_rpi_3_defconfig
> @@ -17,7 +17,7 @@ to variants of RPi hardware.
> Index: configs/rpi_3_defconfig
> --- configs/rpi_3_defconfig.orig
> +++ configs/rpi_3_defconfig
> -@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
> +@@ -22,7 +22,7 @@ CONFIG_CMD_GPIO=y
> CONFIG_CMD_MMC=y
> CONFIG_CMD_USB=y
> CONFIG_CMD_FS_UUID=y
> diff --git a/sysutils/u-boot/patches/patch-drivers_pci_pcie_brcmstb_c
> b/sysutils/u-boot/patches/patch-drivers_pci_pcie_brcmstb_c
> index 5c52791c841..2f30f990bf8 100644
> --- a/sysutils/u-boot/patches/patch-drivers_pci_pcie_brcmstb_c
> +++ b/sysutils/u-boot/patches/patch-drivers_pci_pcie_brcmstb_c
> @@ -6,7 +6,7 @@ resetting pcie breaks pcie xhci on rpi4
> Index: drivers/pci/pcie_brcmstb.c
> --- drivers/pci/pcie_brcmstb.c.orig
> +++ drivers/pci/pcie_brcmstb.c
> -@@ -577,24 +577,6 @@ static int brcm_pcie_probe(struct udevice *dev)
> +@@ -572,24 +572,6 @@ static int brcm_pcie_probe(struct udevice *dev)
> return 0;
> }
>
> @@ -31,7 +31,7 @@ Index: drivers/pci/pcie_brcmstb.c
> static int brcm_pcie_of_to_plat(struct udevice *dev)
> {
> struct brcm_pcie *pcie = dev_get_priv(dev);
> -@@ -634,8 +616,6 @@ U_BOOT_DRIVER(pcie_brcm_base) = {
> +@@ -629,8 +611,6 @@ U_BOOT_DRIVER(pcie_brcm_base) = {
> .ops = &brcm_pcie_ops,
> .of_match = brcm_pcie_ids,
> .probe = brcm_pcie_probe,
> diff --git a/sysutils/u-boot/patches/patch-tools_Makefile
> b/sysutils/u-boot/patches/patch-tools_Makefile
> new file mode 100644
> index 00000000000..bd51981d452
> --- /dev/null
> +++ b/sysutils/u-boot/patches/patch-tools_Makefile
> @@ -0,0 +1,12 @@
> +Index: tools/Makefile
> +--- tools/Makefile.orig
> ++++ tools/Makefile
> +@@ -195,7 +195,7 @@ HOSTCFLAGS_mkexynosspl.o := -pedantic
> + HOSTCFLAGS_kwboot.o += -pthread
> + HOSTLDLIBS_kwboot += -pthread
> + HOSTLDLIBS_kwboot += \
> +- $(shell pkg-config --libs tinfo 2> /dev/null || echo "-ltinfo")
> ++ $(shell pkg-config --libs tinfo 2> /dev/null || echo "-lncurses")
> +
> + ifdtool-objs := $(LIBFDT_OBJS) ifdtool.o
> + hostprogs-$(CONFIG_X86) += ifdtool
> diff --git a/sysutils/u-boot/pkg/PFRAG.arm b/sysutils/u-boot/pkg/PFRAG.arm
> index 5681374ac01..c76a6f33cf4 100644
> --- a/sysutils/u-boot/pkg/PFRAG.arm
> +++ b/sysutils/u-boot/pkg/PFRAG.arm
> @@ -3,18 +3,21 @@ share/u-boot/
> share/u-boot/A10-OLinuXino-Lime/
> share/u-boot/A10-OLinuXino-Lime/sunxi-spl.bin
> @comment share/u-boot/A10-OLinuXino-Lime/u-boot
> +share/u-boot/A10-OLinuXino-Lime/u-boot-spl.bin
> share/u-boot/A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/A10-OLinuXino-Lime/u-boot.bin
> @comment share/u-boot/A10-OLinuXino-Lime/u-boot.img
> share/u-boot/A10s-OLinuXino-M/
> share/u-boot/A10s-OLinuXino-M/sunxi-spl.bin
> @comment share/u-boot/A10s-OLinuXino-M/u-boot
> +share/u-boot/A10s-OLinuXino-M/u-boot-spl.bin
> share/u-boot/A10s-OLinuXino-M/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/A10s-OLinuXino-M/u-boot.bin
> @comment share/u-boot/A10s-OLinuXino-M/u-boot.img
> share/u-boot/A20-OLinuXino-Lime/
> share/u-boot/A20-OLinuXino-Lime/sunxi-spl.bin
> @comment share/u-boot/A20-OLinuXino-Lime/u-boot
> +share/u-boot/A20-OLinuXino-Lime/u-boot-spl.bin
> share/u-boot/A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/A20-OLinuXino-Lime/u-boot.bin
> @comment share/u-boot/A20-OLinuXino-Lime/u-boot.img
> @@ -22,140 +25,164 @@ share/u-boot/A20-OLinuXino-Lime2/
> share/u-boot/A20-OLinuXino-Lime2-eMMC/
> share/u-boot/A20-OLinuXino-Lime2-eMMC/sunxi-spl.bin
> @comment share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot
> +share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot-spl.bin
> share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot.bin
> @comment share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot.img
> share/u-boot/A20-OLinuXino-Lime2/sunxi-spl.bin
> @comment share/u-boot/A20-OLinuXino-Lime2/u-boot
> +share/u-boot/A20-OLinuXino-Lime2/u-boot-spl.bin
> share/u-boot/A20-OLinuXino-Lime2/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/A20-OLinuXino-Lime2/u-boot.bin
> @comment share/u-boot/A20-OLinuXino-Lime2/u-boot.img
> share/u-boot/A20-OLinuXino_MICRO/
> share/u-boot/A20-OLinuXino_MICRO/sunxi-spl.bin
> @comment share/u-boot/A20-OLinuXino_MICRO/u-boot
> +share/u-boot/A20-OLinuXino_MICRO/u-boot-spl.bin
> share/u-boot/A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/A20-OLinuXino_MICRO/u-boot.bin
> @comment share/u-boot/A20-OLinuXino_MICRO/u-boot.img
> share/u-boot/Bananapi/
> share/u-boot/Bananapi/sunxi-spl.bin
> @comment share/u-boot/Bananapi/u-boot
> +share/u-boot/Bananapi/u-boot-spl.bin
> share/u-boot/Bananapi/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Bananapi/u-boot.bin
> @comment share/u-boot/Bananapi/u-boot.img
> share/u-boot/Bananapi_M2_Ultra/
> share/u-boot/Bananapi_M2_Ultra/sunxi-spl.bin
> @comment share/u-boot/Bananapi_M2_Ultra/u-boot
> +share/u-boot/Bananapi_M2_Ultra/u-boot-spl.bin
> share/u-boot/Bananapi_M2_Ultra/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Bananapi_M2_Ultra/u-boot.bin
> @comment share/u-boot/Bananapi_M2_Ultra/u-boot.img
> share/u-boot/Bananapi_m2m/
> share/u-boot/Bananapi_m2m/sunxi-spl.bin
> @comment share/u-boot/Bananapi_m2m/u-boot
> +share/u-boot/Bananapi_m2m/u-boot-spl.bin
> share/u-boot/Bananapi_m2m/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Bananapi_m2m/u-boot.bin
> @comment share/u-boot/Bananapi_m2m/u-boot.img
> share/u-boot/Bananapro/
> share/u-boot/Bananapro/sunxi-spl.bin
> @comment share/u-boot/Bananapro/u-boot
> +share/u-boot/Bananapro/u-boot-spl.bin
> share/u-boot/Bananapro/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Bananapro/u-boot.bin
> @comment share/u-boot/Bananapro/u-boot.img
> share/u-boot/CHIP/
> share/u-boot/CHIP/sunxi-spl.bin
> @comment share/u-boot/CHIP/u-boot
> +share/u-boot/CHIP/u-boot-spl.bin
> share/u-boot/CHIP/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/CHIP/u-boot.bin
> @comment share/u-boot/CHIP/u-boot.img
> share/u-boot/Cubieboard/
> share/u-boot/Cubieboard/sunxi-spl.bin
> @comment share/u-boot/Cubieboard/u-boot
> +share/u-boot/Cubieboard/u-boot-spl.bin
> share/u-boot/Cubieboard/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Cubieboard/u-boot.bin
> @comment share/u-boot/Cubieboard/u-boot.img
> share/u-boot/Cubieboard2/
> share/u-boot/Cubieboard2/sunxi-spl.bin
> @comment share/u-boot/Cubieboard2/u-boot
> +share/u-boot/Cubieboard2/u-boot-spl.bin
> share/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Cubieboard2/u-boot.bin
> @comment share/u-boot/Cubieboard2/u-boot.img
> share/u-boot/Cubieboard4/
> share/u-boot/Cubieboard4/sunxi-spl.bin
> @comment share/u-boot/Cubieboard4/u-boot
> +share/u-boot/Cubieboard4/u-boot-spl.bin
> share/u-boot/Cubieboard4/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Cubieboard4/u-boot.bin
> @comment share/u-boot/Cubieboard4/u-boot.img
> share/u-boot/Cubietruck/
> share/u-boot/Cubietruck/sunxi-spl.bin
> @comment share/u-boot/Cubietruck/u-boot
> +share/u-boot/Cubietruck/u-boot-spl.bin
> share/u-boot/Cubietruck/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Cubietruck/u-boot.bin
> @comment share/u-boot/Cubietruck/u-boot.img
> share/u-boot/Lamobo_R1/
> share/u-boot/Lamobo_R1/sunxi-spl.bin
> @comment share/u-boot/Lamobo_R1/u-boot
> +share/u-boot/Lamobo_R1/u-boot-spl.bin
> share/u-boot/Lamobo_R1/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Lamobo_R1/u-boot.bin
> @comment share/u-boot/Lamobo_R1/u-boot.img
> share/u-boot/Linksprite_pcDuino/
> share/u-boot/Linksprite_pcDuino/sunxi-spl.bin
> @comment share/u-boot/Linksprite_pcDuino/u-boot
> +share/u-boot/Linksprite_pcDuino/u-boot-spl.bin
> share/u-boot/Linksprite_pcDuino/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Linksprite_pcDuino/u-boot.bin
> @comment share/u-boot/Linksprite_pcDuino/u-boot.img
> share/u-boot/Linksprite_pcDuino3/
> share/u-boot/Linksprite_pcDuino3/sunxi-spl.bin
> @comment share/u-boot/Linksprite_pcDuino3/u-boot
> +share/u-boot/Linksprite_pcDuino3/u-boot-spl.bin
> share/u-boot/Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Linksprite_pcDuino3/u-boot.bin
> @comment share/u-boot/Linksprite_pcDuino3/u-boot.img
> share/u-boot/Linksprite_pcDuino3_Nano/
> share/u-boot/Linksprite_pcDuino3_Nano/sunxi-spl.bin
> @comment share/u-boot/Linksprite_pcDuino3_Nano/u-boot
> +share/u-boot/Linksprite_pcDuino3_Nano/u-boot-spl.bin
> share/u-boot/Linksprite_pcDuino3_Nano/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Linksprite_pcDuino3_Nano/u-boot.bin
> @comment share/u-boot/Linksprite_pcDuino3_Nano/u-boot.img
> share/u-boot/Orangepi/
> share/u-boot/Orangepi/sunxi-spl.bin
> @comment share/u-boot/Orangepi/u-boot
> +share/u-boot/Orangepi/u-boot-spl.bin
> share/u-boot/Orangepi/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Orangepi/u-boot.bin
> @comment share/u-boot/Orangepi/u-boot.img
> share/u-boot/Orangepi_mini/
> share/u-boot/Orangepi_mini/sunxi-spl.bin
> @comment share/u-boot/Orangepi_mini/u-boot
> +share/u-boot/Orangepi_mini/u-boot-spl.bin
> share/u-boot/Orangepi_mini/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/Orangepi_mini/u-boot.bin
> @comment share/u-boot/Orangepi_mini/u-boot.img
> share/u-boot/am335x_evm/
> share/u-boot/am335x_evm/MLO
> @comment share/u-boot/am335x_evm/u-boot
> +share/u-boot/am335x_evm/u-boot-spl.bin
> @comment share/u-boot/am335x_evm/u-boot.bin
> share/u-boot/am335x_evm/u-boot.img
> share/u-boot/bananapi_m2_plus_h3/
> share/u-boot/bananapi_m2_plus_h3/sunxi-spl.bin
> @comment share/u-boot/bananapi_m2_plus_h3/u-boot
> +share/u-boot/bananapi_m2_plus_h3/u-boot-spl.bin
> share/u-boot/bananapi_m2_plus_h3/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/bananapi_m2_plus_h3/u-boot.bin
> @comment share/u-boot/bananapi_m2_plus_h3/u-boot.img
> share/u-boot/bananapi_m2_zero/
> share/u-boot/bananapi_m2_zero/sunxi-spl.bin
> @comment share/u-boot/bananapi_m2_zero/u-boot
> +share/u-boot/bananapi_m2_zero/u-boot-spl.bin
> share/u-boot/bananapi_m2_zero/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/bananapi_m2_zero/u-boot.bin
> @comment share/u-boot/bananapi_m2_zero/u-boot.img
> share/u-boot/clearfog/
> @comment share/u-boot/clearfog/u-boot
> -share/u-boot/clearfog/u-boot-spl.kwb
> +share/u-boot/clearfog/u-boot-spl.bin
> +share/u-boot/clearfog/u-boot-with-spl.kwb
> @comment share/u-boot/clearfog/u-boot.bin
> @comment share/u-boot/clearfog/u-boot.img
> share/u-boot/cm_fx6/
> share/u-boot/cm_fx6/SPL
> @comment share/u-boot/cm_fx6/u-boot
> +share/u-boot/cm_fx6/u-boot-spl.bin
> @comment share/u-boot/cm_fx6/u-boot.bin
> share/u-boot/cm_fx6/u-boot.img
> share/u-boot/mx6cuboxi/
> share/u-boot/mx6cuboxi/SPL
> @comment share/u-boot/mx6cuboxi/u-boot
> +share/u-boot/mx6cuboxi/u-boot-spl.bin
> @comment share/u-boot/mx6cuboxi/u-boot.bin
> share/u-boot/mx6cuboxi/u-boot.img
> share/u-boot/mx6qsabrelite/
> @@ -165,6 +192,7 @@ share/u-boot/mx6qsabrelite/u-boot-dtb.imx
> share/u-boot/nanopi_neo/
> share/u-boot/nanopi_neo/sunxi-spl.bin
> @comment share/u-boot/nanopi_neo/u-boot
> +share/u-boot/nanopi_neo/u-boot-spl.bin
> share/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/nanopi_neo/u-boot.bin
> @comment share/u-boot/nanopi_neo/u-boot.img
> @@ -175,58 +203,68 @@ share/u-boot/nitrogen6q/u-boot-dtb.imx
> share/u-boot/novena/
> share/u-boot/novena/SPL
> @comment share/u-boot/novena/u-boot
> +share/u-boot/novena/u-boot-spl.bin
> @comment share/u-boot/novena/u-boot.bin
> share/u-boot/novena/u-boot.img
> share/u-boot/omap4_panda/
> share/u-boot/omap4_panda/MLO
> @comment share/u-boot/omap4_panda/u-boot
> +share/u-boot/omap4_panda/u-boot-spl.bin
> @comment share/u-boot/omap4_panda/u-boot.bin
> share/u-boot/omap4_panda/u-boot.img
> share/u-boot/orangepi_2/
> share/u-boot/orangepi_2/sunxi-spl.bin
> @comment share/u-boot/orangepi_2/u-boot
> +share/u-boot/orangepi_2/u-boot-spl.bin
> share/u-boot/orangepi_2/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/orangepi_2/u-boot.bin
> @comment share/u-boot/orangepi_2/u-boot.img
> share/u-boot/orangepi_lite/
> share/u-boot/orangepi_lite/sunxi-spl.bin
> @comment share/u-boot/orangepi_lite/u-boot
> +share/u-boot/orangepi_lite/u-boot-spl.bin
> share/u-boot/orangepi_lite/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/orangepi_lite/u-boot.bin
> @comment share/u-boot/orangepi_lite/u-boot.img
> share/u-boot/orangepi_one/
> share/u-boot/orangepi_one/sunxi-spl.bin
> @comment share/u-boot/orangepi_one/u-boot
> +share/u-boot/orangepi_one/u-boot-spl.bin
> share/u-boot/orangepi_one/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/orangepi_one/u-boot.bin
> @comment share/u-boot/orangepi_one/u-boot.img
> share/u-boot/orangepi_pc/
> share/u-boot/orangepi_pc/sunxi-spl.bin
> @comment share/u-boot/orangepi_pc/u-boot
> +share/u-boot/orangepi_pc/u-boot-spl.bin
> share/u-boot/orangepi_pc/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/orangepi_pc/u-boot.bin
> @comment share/u-boot/orangepi_pc/u-boot.img
> share/u-boot/orangepi_pc_plus/
> share/u-boot/orangepi_pc_plus/sunxi-spl.bin
> @comment share/u-boot/orangepi_pc_plus/u-boot
> +share/u-boot/orangepi_pc_plus/u-boot-spl.bin
> share/u-boot/orangepi_pc_plus/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/orangepi_pc_plus/u-boot.bin
> @comment share/u-boot/orangepi_pc_plus/u-boot.img
> share/u-boot/orangepi_plus/
> share/u-boot/orangepi_plus/sunxi-spl.bin
> @comment share/u-boot/orangepi_plus/u-boot
> +share/u-boot/orangepi_plus/u-boot-spl.bin
> share/u-boot/orangepi_plus/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/orangepi_plus/u-boot.bin
> @comment share/u-boot/orangepi_plus/u-boot.img
> share/u-boot/orangepi_plus2e/
> share/u-boot/orangepi_plus2e/sunxi-spl.bin
> @comment share/u-boot/orangepi_plus2e/u-boot
> +share/u-boot/orangepi_plus2e/u-boot-spl.bin
> share/u-boot/orangepi_plus2e/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/orangepi_plus2e/u-boot.bin
> @comment share/u-boot/orangepi_plus2e/u-boot.img
> share/u-boot/orangepi_zero/
> share/u-boot/orangepi_zero/sunxi-spl.bin
> @comment share/u-boot/orangepi_zero/u-boot
> +share/u-boot/orangepi_zero/u-boot-spl.bin
> share/u-boot/orangepi_zero/u-boot-sunxi-with-spl.bin
> @comment share/u-boot/orangepi_zero/u-boot.bin
> @comment share/u-boot/orangepi_zero/u-boot.img
> @@ -242,23 +280,29 @@ share/u-boot/rpi_3_32b/u-boot.bin
> share/u-boot/tinker-rk3288/
> share/u-boot/tinker-rk3288/idbloader.img
> @comment share/u-boot/tinker-rk3288/u-boot
> +share/u-boot/tinker-rk3288/u-boot-rockchip.bin
> +share/u-boot/tinker-rk3288/u-boot-spl.bin
> @comment share/u-boot/tinker-rk3288/u-boot.bin
> share/u-boot/tinker-rk3288/u-boot.img
> share/u-boot/turris_omnia/
> @comment share/u-boot/turris_omnia/u-boot
> -share/u-boot/turris_omnia/u-boot-spl.kwb
> +share/u-boot/turris_omnia/u-boot-spl.bin
> +share/u-boot/turris_omnia/u-boot-with-spl.kwb
> @comment share/u-boot/turris_omnia/u-boot.bin
> @comment share/u-boot/turris_omnia/u-boot.img
> share/u-boot/udoo/
> share/u-boot/udoo/SPL
> @comment share/u-boot/udoo/u-boot
> +share/u-boot/udoo/u-boot-spl.bin
> @comment share/u-boot/udoo/u-boot.bin
> share/u-boot/udoo/u-boot.img
> share/u-boot/usbarmory/
> share/u-boot/usbarmory/u-boot
> +share/u-boot/usbarmory/u-boot-dtb.imx
> share/u-boot/usbarmory/u-boot.bin
> share/u-boot/wandboard/
> share/u-boot/wandboard/SPL
> @comment share/u-boot/wandboard/u-boot
> +share/u-boot/wandboard/u-boot-spl.bin
> @comment share/u-boot/wandboard/u-boot.bin
> share/u-boot/wandboard/u-boot.img
>
>
