On Tue, 2021-01-12 at 17:25 +1100, Jonathan Gray wrote:
> Tested with these targets:
>
> am335x_evm (bbb)
> mx6cuboxi
> omap4_panda
> rpi_3
> tinker-rk3288
I tested:
rock64
rockpro64 (w/CONFIG_USE_PREBOOT disabled)
patrick tested:
pinebook-pro (w/CONFIG_USE_PREBOOT disabled)
okay with the addition of the CONFIG_USE_PREBOOT disabling
patches in the other email thread.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
> retrieving revision 1.75
> diff -u -p -r1.75 Makefile
> --- Makefile 25 Dec 2020 12:18:05 -0000 1.75
> +++ Makefile 11 Jan 2021 23:54:58 -0000
> @@ -7,8 +7,7 @@ FLAVORS= aarch64 arm
> FLAVOR?= arm
>
> COMMENT= U-Boot firmware
> -VERSION= 2020.10
> -REVISION= 0
> +VERSION= 2021.01
> DISTNAME= u-boot-${VERSION}
> PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
> FULLPKGNAME= ${PKGNAME}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/u-boot/distinfo,v
> retrieving revision 1.32
> diff -u -p -r1.32 distinfo
> --- distinfo 6 Oct 2020 05:59:08 -0000 1.32
> +++ distinfo 11 Jan 2021 23:55:33 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (u-boot-2020.10.tar.bz2) =
> DUgbvcBcDudJCOwvVqbapTFmzGp4oOT6wqxdAldwpiI=
> -SIZE (u-boot-2020.10.tar.bz2) = 15784894
> +SHA256 (u-boot-2021.01.tar.bz2) =
> tAfhUQp06GO4tctCokYlNE8ODC/HWC2MhmvYmTZ9BFQ=
> +SIZE (u-boot-2021.01.tar.bz2) = 16375990
> Index: patches/patch-configs_pinebook-pro-rk3399_defconfig
> ===================================================================
> RCS file:
> /cvs/ports/sysutils/u-boot/patches/patch-configs_pinebook-pro-rk3399_defconfig,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-configs_pinebook-pro-rk3399_defconfig
> --- patches/patch-configs_pinebook-pro-rk3399_defconfig 6 Oct 2020
> 05:59:08 -0000 1.2
> +++ patches/patch-configs_pinebook-pro-rk3399_defconfig 11 Jan 2021
> 23:56:50 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configs_pinebook-pro-rk3
> Index: configs/pinebook-pro-rk3399_defconfig
> --- configs/pinebook-pro-rk3399_defconfig.orig
> +++ configs/pinebook-pro-rk3399_defconfig
> -@@ -64,7 +64,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
> +@@ -68,7 +68,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
> CONFIG_DM_RESET=y
> CONFIG_DM_RNG=y
> CONFIG_RNG_ROCKCHIP=y
> Index: patches/patch-configs_rock64-rk3328_defconfig
> ===================================================================
> RCS file:
> /cvs/ports/sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-configs_rock64-rk3328_defconfig
> --- patches/patch-configs_rock64-rk3328_defconfig 6 Oct 2020 05:59:08
> -0000 1.5
> +++ patches/patch-configs_rock64-rk3328_defconfig 11 Jan 2021 23:56:50
> -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configs_rock64-rk3328_de
> Index: configs/rock64-rk3328_defconfig
> --- configs/rock64-rk3328_defconfig.orig
> +++ configs/rock64-rk3328_defconfig
> -@@ -79,7 +79,7 @@ CONFIG_RAM=y
> +@@ -78,7 +78,7 @@ CONFIG_RAM=y
> CONFIG_SPL_RAM=y
> CONFIG_TPL_RAM=y
> CONFIG_DM_RESET=y
> @@ -11,4 +11,4 @@ Index: configs/rock64-rk3328_defconfig
> +CONFIG_BAUDRATE=115200
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_ROCKCHIP_SPI=y
> - CONFIG_SYSRESET=y
> + CONFIG_SYSINFO=y
> Index: patches/patch-configs_rock960-rk3399_defconfig
> ===================================================================
> RCS file:
> /cvs/ports/sysutils/u-boot/patches/patch-configs_rock960-rk3399_defconfig,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-configs_rock960-rk3399_defconfig
> --- patches/patch-configs_rock960-rk3399_defconfig 6 Oct 2020 05:59:08
> -0000 1.4
> +++ patches/patch-configs_rock960-rk3399_defconfig 11 Jan 2021 23:56:50
> -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configs_rock960-rk3399_d
> Index: configs/rock960-rk3399_defconfig
> --- configs/rock960-rk3399_defconfig.orig
> +++ configs/rock960-rk3399_defconfig
> -@@ -46,7 +46,7 @@ CONFIG_REGULATOR_PWM=y
> +@@ -49,7 +49,7 @@ CONFIG_REGULATOR_PWM=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_DM_RESET=y
> Index: patches/patch-configs_rockpro64-rk3399_defconfig
> ===================================================================
> RCS file:
> /cvs/ports/sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-configs_rockpro64-rk3399_defconfig
> --- patches/patch-configs_rockpro64-rk3399_defconfig 6 Oct 2020 05:59:08
> -0000 1.5
> +++ patches/patch-configs_rockpro64-rk3399_defconfig 11 Jan 2021 23:56:59
> -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configs_rockpro64-rk3399
> Index: configs/rockpro64-rk3399_defconfig
> --- configs/rockpro64-rk3399_defconfig.orig
> +++ configs/rockpro64-rk3399_defconfig
> -@@ -55,7 +55,7 @@ CONFIG_REGULATOR_RK8XX=y
> +@@ -57,7 +57,7 @@ CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_RAM_RK3399_LPDDR4=y
> CONFIG_DM_RESET=y
> Index: pkg/PFRAG.aarch64
> ===================================================================
> RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.aarch64,v
> retrieving revision 1.20
> diff -u -p -r1.20 PFRAG.aarch64
> --- pkg/PFRAG.aarch64 25 Dec 2020 12:18:05 -0000 1.20
> +++ pkg/PFRAG.aarch64 12 Jan 2021 00:50:27 -0000
> @@ -7,14 +7,12 @@ share/u-boot/a64-olinuxino/u-boot
> share/u-boot/a64-olinuxino/u-boot-sunxi-with-spl.bin
> share/u-boot/a64-olinuxino/u-boot.bin
> share/u-boot/a64-olinuxino/u-boot.img
> -share/u-boot/a64-olinuxino/u-boot.itb
> share/u-boot/bananapi_m64/
> share/u-boot/bananapi_m64/sunxi-spl.bin
> share/u-boot/bananapi_m64/u-boot
> share/u-boot/bananapi_m64/u-boot-sunxi-with-spl.bin
> share/u-boot/bananapi_m64/u-boot.bin
> share/u-boot/bananapi_m64/u-boot.img
> -share/u-boot/bananapi_m64/u-boot.itb
> share/u-boot/firefly-rk3399/
> share/u-boot/firefly-rk3399/idbloader.img
> share/u-boot/firefly-rk3399/u-boot
> @@ -41,56 +39,49 @@ share/u-boot/nanopi_a64/u-boot
> share/u-boot/nanopi_a64/u-boot-sunxi-with-spl.bin
> share/u-boot/nanopi_a64/u-boot.bin
> share/u-boot/nanopi_a64/u-boot.img
> -share/u-boot/nanopi_a64/u-boot.itb
> share/u-boot/nanopi_neo2/
> share/u-boot/nanopi_neo2/sunxi-spl.bin
> share/u-boot/nanopi_neo2/u-boot
> share/u-boot/nanopi_neo2/u-boot-sunxi-with-spl.bin
> share/u-boot/nanopi_neo2/u-boot.bin
> share/u-boot/nanopi_neo2/u-boot.img
> -share/u-boot/nanopi_neo2/u-boot.itb
> share/u-boot/orangepi_pc2/
> share/u-boot/orangepi_pc2/sunxi-spl.bin
> share/u-boot/orangepi_pc2/u-boot
> share/u-boot/orangepi_pc2/u-boot-sunxi-with-spl.bin
> share/u-boot/orangepi_pc2/u-boot.bin
> share/u-boot/orangepi_pc2/u-boot.img
> -share/u-boot/orangepi_pc2/u-boot.itb
> share/u-boot/orangepi_prime/
> share/u-boot/orangepi_prime/sunxi-spl.bin
> share/u-boot/orangepi_prime/u-boot
> share/u-boot/orangepi_prime/u-boot-sunxi-with-spl.bin
> share/u-boot/orangepi_prime/u-boot.bin
> share/u-boot/orangepi_prime/u-boot.img
> -share/u-boot/orangepi_prime/u-boot.itb
> share/u-boot/orangepi_win/
> share/u-boot/orangepi_win/sunxi-spl.bin
> share/u-boot/orangepi_win/u-boot
> share/u-boot/orangepi_win/u-boot-sunxi-with-spl.bin
> share/u-boot/orangepi_win/u-boot.bin
> share/u-boot/orangepi_win/u-boot.img
> -share/u-boot/orangepi_win/u-boot.itb
> share/u-boot/orangepi_zero_plus/
> share/u-boot/orangepi_zero_plus/sunxi-spl.bin
> share/u-boot/orangepi_zero_plus/u-boot
> share/u-boot/orangepi_zero_plus/u-boot-sunxi-with-spl.bin
> share/u-boot/orangepi_zero_plus/u-boot.bin
> share/u-boot/orangepi_zero_plus/u-boot.img
> -share/u-boot/orangepi_zero_plus/u-boot.itb
> share/u-boot/pine64-lts/
> share/u-boot/pine64-lts/sunxi-spl.bin
> share/u-boot/pine64-lts/u-boot
> share/u-boot/pine64-lts/u-boot-sunxi-with-spl.bin
> share/u-boot/pine64-lts/u-boot.bin
> share/u-boot/pine64-lts/u-boot.img
> -share/u-boot/pine64-lts/u-boot.itb
> share/u-boot/pine64_plus/
> share/u-boot/pine64_plus/sunxi-spl.bin
> share/u-boot/pine64_plus/u-boot
> share/u-boot/pine64_plus/u-boot-sunxi-with-spl.bin
> share/u-boot/pine64_plus/u-boot.bin
> share/u-boot/pine64_plus/u-boot.img
> -share/u-boot/pine64_plus/u-boot.itb
> +share/u-boot/pinebook/
> share/u-boot/pinebook-pro-rk3399/
> share/u-boot/pinebook-pro-rk3399/idbloader.img
> share/u-boot/pinebook-pro-rk3399/u-boot
> @@ -98,13 +89,11 @@ share/u-boot/pinebook-pro-rk3399/u-boot-
> share/u-boot/pinebook-pro-rk3399/u-boot.bin
> share/u-boot/pinebook-pro-rk3399/u-boot.img
> share/u-boot/pinebook-pro-rk3399/u-boot.itb
> -share/u-boot/pinebook/
> share/u-boot/pinebook/sunxi-spl.bin
> share/u-boot/pinebook/u-boot
> share/u-boot/pinebook/u-boot-sunxi-with-spl.bin
> share/u-boot/pinebook/u-boot.bin
> share/u-boot/pinebook/u-boot.img
> -share/u-boot/pinebook/u-boot.itb
> share/u-boot/qemu_arm64/
> share/u-boot/qemu_arm64/u-boot
> share/u-boot/qemu_arm64/u-boot.bin
> @@ -148,4 +137,3 @@ share/u-boot/sopine_baseboard/u-boot
> share/u-boot/sopine_baseboard/u-boot-sunxi-with-spl.bin
> share/u-boot/sopine_baseboard/u-boot.bin
> share/u-boot/sopine_baseboard/u-boot.img
> -share/u-boot/sopine_baseboard/u-boot.itb
> Index: pkg/PFRAG.arm
> ===================================================================
> RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.arm,v
> retrieving revision 1.23
> diff -u -p -r1.23 PFRAG.arm
> --- pkg/PFRAG.arm 22 May 2020 13:51:09 -0000 1.23
> +++ pkg/PFRAG.arm 12 Jan 2021 02:56:17 -0000
> @@ -243,7 +243,6 @@ share/u-boot/rpi_3_32b/u-boot.bin
> share/u-boot/tinker-rk3288/
> share/u-boot/tinker-rk3288/idbloader.img
> share/u-boot/tinker-rk3288/u-boot
> -share/u-boot/tinker-rk3288/u-boot-rockchip.bin
> share/u-boot/tinker-rk3288/u-boot.bin
> share/u-boot/tinker-rk3288/u-boot.img
> share/u-boot/turris_omnia/
>
