Date: Mon, 11 Dec 2017 17:54:20 +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: r456054 - in head/sysutils: u-boot-master u-boot-pine64 u-boot-sopine Message-ID: <201712111754.vBBHsKVV070828@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu (src committer) Date: Mon Dec 11 17:54:20 2017 New Revision: 456054 URL: https://svnweb.freebsd.org/changeset/ports/456054 Log: u-boot: Move allwinner 64 bits dep to u-boot-master We have more than one Allwinner 64bits SoC u-boot ports now and others are coming. Move the dependencies into the u-boot-master ports. While here, switch maintainer on u-boot-pine64 and u-boot-sopine to uboot@ as discussed with imp@ and brd@ Reviewed by: imp (maintainer) Approved by: imp Differential Revision: https://reviews.freebsd.org/D13450 Modified: head/sysutils/u-boot-master/Makefile head/sysutils/u-boot-pine64/Makefile head/sysutils/u-boot-sopine/Makefile Modified: head/sysutils/u-boot-master/Makefile ============================================================================== --- head/sysutils/u-boot-master/Makefile Mon Dec 11 17:39:19 2017 (r456053) +++ head/sysutils/u-boot-master/Makefile Mon Dec 11 17:54:20 2017 (r456054) @@ -5,6 +5,7 @@ PORTNAME= u-boot PORTVERSION= ${UBOOT_VERSION} +PORTREVISION= 1 DISTVERSIONPREFIX= ports-v CATEGORIES= sysutils PKGNAMESUFFIX?= -${MODEL} @@ -97,6 +98,12 @@ COMPILER?=${CROSS_COMPILE}gcc UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}} .endif +# Per family dependancies +.if ${FAMILY} == allwinner64 +BUILD_DEPENDS+= ${LOCALBASE}/share/atf-allwinner/bl31.bin:sysutils/atf-allwinner +MAKE_ENV+= BL31=${LOCALBASE}/share/atf-allwinner/bl31.bin +.endif + # Each u-boot family has different files to include, bring them in. .for i in ${UBOOT_PLIST} PLIST_FILES+= ${UBOOT_DIR}/${i} @@ -105,6 +112,13 @@ PLIST_FILES+= ${UBOOT_DIR}/README do-configure: (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG}) + +# U-Boot for Allwinner 64bits SoCs is splited in two parts +# Generate a single binary to ease deployement on sdcard +.if ${FAMILY} == allwinner64 +post-build: + ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin +.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-pine64/Makefile ============================================================================== --- head/sysutils/u-boot-pine64/Makefile Mon Dec 11 17:39:19 2017 (r456053) +++ head/sysutils/u-boot-pine64/Makefile Mon Dec 11 17:54:20 2017 (r456054) @@ -1,16 +1,10 @@ # $FreeBSD$ -MAINTAINER= manu@FreeBSD.org +MAINTAINER= uboot@FreeBSD.org MASTERDIR= ${.CURDIR}/../u-boot-master MODEL= pine64 BOARD_CONFIG= pine64_plus_defconfig FAMILY= allwinner64 - -BUILD_DEPENDS= ${LOCALBASE}/share/atf-allwinner/bl31.bin:sysutils/atf-allwinner -MAKE_ENV+= BL31=${LOCALBASE}/share/atf-allwinner/bl31.bin - -post-build: - ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin .include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-sopine/Makefile ============================================================================== --- head/sysutils/u-boot-sopine/Makefile Mon Dec 11 17:39:19 2017 (r456053) +++ head/sysutils/u-boot-sopine/Makefile Mon Dec 11 17:54:20 2017 (r456054) @@ -1,16 +1,10 @@ # $FreeBSD$ -MAINTAINER= manu@FreeBSD.org +MAINTAINER= uboot@FreeBSD.org MASTERDIR= ${.CURDIR}/../u-boot-master MODEL= sopine BOARD_CONFIG= sopine_baseboard_defconfig FAMILY= allwinner64 - -BUILD_DEPENDS= ${LOCALBASE}/share/atf-allwinner/bl31.bin:sysutils/atf-allwinner -MAKE_ENV+= BL31=${LOCALBASE}/share/atf-allwinner/bl31.bin - -post-build: - ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712111754.vBBHsKVV070828>