Date: Wed, 9 Oct 2019 19:15:25 +0000 (UTC) From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514185 - in head/sysutils: u-boot-beaglebone u-boot-firefly-rk3399 u-boot-master u-boot-master/files u-boot-rock64 u-boot-rockpro64 u-boot-tools Message-ID: <201910091915.x99JFPm5075946@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu Date: Wed Oct 9 19:15:25 2019 New Revision: 514185 URL: https://svnweb.freebsd.org/changeset/ports/514185 Log: u-boot: Update to v2019.10 Update u-boot to its latest version. For RK3399 we now use SPL+TPL from u-boot, no need for RockChip blob. Remove one efi related patch that isn't needed anymore. Tested-on: Pine64-LTS, Rock64, Rockpro64, BBB, RPI2, OrangePi One Deleted: head/sysutils/u-boot-master/files/patch-lib_efi__loader_efi__boottime.c Modified: head/sysutils/u-boot-beaglebone/Makefile head/sysutils/u-boot-firefly-rk3399/Makefile head/sysutils/u-boot-firefly-rk3399/pkg-descr head/sysutils/u-boot-master/Makefile head/sysutils/u-boot-master/distinfo head/sysutils/u-boot-rock64/Makefile head/sysutils/u-boot-rockpro64/pkg-descr head/sysutils/u-boot-tools/Makefile head/sysutils/u-boot-tools/distinfo Modified: head/sysutils/u-boot-beaglebone/Makefile ============================================================================== --- head/sysutils/u-boot-beaglebone/Makefile Wed Oct 9 18:59:45 2019 (r514184) +++ head/sysutils/u-boot-beaglebone/Makefile Wed Oct 9 19:15:25 2019 (r514185) @@ -2,8 +2,6 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2019.07= 1 - MODEL= beaglebone BOARD_CONFIG= am335x_evm_defconfig FAMILY= omap Modified: head/sysutils/u-boot-firefly-rk3399/Makefile ============================================================================== --- head/sysutils/u-boot-firefly-rk3399/Makefile Wed Oct 9 18:59:45 2019 (r514184) +++ head/sysutils/u-boot-firefly-rk3399/Makefile Wed Oct 9 19:15:25 2019 (r514185) @@ -2,12 +2,8 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2019.07= 1 - MODEL= firefly-rk3399 BOARD_CONFIG= firefly-rk3399_defconfig FAMILY= rk3399 - -UBOOT_EXTRA_TARGETS= u-boot.itb .include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-firefly-rk3399/pkg-descr ============================================================================== --- head/sysutils/u-boot-firefly-rk3399/pkg-descr Wed Oct 9 18:59:45 2019 (r514184) +++ head/sysutils/u-boot-firefly-rk3399/pkg-descr Wed Oct 9 19:15:25 2019 (r514185) @@ -1,7 +1,7 @@ U-Boot loader and related files for the Firefly RK3399. To install this bootloader on an sdcard just do: -dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/idbspl.img of=/path/to/sdcarddevice seek=64 +dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/idbloader.img of=/path/to/sdcarddevice seek=64 dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/u-boot.itb of=/path/to/sdcarddevice seek=16384 conv=sync WWW: http://www.denx.de/wiki/U-Boot Modified: head/sysutils/u-boot-master/Makefile ============================================================================== --- head/sysutils/u-boot-master/Makefile Wed Oct 9 18:59:45 2019 (r514184) +++ head/sysutils/u-boot-master/Makefile Wed Oct 9 19:15:25 2019 (r514185) @@ -22,12 +22,6 @@ BUILD_DEPENDS+= gsed:textproc/gsed \ BUILD_DEPENDS+= ${COMPILER}:devel/${COMPILER} USES= bison gmake python:2.7,build shebangfix tar:bz2 -.if defined(FAMILY) && ${FAMILY} == rk3399 -USES+= linux -USE_LINUX+= base:build -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= RockChip tools are only for amd64 -.endif BINARY_ALIAS= bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed swig=swig3.0 python2=python2.7 SHEBANG_FILES= tools/binman/binman.py arch/arm/mach-rockchip/make_fit_atf.py @@ -100,7 +94,7 @@ UBOOT_PLIST_RK3328= idbloader.img u-boot.itb UBOOT_ARCH_RK3328= aarch64 # Override for RK3399 family -UBOOT_PLIST_RK3399= idbloader.img trust.img uboot.img +UBOOT_PLIST_RK3399= idbloader.img u-boot.itb UBOOT_ARCH_RK3399= aarch64 # Override for ARMADA38X family @@ -114,7 +108,7 @@ UBOOT_METADATA_ARMADA38X_RAW_BS= 512 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}} .endif -UBOOT_VERSION?= 2019.07 +UBOOT_VERSION?= 2019.10 # If a slave port defines a PORTREVISION use it .if defined(U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION}) @@ -157,15 +151,14 @@ MAKE_ENV+= BL31=${LOCALBASE}/share/atf-sun50i_a64/bl31 .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} \ - ${LOCALBASE}/bin/rk-trust_merger:sysutils/linux-rkbin + ${LOCALBASE}/share/linux-rkbin/bin/rk33/rk3328_ddr_333MHz_v1.16.bin:sysutils/linux-rkbin \ + ${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} \ - ${LOCALBASE}/bin/rk-trust_merger:sysutils/linux-rkbin + ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} MAKE_ENV+= BL31=${LOCALBASE}/share/atf-rk3399/bl31.elf .endif @@ -230,12 +223,6 @@ post-build: .if defined(FAMILY) && ${FAMILY} == rk3328 mkimage -n rk3328 -T rksd -d ${LOCALBASE}/share/linux-rkbin/bin/rk33/rk3328_ddr_333MHz_v1.16.bin ${WRKSRC}/idbloader.img cat ${WRKSRC}/spl/u-boot-spl.bin >> ${WRKSRC}/idbloader.img -.endif -.if defined(FAMILY) && ${FAMILY} == rk3399 - mkimage -n rk3399 -T rksd -d ${LOCALBASE}/share/linux-rkbin/bin/rk33/rk3399_ddr_800MHz_v1.23.bin ${WRKSRC}/idbloader.img - cat ${LOCALBASE}/share/linux-rkbin/bin/rk33/rk3399_miniloader_v1.19.bin >> ${WRKSRC}/idbloader.img - (cd ${WRKSRC} && rk-trust_merger ${LOCALBASE}/share/linux-rkbin/rktrust/RK3399TRUST.ini) - (cd ${WRKSRC} && rk-loaderimage --pack --uboot u-boot-dtb.bin uboot.img) .endif # If we need to put anything into WRKSRC, do so now so we can build the PLIST # in do-install Modified: head/sysutils/u-boot-master/distinfo ============================================================================== --- head/sysutils/u-boot-master/distinfo Wed Oct 9 18:59:45 2019 (r514184) +++ head/sysutils/u-boot-master/distinfo Wed Oct 9 19:15:25 2019 (r514185) @@ -1,7 +1,9 @@ -TIMESTAMP = 1563557649 -SHA256 (u-boot/u-boot-2019.07.tar.bz2) = bff4fa77e8da17521c030ca4c5b947a056c1b1be4d3e6ee8637020b8d50251d0 -SIZE (u-boot/u-boot-2019.07.tar.bz2) = 13939667 -SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7 -SIZE (u-boot/1036621/raw) = 480 +TIMESTAMP = 1570557780 +SHA256 (u-boot/u-boot-2019.10.tar.bz2) = 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 +SIZE (u-boot/u-boot-2019.10.tar.bz2) = 14214608 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 Modified: head/sysutils/u-boot-rock64/Makefile ============================================================================== --- head/sysutils/u-boot-rock64/Makefile Wed Oct 9 18:59:45 2019 (r514184) +++ head/sysutils/u-boot-rock64/Makefile Wed Oct 9 19:15:25 2019 (r514185) @@ -2,6 +2,8 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +PATCHFILES+= 1173473/raw + MODEL= rock64 BOARD_CONFIG= rock64-rk3328_defconfig FAMILY= rk3328 Modified: head/sysutils/u-boot-rockpro64/pkg-descr ============================================================================== --- head/sysutils/u-boot-rockpro64/pkg-descr Wed Oct 9 18:59:45 2019 (r514184) +++ head/sysutils/u-boot-rockpro64/pkg-descr Wed Oct 9 19:15:25 2019 (r514185) @@ -2,7 +2,6 @@ U-Boot loader and related files for the Pine64 RockPro To install this bootloader on an sdcard just do: dd if=/usr/local/share/u-boot/u-boot-rockpro64/idbloader.img of=/path/to/sdcarddevice seek=64 bs=512 conv=sync -dd if=/usr/local/share/u-boot/u-boot-rockpro64/trust.img of=/path/to/sdcarddevice seek=24576 bs=512 conv=sync -dd if=/usr/local/share/u-boot/u-boot-rockpro64/uboot.img of=/path/to/sdcarddevice seek=16384 bs=512 conv=sync +dd if=/usr/local/share/u-boot/u-boot-rockpro64/u-boot.itb of=/path/to/sdcarddevice seek=16384 bs=512 conv=sync WWW: http://www.denx.de/wiki/U-Boot Modified: head/sysutils/u-boot-tools/Makefile ============================================================================== --- head/sysutils/u-boot-tools/Makefile Wed Oct 9 18:59:45 2019 (r514184) +++ head/sysutils/u-boot-tools/Makefile Wed Oct 9 19:15:25 2019 (r514185) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= u-boot-tools -DISTVERSION= 2019.01 +DISTVERSION= 2019.10 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ DISTNAME= u-boot-${PORTVERSION} Modified: head/sysutils/u-boot-tools/distinfo ============================================================================== --- head/sysutils/u-boot-tools/distinfo Wed Oct 9 18:59:45 2019 (r514184) +++ head/sysutils/u-boot-tools/distinfo Wed Oct 9 19:15:25 2019 (r514185) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549304332 -SHA256 (u-boot-2019.01.tar.bz2) = 50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22 -SIZE (u-boot-2019.01.tar.bz2) = 13366005 +TIMESTAMP = 1570519184 +SHA256 (u-boot-2019.10.tar.bz2) = 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 +SIZE (u-boot-2019.10.tar.bz2) = 14214608
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910091915.x99JFPm5075946>