diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index e1898dce49e7..bd0867d9b6a4 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -1,260 +1,260 @@ # # Common infrastructure for u-boot ports # PORTNAME= u-boot PORTVERSION= ${UBOOT_VERSION} CATEGORIES= sysutils PKGNAMESUFFIX?= -${MODEL} MASTER_SITES= https://ftp.denx.de/pub/u-boot/ \ ftp://ftp.denx.de/pub/u-boot/ DIST_SUBDIR= u-boot MAINTAINER?= uboot@FreeBSD.org COMMENT= Cross-build das u-boot for model ${MODEL} WWW?= https://www.denx.de/wiki/U-Boot LICENSE= GPLv2 BUILD_DEPENDS+= gsed:textproc/gsed \ swig:devel/swig \ dtc>=1.4.1:sysutils/dtc \ mkimage:sysutils/u-boot-tools \ ${PYTHON_PKGNAMEPREFIX}setuptools-pkg>=0:devel/py-setuptools-pkg@${PY_FLAVOR} BUILD_DEPENDS+= ${COMPILER}:devel/${COMPILER} # For mkeficapsule BUILD_DEPENDS+= e2fsprogs-libuuid>=0:misc/e2fsprogs-libuuid \ gnutls>=0:security/gnutls 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} DESCR?= ${.CURDIR}/pkg-descr MAKE_ENV+= V=1 CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} CC=clang MAKE_ARGS+= ${ARCHFLAGS} NO_ARCH= yes # Use upstreamed patches not yet mainlined PATCH_DIST_STRIP= -p1 PATCH_SITES+= https://patchwork.ozlabs.org/patch/ # Sanity checks .if !defined(MODEL) && !defined(BOARD_CONFIG) && !defined(FAMILY) MODEL= NONE IGNORE= is a metaport; there is nothing to build .else .if !defined(MODEL) IGNORE+= MODEL is not defined .endif .if !defined(BOARD_CONFIG) IGNORE+= BOARD_CONFIG is not defined .endif .if !defined(FAMILY) IGNORE+= FAMILY is not defined .endif .endif # Overrides for OMAP family UBOOT_PLIST_OMAP=u-boot.img MLO UBOOT_METADATA_OMAP_FILES= ${UBOOT_PLIST_OMAP} UBOOT_METADATA_OMAP_METHOD= file # Overrides for ALLWINNER family UBOOT_PLIST_ALLWINNER=u-boot-sunxi-with-spl.bin UBOOT_METADATA_ALLWINNER_FILES= ${UBOOT_PLIST_ALLWINNER} UBOOT_METADATA_ALLWINNER_METHOD= raw UBOOT_METADATA_ALLWINNER_RAW_OFFSET= 8 UBOOT_METADATA_ALLWINNER_RAW_BS= 1k # Overrides for ALLWINNER64 family UBOOT_PLIST_ALLWINNER64=${UBOOT_PLIST_ALLWINNER} UBOOT_ARCH_ALLWINNER64=aarch64 UBOOT_METADATA_ALLWINNER64_FILES= ${UBOOT_PLIST_ALLWINNER64} UBOOT_METADATA_ALLWINNER64_METHOD= raw UBOOT_METADATA_ALLWINNER64_RAW_OFFSET= 1 UBOOT_METADATA_ALLWINNER64_RAW_BS= 128k # Overrides for Zynq 7000 family UBOOT_PLIST_ZYNQ_7000=u-boot.img boot.bin uEnv.txt UBOOT_MOVE_ZYNQ_7000=${WRKSRC}/spl/boot.bin ${.CURDIR}/files/uEnv.txt # Overrides for RPI family UBOOT_PLIST_RPI= u-boot.bin UBOOT_METADATA_RPI_FILES= ${UBOOT_PLIST_RPI} UBOOT_METADATA_RPI_METHOD= file # Overrides for IMX6 family UBOOT_METADATA_IMX6_FILES= u-boot.imx UBOOT_METADATA_IMX6_METHOD= raw UBOOT_METADATA_IMX6_RAW_OFFSET= 2 UBOOT_METADATA_IMX6_RAW_BS= 512 # Override for RK3328 family UBOOT_PLIST_RK3328= idbloader.img u-boot.itb UBOOT_ARCH_RK3328= aarch64 # Override for RK3399 family UBOOT_PLIST_RK3399= idbloader.img u-boot.itb UBOOT_ARCH_RK3399= aarch64 # Override for ARMADA38X family UBOOT_PLIST_ARMADA38X= u-boot-with-spl.kwb UBOOT_METADATA_ARMADA38X_FILES= ${UBOOT_PLIST_ARMADA38X} UBOOT_METADATA_ARMADA38X_METHOD= raw UBOOT_METADATA_ARMADA38X_RAW_OFFSET= 1 UBOOT_METADATA_ARMADA38X_RAW_BS= 512 # Override for QEMU family UBOOT_PLIST_QEMU= u-boot.bin # Uboot variables .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}) PORTREVISION= ${U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION}} .endif .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu}) UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}} .endif UBOOT_PLIST?=u-boot.img .if !defined(UBOOT_ARCH) && defined(UBOOT_ARCH_${FAMILY:tu}) UBOOT_ARCH=${UBOOT_ARCH_${FAMILY:tu}} .endif UBOOT_ARCH?= arm .if ${UBOOT_ARCH} == arm CROSS_COMPILE=arm-none-eabi- ARCHFLAGS=ARCH=${UBOOT_ARCH} .elif ${UBOOT_ARCH} == aarch64 CROSS_COMPILE=aarch64-none-elf- ARCHFLAGS=ARCH=arm .if ${FAMILY} == allwinner64 MAKE_ENV+= SCP=/dev/null .endif .elif ${UBOOT_ARCH} == riscv64 CROSS_COMPILE=riscv64-none-elf- ARCHFLAGS=ARCH=riscv .else # Best guess for other architectures CROSS_COMPILE=${UBOOT_ARCH}-none-elf- ARCHFLAGS=ARCH=${UBOOT_ARCH} .endif COMPILER?=${CROSS_COMPILE}gcc .if !defined(UBOOT_MOVE) && defined(UBOOT_MOVE_${FAMILY:tu}) UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}} .endif # Per family dependancies .if defined(FAMILY) && ${FAMILY} == allwinner64 .if defined(SUBFAMILY) && ${SUBFAMILY} == h6 BUILD_DEPENDS+= ${LOCALBASE}/share/atf-sun50i_h6/bl31.bin:sysutils/atf-sun50i_h6 MAKE_ENV+= BL31=${LOCALBASE}/share/atf-sun50i_h6/bl31.bin .else BUILD_DEPENDS+= ${LOCALBASE}/share/atf-sun50i_a64/bl31.bin:sysutils/atf-sun50i_a64 MAKE_ENV+= BL31=${LOCALBASE}/share/atf-sun50i_a64/bl31.bin .endif .endif .if defined(FAMILY) && ${FAMILY} == rk3328 BUILD_DEPENDS+= ${LOCALBASE}/share/atf-rk3328/bl31.elf:sysutils/atf-rk3328 \ ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} MAKE_ENV+= BL31=${LOCALBASE}/share/atf-rk3328/bl31.elf .endif .if defined(FAMILY) && ${FAMILY} == rk3399 BUILD_DEPENDS+= ${LOCALBASE}/share/atf-rk3399/bl31.elf:sysutils/atf-rk3399 \ ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} MAKE_ENV+= BL31=${LOCALBASE}/share/atf-rk3399/bl31.elf .endif # Each u-boot family has different files to include, bring them in. .for i in ${UBOOT_PLIST} PLIST_FILES+= ${UBOOT_DIR}/${i} .endfor PLIST_FILES+= ${UBOOT_DIR}/README .if defined(PLIST_EXTRAS) .for i in ${PLIST_EXTRAS} PLIST_FILES+= ${UBOOT_DIR}/${i} .endfor .endif .if !defined(NO_METADATA) .if defined(UBOOT_METADATA_${FAMILY:tu}_METHOD) METADATA_METHOD=${UBOOT_METADATA_${FAMILY:tu}_METHOD} METADATA_FILES=${UBOOT_METADATA_${FAMILY:tu}_FILES} PLIST_FILES+= ${UBOOT_DIR}/metadata UBOOT_PLIST+= metadata .if ${METADATA_METHOD} == "raw" METADATA_OFFSET=${UBOOT_METADATA_${FAMILY:tu}_RAW_OFFSET} METADATA_BS=${UBOOT_METADATA_${FAMILY:tu}_RAW_BS} .elif ${METADATA_METHOD} == "file" .else .error "Unsupported METADATA_METHOD" .endif .endif .endif post-patch: @${REINPLACE_CMD} -e "s|make|${MAKE_CMD}|" ${WRKSRC}/scripts/kconfig/merge_config.sh .if defined(METADATA_METHOD) @echo "METHOD=uboot-${METADATA_METHOD}" > ${WRKSRC}/metadata @echo "FILES=\"${METADATA_FILES}\"" >> ${WRKSRC}/metadata .if ${METADATA_METHOD} == "raw" @echo "OFFSET=${METADATA_OFFSET}" >> ${WRKSRC}/metadata @echo "BS=${METADATA_BS}" >> ${WRKSRC}/metadata .elif ${METADATA_METHOD} == "file" .endif .endif .if ${UBOOT_ARCH} == arm && !defined(CONFIG_FRAGMENT) # For armv6/v7 we want do disable secure mode and cache cleaning # Use a KConfig fragment for that FRAGMENT_NAME= FreeBSD_Fragment CONFIG_FRAGMENT= ${FILESDIR}/${FRAGMENT_NAME} .endif .if defined(CONFIG_FRAGMENT) do-configure: ${CP} ${CONFIG_FRAGMENT} ${WRKSRC}/configs/ (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME}) .else do-configure: (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${BOARD_CONFIG}) .endif post-build: .if defined(UBOOT_EXTRA_TARGETS) .for i in ${UBOOT_EXTRA_TARGETS} (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${i}) .endfor .endif # If we need to put anything into WRKSRC, do so now so we can build the PLIST # in do-install .if defined(UBOOT_MOVE) pre-install: ${CP} ${UBOOT_MOVE} ${WRKSRC} .endif do-install: ${MKDIR} ${STAGEDIR}/${INST} .for i in ${UBOOT_PLIST} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${INST} .endfor ${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README .include diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo index 7154b3159d1d..61b7d4fe0c48 100644 --- a/sysutils/u-boot-master/distinfo +++ b/sysutils/u-boot-master/distinfo @@ -1,15 +1,15 @@ -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 SIZE (u-boot/1036621/raw) = 480 SHA256 (u-boot/1173473/raw) = 4f182d6f99b1d868237607200d64a1d8a2d57ea44fc25ca49bce929ad6457228 SIZE (u-boot/1173473/raw) = 433 SHA256 (u-boot/1172554/raw) = d1a39d7d6487cfb481392e7ea4f0bf0d209c08e0c3426c29d7eeaeb9b806cf42 SIZE (u-boot/1172554/raw) = 640 SHA256 (u-boot/1172555/raw) = 09d17a62fb6bc7c7ab73bfc7061fc5da2b5a32e7deb098c9f76aed8ff8991751 SIZE (u-boot/1172555/raw) = 568 SHA256 (u-boot/1665960/raw) = adcd5f5fb5be8e541a32815bf0070cea0a45706aed2d1bf571510b9eaf2ab532 SIZE (u-boot/1665960/raw) = 923 diff --git a/sysutils/u-boot-rockpro64/Makefile b/sysutils/u-boot-rockpro64/Makefile index db0818d0ef33..4a99f531d2cd 100644 --- a/sysutils/u-boot-rockpro64/Makefile +++ b/sysutils/u-boot-rockpro64/Makefile @@ -1,7 +1,9 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +EXTRA_PATCHES= ${.CURDIR}/files/ + MODEL= rockpro64 BOARD_CONFIG= rockpro64-rk3399_defconfig FAMILY= rk3399 .include "${MASTERDIR}/Makefile" 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 index 000000000000..557c3a36db10 --- /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 +