cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to U-Boot 2021.01

Browse Source 
Fixes problem booting from spi with pinebook pro seen with 2020.10.

Disable CONFIG_USE_PREBOOT from rk3399 configs as this runs
'usb start' which is reported to break booting via other methods
by kurt@.

Tested by kurt@ patrick@ and myself on
am335x_evm
mx6cuboxi
omap4_panda
pinebook-pro-rk3399
rock64-rk3328
rockpro64-rk3399
rpi_3
tinker-rk3288

ok kurt@
This commit is contained in:
jsg 2021-01-14 00:56:54 +00:00
parent fab8eb49c5
commit 1096c39191
8 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/u-boot/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.75 2020/12/25 12:18:05 dtucker Exp $
# $OpenBSD: Makefile,v 1.76 2021/01/14 00:56:54 jsg Exp $
BROKEN-sparc64= Error: the specified option is not accepted in ISB at operand 1 -- isb sy
BROKEN-arm= lib/time.c:187:1: internal compiler error: Bus error
@ -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}

4
sysutils/u-boot/distinfo
View File

@ -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

15
sysutils/u-boot/patches/patch-configs_pinebook-pro-rk3399_defconfig
View File

@ -1,9 +1,20 @@
$OpenBSD: patch-configs_pinebook-pro-rk3399_defconfig,v 1.2 2020/10/06 05:59:08 jsg Exp $
$OpenBSD: patch-configs_pinebook-pro-rk3399_defconfig,v 1.3 2021/01/14 00:56:54 jsg Exp $
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
@@ -64,7 +64,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
CONFIG_DEBUG_UART=y
CONFIG_BOOTDELAY=3
-CONFIG_USE_PREBOOT=y
+# CONFIG_USE_PREBOOT is not set
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb"
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_MISC_INIT_R=y
@@ -68,7 +68,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
CONFIG_DM_RESET=y
CONFIG_DM_RNG=y
CONFIG_RNG_ROCKCHIP=y

6
sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-configs_rock64-rk3328_defconfig,v 1.5 2020/10/06 05:59:08 jsg Exp $
$OpenBSD: patch-configs_rock64-rk3328_defconfig,v 1.6 2021/01/14 00:56:54 jsg Exp $
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

15
sysutils/u-boot/patches/patch-configs_rock960-rk3399_defconfig
View File

@ -1,9 +1,20 @@
$OpenBSD: patch-configs_rock960-rk3399_defconfig,v 1.4 2020/10/06 05:59:08 jsg Exp $
$OpenBSD: patch-configs_rock960-rk3399_defconfig,v 1.5 2021/01/14 00:56:54 jsg Exp $
Disable CONFIG_USE_PREBOOT / usb start to fix boot.
Index: configs/rock960-rk3399_defconfig
--- configs/rock960-rk3399_defconfig.orig
+++ configs/rock960-rk3399_defconfig
@@ -46,7 +46,7 @@ CONFIG_REGULATOR_PWM=y
@@ -8,7 +8,7 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock960"
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
@@ -49,7 +49,7 @@ CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
CONFIG_DM_RESET=y

15
sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig
View File

@ -1,9 +1,20 @@
$OpenBSD: patch-configs_rockpro64-rk3399_defconfig,v 1.5 2020/10/06 05:59:08 jsg Exp $
$OpenBSD: patch-configs_rockpro64-rk3399_defconfig,v 1.6 2021/01/14 00:56:54 jsg Exp $
Disable CONFIG_USE_PREBOOT / usb start to fix boot.
Index: configs/rockpro64-rk3399_defconfig
--- configs/rockpro64-rk3399_defconfig.orig
+++ configs/rockpro64-rk3399_defconfig
@@ -55,7 +55,7 @@ CONFIG_REGULATOR_RK8XX=y
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEFAULT_DEVICE_TREE="rk3399-rockpro64"
CONFIG_DEBUG_UART=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
@@ -57,7 +57,7 @@ CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM_RK3399_LPDDR4=y
CONFIG_DM_RESET=y

16
sysutils/u-boot/pkg/PFRAG.aarch64
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.aarch64,v 1.20 2020/12/25 12:18:05 dtucker Exp $
@comment $OpenBSD: PFRAG.aarch64,v 1.21 2021/01/14 00:56:54 jsg Exp $
@pkgpath sysutils/u-boot-pinebook
share/u-boot/
share/u-boot/a64-olinuxino/
@ -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-rockchip.bin
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

3
sysutils/u-boot/pkg/PFRAG.arm
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.arm,v 1.23 2020/05/22 13:51:09 kurt Exp $
@comment $OpenBSD: PFRAG.arm,v 1.24 2021/01/14 00:56:54 jsg Exp $
@pkgpath sysutils/u-boot,
share/u-boot/
share/u-boot/A10-OLinuXino-Lime/
@ -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/