Index: head/sysutils/u-boot-master/Makefile =================================================================== --- head/sysutils/u-boot-master/Makefile (revision 554414) +++ head/sysutils/u-boot-master/Makefile (revision 554415) @@ -1,242 +1,242 @@ # $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 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 # 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?= 2020.07 +UBOOT_VERSION?= 2020.10 # 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 .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 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 554414) +++ head/sysutils/u-boot-master/distinfo (revision 554415) @@ -1,13 +1,13 @@ -TIMESTAMP = 1594110266 -SHA256 (u-boot/u-boot-2020.07.tar.bz2) = c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a -SIZE (u-boot/u-boot-2020.07.tar.bz2) = 15338841 +TIMESTAMP = 1602419610 +SHA256 (u-boot/u-boot-2020.10.tar.bz2) = 0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622 +SIZE (u-boot/u-boot-2020.10.tar.bz2) = 15784894 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 Index: head/sysutils/u-boot-master/files/patch-common__bootm.c =================================================================== --- head/sysutils/u-boot-master/files/patch-common__bootm.c (nonexistent) +++ head/sysutils/u-boot-master/files/patch-common__bootm.c (revision 554415) @@ -0,0 +1,31 @@ +From 7d25c0b01248fbfbbcdf668cc1c080fe0b54978f Mon Sep 17 00:00:00 2001 +From: Emmanuel Vadot +Date: Sat, 7 Nov 2020 19:42:31 +0100 +Subject: [PATCH 2/2] Add FreeBSD hack that does not disable usb when + efi_exit_boot_service is called +Content-Type: text/plain; charset=UTF-8 + +--- + common/bootm.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/common/bootm.c b/common/bootm.c +index b3377490b3..22476fc7c9 100644 +--- common/bootm.c ++++ common/bootm.c +@@ -458,7 +458,12 @@ ulong bootm_disable_interrupts(void) + * updated every 1 ms within the HCCA structure in SDRAM! For more + * details see the OpenHCI specification. + */ ++ /* ++ * FreeBSD Hack, on some board this cause efi_exit_bootservice to hang ++ * for some yet unknown reason. ++ * This only does this when doing netboot ??? + usb_stop(); ++ */ + #endif + return iflag; + } +-- +2.28.0 + Property changes on: head/sysutils/u-boot-master/files/patch-common__bootm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-rockpro64/Makefile =================================================================== --- head/sysutils/u-boot-rockpro64/Makefile (revision 554414) +++ head/sysutils/u-boot-rockpro64/Makefile (revision 554415) @@ -1,9 +1,11 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../u-boot-master +EXTRA_PATCHES= ${.CURDIR}/files + MODEL= rockpro64 BOARD_CONFIG= rockpro64-rk3399_defconfig FAMILY= rk3399 .include "${MASTERDIR}/Makefile" Index: head/sysutils/u-boot-rockpro64/files/patch-arch_arm_dts_rk3399-u-boot.dtsi =================================================================== --- head/sysutils/u-boot-rockpro64/files/patch-arch_arm_dts_rk3399-u-boot.dtsi (nonexistent) +++ head/sysutils/u-boot-rockpro64/files/patch-arch_arm_dts_rk3399-u-boot.dtsi (revision 554415) @@ -0,0 +1,25 @@ +From 84090d14ac93f67f2c11716912d3e352e3d9856d Mon Sep 17 00:00:00 2001 +From: Emmanuel Vadot +Date: Sun, 11 Oct 2020 17:22:45 +0200 +Subject: [PATCH 1/2] Remove spi1 alias, it breaks detecting flash on rockpro64 +Content-Type: text/plain; charset=UTF-8 + +--- + arch/arm/dts/rk3399-u-boot.dtsi | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi +index ecd230c720..2d5e5d9900 100644 +--- arch/arm/dts/rk3399-u-boot.dtsi ++++ arch/arm/dts/rk3399-u-boot.dtsi +@@ -11,7 +11,6 @@ + mmc0 = &sdhci; + mmc1 = &sdmmc; + pci0 = &pcie0; +- spi1 = &spi1; + }; + + cic: syscon@ff620000 { +-- +2.28.0 + Property changes on: head/sysutils/u-boot-rockpro64/files/patch-arch_arm_dts_rk3399-u-boot.dtsi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property