update to U-Boot 2021.04

This commit is contained in:
jsg 2021-04-23 23:56:11 +00:00
parent 4622671c26
commit a539f3ce0f
7 changed files with 19 additions and 41 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.81 2021/04/16 06:40:44 jsg Exp $
# $OpenBSD: Makefile,v 1.82 2021/04/23 23:56:11 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= 2021.01
REVISION= 1
VERSION= 2021.04
DISTNAME= u-boot-${VERSION}
PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
FULLPKGNAME= ${PKGNAME}
@ -25,8 +24,7 @@ PKG_ARCH= *
BUILD_DEPENDS= devel/bison \
devel/dtc \
devel/swig \
textproc/gsed
devel/swig
MODULES= lang/python
MODPY_RUNDEP= No

View File

@ -1,2 +1,2 @@
SHA256 (u-boot-2021.01.tar.bz2) = tAfhUQp06GO4tctCokYlNE8ODC/HWC2MhmvYmTZ9BFQ=
SIZE (u-boot-2021.01.tar.bz2) = 16375990
SHA256 (u-boot-2021.04.tar.bz2) = DUOLG7XM61ehjqLeSg1R975bBbmHF98Fk4Y24Krf4Ro=
SIZE (u-boot-2021.04.tar.bz2) = 16673334

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configs_firefly-rk3399_defconfig,v 1.7 2020/07/07 08:26:26 jsg Exp $
$OpenBSD: patch-configs_firefly-rk3399_defconfig,v 1.8 2021/04/23 23:56:11 jsg Exp $
Index: configs/firefly-rk3399_defconfig
--- configs/firefly-rk3399_defconfig.orig
+++ configs/firefly-rk3399_defconfig
@@ -46,7 +46,7 @@ CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
@@ -48,7 +48,7 @@ CONFIG_PWM_ROCKCHIP=y
CONFIG_DM_RESET=y
CONFIG_DM_RNG=y
CONFIG_RNG_ROCKCHIP=y
-CONFIG_BAUDRATE=1500000
+CONFIG_BAUDRATE=115200
CONFIG_DEBUG_UART_SHIFT=2

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configs_pinebook-pro-rk3399_defconfig,v 1.3 2021/01/14 00:56:54 jsg Exp $
$OpenBSD: patch-configs_pinebook-pro-rk3399_defconfig,v 1.4 2021/04/23 23:56:11 jsg Exp $
Disable CONFIG_USE_PREBOOT / usb start to fix boot.
@ -14,7 +14,7 @@ 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
@@ -68,7 +68,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
@@ -67,7 +67,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
CONFIG_DM_RESET=y
CONFIG_DM_RNG=y
CONFIG_RNG_ROCKCHIP=y

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configs_rock960-rk3399_defconfig,v 1.5 2021/01/14 00:56:54 jsg Exp $
$OpenBSD: patch-configs_rock960-rk3399_defconfig,v 1.6 2021/04/23 23:56:11 jsg Exp $
Disable CONFIG_USE_PREBOOT / usb start to fix boot.
@ -14,10 +14,10 @@ Index: configs/rock960-rk3399_defconfig
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
@@ -50,7 +50,7 @@ CONFIG_PWM_ROCKCHIP=y
CONFIG_DM_RESET=y
CONFIG_DM_RNG=y
CONFIG_RNG_ROCKCHIP=y
-CONFIG_BAUDRATE=1500000
+CONFIG_BAUDRATE=115200
CONFIG_DEBUG_UART_SHIFT=2

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configs_rockpro64-rk3399_defconfig,v 1.6 2021/01/14 00:56:54 jsg Exp $
$OpenBSD: patch-configs_rockpro64-rk3399_defconfig,v 1.7 2021/04/23 23:56:11 jsg Exp $
Disable CONFIG_USE_PREBOOT / usb start to fix boot.
@ -14,10 +14,10 @@ Index: configs/rockpro64-rk3399_defconfig
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
@@ -58,7 +58,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
CONFIG_DM_RESET=y
CONFIG_DM_RNG=y
CONFIG_RNG_ROCKCHIP=y
-CONFIG_BAUDRATE=1500000
+CONFIG_BAUDRATE=115200
CONFIG_DEBUG_UART_SHIFT=2

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-scripts_check-config_sh,v 1.3 2019/01/15 05:44:18 jsg Exp $
Index: scripts/check-config.sh
--- scripts/check-config.sh.orig
+++ scripts/check-config.sh
@@ -39,12 +39,12 @@ new_adhoc="${path}.adhoc"
export LC_ALL=C
export LC_COLLATE=C
-cat ${path} |sed -n 's/^#define \(CONFIG_[A-Za-z0-9_]*\).*/\1/p' |sort |uniq \
+cat ${path} | gsed -n 's/^#define \(CONFIG_[A-Za-z0-9_]*\).*/\1/p' |sort |uniq \
>${configs}
comm -23 ${configs} ${whitelist} > ${suspects}
-cat `find ${srctree} -name "Kconfig*"` |sed -n \
+cat `find ${srctree} -name "Kconfig*"` | gsed -n \
-e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-e 's/^\s*menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
|sort |uniq > ${ok}