diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -30,7 +30,7 @@ USES= bison gmake python:build pkgconfig shebangfix tar:bz2 BINARY_ALIAS= bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed python3=${PYTHON_CMD} -SHEBANG_FILES= tools/binman/binman arch/arm/mach-rockchip/make_fit_atf.py +SHEBANG_FILES= tools/binman/binman SSP_UNSAFE= yes UBOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} INST= ${PREFIX}/${UBOOT_DIR} @@ -118,7 +118,7 @@ .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}} .endif -UBOOT_VERSION?= 2023.01 +UBOOT_VERSION?= 2023.07.02 # If a slave port defines a PORTREVISION use it .if defined(U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION}) diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo --- a/sysutils/u-boot-master/distinfo +++ b/sysutils/u-boot-master/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1673338204 -SHA256 (u-boot/u-boot-2023.01.tar.bz2) = 69423bad380f89a0916636e89e6dcbd2e4512d584308d922d1039d1e4331950f -SIZE (u-boot/u-boot-2023.01.tar.bz2) = 18560442 +TIMESTAMP = 1690330768 +SHA256 (u-boot/u-boot-2023.07.02.tar.bz2) = 6b6a48581c14abb0f95bd87c1af4d740922406d7b801002a9f94727fdde021d5 +SIZE (u-boot/u-boot-2023.07.02.tar.bz2) = 19430944 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97 SIZE (u-boot/939129/raw) = 310 SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7 diff --git a/sysutils/u-boot-rockpro64/Makefile b/sysutils/u-boot-rockpro64/Makefile --- a/sysutils/u-boot-rockpro64/Makefile +++ b/sysutils/u-boot-rockpro64/Makefile @@ -1,5 +1,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +EXTRA_PATCHES= ${.CURDIR}/files/ + MODEL= rockpro64 BOARD_CONFIG= rockpro64-rk3399_defconfig FAMILY= rk3399 diff --git a/sysutils/u-boot-rockpro64/files/patch-scripts_gen__ll__addressable__symbols.sh b/sysutils/u-boot-rockpro64/files/patch-scripts_gen__ll__addressable__symbols.sh new file mode 100644 --- /dev/null +++ b/sysutils/u-boot-rockpro64/files/patch-scripts_gen__ll__addressable__symbols.sh @@ -0,0 +1,8 @@ +--- scripts/gen_ll_addressable_symbols.sh.orig 2023-07-27 20:45:26 UTC ++++ scripts/gen_ll_addressable_symbols.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # SPDX-License-Identifier: GPL-2.0+ + # Copyright (C) 2020 Marek BehĂșn +