Index: head/sysutils/u-boot-master/Makefile =================================================================== --- head/sysutils/u-boot-master/Makefile (revision 541504) +++ head/sysutils/u-boot-master/Makefile (revision 541505) @@ -1,236 +1,236 @@ # $FreeBSD$ # # Common infrastructure for u-boot ports # PORTNAME= u-boot PORTVERSION= ${UBOOT_VERSION} CATEGORIES= sysutils PKGNAMESUFFIX?= -${MODEL} MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ DIST_SUBDIR= u-boot MAINTAINER?= uboot@FreeBSD.org COMMENT= Cross-build das u-boot for model ${MODEL} LICENSE= GPLv2 BUILD_DEPENDS+= gsed:textproc/gsed \ swig:devel/swig \ dtc>=1.4.1:sysutils/dtc \ mkimage:sysutils/u-boot-tools BUILD_DEPENDS+= ${COMPILER}:devel/${COMPILER} USES= bison gmake python:3.7+,build shebangfix tar:bz2 BINARY_ALIAS= bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed python3=${PYTHON_CMD} -SHEBANG_FILES= tools/binman/binman.py arch/arm/mach-rockchip/make_fit_atf.py +SHEBANG_FILES= tools/binman/binman arch/arm/mach-rockchip/make_fit_atf.py SSP_UNSAFE= yes UBOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} INST= ${PREFIX}/${UBOOT_DIR} DESCR?= ${.CURDIR}/pkg-descr MAKE_ARGS+= V=1 CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} ${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= 8 UBOOT_METADATA_ALLWINNER64_RAW_BS= 1k # 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-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 # Uboot variables .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}} .endif -UBOOT_VERSION?= 2020.04 +UBOOT_VERSION?= 2020.07 # 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} UBOOT_PLIST+= boot.scr .elif ${UBOOT_ARCH} == aarch64 CROSS_COMPILE=aarch64-none-elf- ARCHFLAGS=ARCH=arm .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 BUILD_DEPENDS+= ${LOCALBASE}/share/atf-sun50i_a64/bl31.bin:sysutils/atf-sun50i_a64 MAKE_ENV+= BL31=${LOCALBASE}/share/atf-sun50i_a64/bl31.bin .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(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 post-patch: @${REINPLACE_CMD} -e "s|make|${MAKE_CMD}|" ${WRKSRC}/scripts/kconfig/merge_config.sh ${CP} ${FILESDIR}/boot.cmd ${WRKSRC}/ .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 CONFIG_API # 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} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME}) .else do-configure: (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG}) .endif post-build: .if ${UBOOT_ARCH} == arm mkimage -C none -A arm -T script -d ${FILESDIR}/boot.cmd ${WRKSRC}/boot.scr .endif .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 Index: head/sysutils/u-boot-master/distinfo =================================================================== --- head/sysutils/u-boot-master/distinfo (revision 541504) +++ head/sysutils/u-boot-master/distinfo (revision 541505) @@ -1,31 +1,13 @@ -TIMESTAMP = 1587670026 -SHA256 (u-boot/u-boot-2020.01.tar.bz2) = aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 -SIZE (u-boot/u-boot-2020.01.tar.bz2) = 14716125 -SHA256 (u-boot/u-boot-2020.04.tar.bz2) = fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 -SIZE (u-boot/u-boot-2020.04.tar.bz2) = 15065656 +TIMESTAMP = 1594110266 +SHA256 (u-boot/u-boot-2020.07.tar.bz2) = c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a +SIZE (u-boot/u-boot-2020.07.tar.bz2) = 15338841 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/1245351/raw) = 02cec0ca1934ba64d010ec7f0453faa127b19aaae679d6bd9b946a3653837434 -SIZE (u-boot/1245351/raw) = 707 -SHA256 (u-boot/1245352/raw) = a4f48937cd9403b7f7708ba1fc5b9405da97bdedff25fdeb198ab613294e7d45 -SIZE (u-boot/1245352/raw) = 465 -SHA256 (u-boot/1273633/raw) = 707973b638d5d67f88566249bc109059e7c22fba33f7aa40b9eea3dda87370fe -SIZE (u-boot/1273633/raw) = 993 -SHA256 (u-boot/1273674/raw) = 5124273a901a214cd6b8cd4a00355c292be82c7a228b4faf81d36085f8656956 -SIZE (u-boot/1273674/raw) = 3331 -SHA256 (u-boot/1273675/raw) = 304903e0318c63f2e69cf1e3a2e0dba8c33f1d3c2e6643c5599a182a84e829b2 -SIZE (u-boot/1273675/raw) = 23966 -SHA256 (u-boot/1273676/raw) = d95cba1b622c83da919beea4a048ce85100d1b8ec6416c9d230a9933beb340b1 -SIZE (u-boot/1273676/raw) = 8535 -SHA256 (u-boot/1273677/raw) = d65a7f197269499624901b6e34a9dbf2134892fc2d1f303190ecb43fdfbb5635 -SIZE (u-boot/1273677/raw) = 587 -SHA256 (u-boot/1273678/raw) = b29ec14ddbfc75acc631871cff70e1ec9fd5c037c4bf2a6930ed26c4ed8dabc2 -SIZE (u-boot/1273678/raw) = 447 Index: head/sysutils/u-boot-master/files/patch-lib-rsa_rsa_sign.c =================================================================== --- head/sysutils/u-boot-master/files/patch-lib-rsa_rsa_sign.c (revision 541504) +++ head/sysutils/u-boot-master/files/patch-lib-rsa_rsa_sign.c (nonexistent) @@ -1,11 +0,0 @@ ---- lib/rsa/rsa-sign.c.orig 2020-04-27 13:01:22.257655000 +0200 -+++ lib/rsa/rsa-sign.c 2020-04-27 13:01:38.844321000 +0200 -@@ -4,7 +4,7 @@ - */ - - #include "mkimage.h" --#include -+#include - #include - #include - #include Property changes on: head/sysutils/u-boot-master/files/patch-lib-rsa_rsa_sign.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/u-boot-pinebookpro/Makefile =================================================================== --- head/sysutils/u-boot-pinebookpro/Makefile (revision 541504) +++ head/sysutils/u-boot-pinebookpro/Makefile (revision 541505) @@ -1,16 +1,9 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../u-boot-master MODEL= pinebookpro BOARD_CONFIG= pinebook-pro-rk3399_defconfig FAMILY= rk3399 -PATCHFILES+= 1273633/raw \ - 1273674/raw \ - 1273675/raw \ - 1273676/raw \ - 1273677/raw \ - 1273678/raw - .include "${MASTERDIR}/Makefile" Index: head/sysutils/u-boot-rpi3/Makefile =================================================================== --- head/sysutils/u-boot-rpi3/Makefile (revision 541504) +++ head/sysutils/u-boot-rpi3/Makefile (revision 541505) @@ -1,20 +1,18 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../u-boot-master EXTRA_PATCHES= ${.CURDIR}/files/ PATCHFILES+= 939129/raw -# Allow variable reservation of lowest pages for increased PSCI stub size. -PATCHFILES+= 1245351/raw 1245352/raw MODEL?= rpi3 BOARD_CONFIG?= rpi_3_defconfig FAMILY= rpi UBOOT_ARCH?= aarch64 DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware CONFIG_FRAGMENT= ${.CURDIR}/../u-boot-rpi3/files/rpi3_fragment FRAGMENT_NAME= rpi3_fragment .include "${MASTERDIR}/Makefile" Index: head/sysutils/u-boot-rpi4/Makefile =================================================================== --- head/sysutils/u-boot-rpi4/Makefile (revision 541504) +++ head/sysutils/u-boot-rpi4/Makefile (revision 541505) @@ -1,20 +1,18 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../u-boot-master EXTRA_PATCHES= ${.CURDIR}/files/ PATCHFILES+= 939129/raw -# Allow variable reservation of lowest pages for increased PSCI stub size. -PATCHFILES+= 1245351/raw 1245352/raw MODEL= rpi4 BOARD_CONFIG= rpi_4_defconfig FAMILY= rpi UBOOT_ARCH= aarch64 DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware CONFIG_FRAGMENT= ${.CURDIR}/files/rpi4_fragment FRAGMENT_NAME= rpi4_fragment .include "${MASTERDIR}/Makefile" Index: head/sysutils/u-boot-tools/files/patch-lib_rsa_rsa-sign.c =================================================================== --- head/sysutils/u-boot-tools/files/patch-lib_rsa_rsa-sign.c (revision 541504) +++ head/sysutils/u-boot-tools/files/patch-lib_rsa_rsa-sign.c (nonexistent) @@ -1,10 +0,0 @@ ---- lib/rsa/rsa-sign.c.orig 2020-06-27 12:26:29 UTC -+++ lib/rsa/rsa-sign.c -@@ -4,7 +4,6 @@ - */ - - #include "mkimage.h" --#include - #include - #include - #include Property changes on: head/sysutils/u-boot-tools/files/patch-lib_rsa_rsa-sign.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/u-boot-tools/Makefile =================================================================== --- head/sysutils/u-boot-tools/Makefile (revision 541504) +++ head/sysutils/u-boot-tools/Makefile (revision 541505) @@ -1,40 +1,40 @@ # Created by: Emmanuel Vadot # $FreeBSD$ PORTNAME= u-boot-tools -DISTVERSION= 2020.04 +DISTVERSION= 2020.07 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ DISTNAME= u-boot-${PORTVERSION} MAINTAINER= uboot@FreeBSD.org COMMENT= U-boot related tools LICENSE= GPLv2 BROKEN_powerpc64= fails to build: include/config_distro_bootcmd.h:279:3: sandbox EFI support is only supported on ARM and x86 BROKEN_SSL= libressl BROKEN_SSL_REASON_libressl= not supported by the upstream USES= bison compiler:c11 gmake python:build ssl tar:bzip2 CONFLICTS= uboot-mkimage ALL_TARGET= tools-only MAKE_ARGS= ARCH=sandbox \ CC="${CC}" \ HOSTCC="${CC}" \ KBUILD_VERBOSE=1 \ NOSTDINC_FLAGS="" \ PLIST_FILES= bin/mkimage bin/mkenvimage bin/dumpimage bin/fit_info do-configure: (cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} sandbox_defconfig) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tools/dumpimage ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/tools/fit_info ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/tools/mkenvimage ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/tools/mkimage ${STAGEDIR}${PREFIX}/bin .include Index: head/sysutils/u-boot-tools/distinfo =================================================================== --- head/sysutils/u-boot-tools/distinfo (revision 541504) +++ head/sysutils/u-boot-tools/distinfo (revision 541505) @@ -1,3 +1,3 @@ -TIMESTAMP = 1593016469 -SHA256 (u-boot-2020.04.tar.bz2) = fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 -SIZE (u-boot-2020.04.tar.bz2) = 15065656 +TIMESTAMP = 1594115686 +SHA256 (u-boot-2020.07.tar.bz2) = c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a +SIZE (u-boot-2020.07.tar.bz2) = 15338841