Date: Thu, 12 Jan 2017 22:49:09 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431327 - in head/sysutils: u-boot-a13-olinuxino u-boot-bananapi u-boot-bananapim2 u-boot-cubieboard u-boot-cubieboard2 u-boot-master u-boot-olimex-a20-som-evb u-boot-olinuxino-lime u-b... Message-ID: <201701122249.v0CMn90U008172@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Thu Jan 12 22:49:08 2017 New Revision: 431327 URL: https://svnweb.freebsd.org/changeset/ports/431327 Log: Convert all the allwinnner-based u-boot boards over to u-boot-master. Upgrade u-boot-master to cope with the allwinner u-boot port's needs for more tools. Modified: head/sysutils/u-boot-a13-olinuxino/Makefile (contents, props changed) head/sysutils/u-boot-bananapi/Makefile (contents, props changed) head/sysutils/u-boot-bananapim2/Makefile (contents, props changed) head/sysutils/u-boot-cubieboard/Makefile (contents, props changed) head/sysutils/u-boot-cubieboard2/Makefile (contents, props changed) head/sysutils/u-boot-master/Makefile (contents, props changed) head/sysutils/u-boot-olimex-a20-som-evb/Makefile (contents, props changed) head/sysutils/u-boot-olinuxino-lime/Makefile (contents, props changed) head/sysutils/u-boot-orangepi-one/Makefile (contents, props changed) head/sysutils/u-boot-pcduino3/Makefile (contents, props changed) Modified: head/sysutils/u-boot-a13-olinuxino/Makefile ============================================================================== --- head/sysutils/u-boot-a13-olinuxino/Makefile Thu Jan 12 22:49:01 2017 (r431326) +++ head/sysutils/u-boot-a13-olinuxino/Makefile Thu Jan 12 22:49:08 2017 (r431327) @@ -1,14 +1,10 @@ # $FreeBSD$ -PKGNAMESUFFIX= -a13-olinuxino +MAINTAINER= imp@FreeBSD.org +MASTERDIR= ${.CURDIR}/../u-boot-master -COMMENT= Cross-build U-Boot loader for A13 Olinuxino - -LICENSE= GPLv2 - -MASTERDIR= ${.CURDIR}/../u-boot-olimex-a20-som-evb -DESCR= ${.CURDIR}/pkg-descr MODEL= sun5i-a13-olinuxino BOARD_CONFIG= A13-OLinuXino_defconfig +FAMILY= allwinner .include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-bananapi/Makefile ============================================================================== --- head/sysutils/u-boot-bananapi/Makefile Thu Jan 12 22:49:01 2017 (r431326) +++ head/sysutils/u-boot-bananapi/Makefile Thu Jan 12 22:49:08 2017 (r431327) @@ -1,15 +1,10 @@ # $FreeBSD$ -PKGNAMESUFFIX= -bananapi +MAINTAINER= imp@FreeBSD.org +MASTERDIR= ${.CURDIR}/../u-boot-master -COMMENT= Cross-build U-Boot loader for Banana Pi - -LICENSE= GPLv2 - -# Local overrides -MASTERDIR= ${.CURDIR}/../u-boot-cubieboard -DESCR= ${.CURDIR}/pkg-descr MODEL= bananapi -CONF_TARGET= Bananapi_defconfig +BOARD_CONFIG= Bananapi_defconfig +FAMILY= allwinner .include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-bananapim2/Makefile ============================================================================== --- head/sysutils/u-boot-bananapim2/Makefile Thu Jan 12 22:49:01 2017 (r431326) +++ head/sysutils/u-boot-bananapim2/Makefile Thu Jan 12 22:49:08 2017 (r431327) @@ -1,14 +1,10 @@ # $FreeBSD$ -PKGNAMESUFFIX= -${MODEL} +MAINTAINER= imp@FreeBSD.org +MASTERDIR= ${.CURDIR}/../u-boot-master -COMMENT= Cross-build U-Boot loader for bananapi M2 - -LICENSE= GPLv2 - -MASTERDIR= ${.CURDIR}/../u-boot-olimex-a20-som-evb -DESCR= ${.CURDIR}/pkg-descr MODEL= bananapim2 BOARD_CONFIG= Sinovoip_BPI_M2_defconfig +FAMILY= allwinner .include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-cubieboard/Makefile ============================================================================== --- head/sysutils/u-boot-cubieboard/Makefile Thu Jan 12 22:49:01 2017 (r431326) +++ head/sysutils/u-boot-cubieboard/Makefile Thu Jan 12 22:49:08 2017 (r431327) @@ -1,51 +1,10 @@ # $FreeBSD$ -PORTNAME= u-boot -PORTVERSION= 2015.04 -CATEGORIES= sysutils -MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ -PKGNAMESUFFIX?= -cubieboard +MAINTAINER= imp@FreeBSD.org +MASTERDIR= ${.CURDIR}/../u-boot-master -MAINTAINER= loos@FreeBSD.org -COMMENT?= Cross-build U-Boot loader for Cubieboard +MODEL= cubieboard +BOARD_CONFIG= Cubieboard_defconfig +FAMILY= allwinner -LICENSE= GPLv2 - -BUILD_DEPENDS= arm-none-eabi-gcc:devel/arm-none-eabi-gcc - -MODEL?= cubieboard -CONF_TARGET?= Cubieboard_defconfig - -NO_ARCH= yes - -WRKSRC= ${WRKDIR}/u-boot-${DISTVERSION} -USES= gmake tar:bzip2 -SSP_UNSAFE= yes # cross-LD does not support -fstack-protector - -U_BOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} -PLIST_FILES= ${U_BOOT_DIR}/u-boot.img \ - ${U_BOOT_DIR}/u-boot-sunxi-with-spl.bin \ - ${U_BOOT_DIR}/sunxi-spl.bin \ - ${U_BOOT_DIR}/README - -MAKE_ARGS+= ARCH=arm \ - CROSS_COMPILE=arm-none-eabi- - -post-patch: - @${REINPLACE_CMD} -e "s,%%MODEL%%,${MODEL}," \ - ${WRKSRC}/include/configs/sunxi-common.h - @${LN} -sf compiler-gcc5.h ${WRKSRC}/include/linux/compiler-gcc6.h - -do-configure: - (cd ${WRKSRC}; ${MAKE_CMD} ${CONF_TARGET}) - -do-install: - ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${INSTALL_DATA} ${WRKSRC}/spl/sunxi-spl.bin \ - ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${INSTALL_DATA} ${WRKSRC}/u-boot-sunxi-with-spl.bin \ - ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${INSTALL_DATA} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README - -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-cubieboard2/Makefile ============================================================================== --- head/sysutils/u-boot-cubieboard2/Makefile Thu Jan 12 22:49:01 2017 (r431326) +++ head/sysutils/u-boot-cubieboard2/Makefile Thu Jan 12 22:49:08 2017 (r431327) @@ -1,15 +1,10 @@ # $FreeBSD$ -PKGNAMESUFFIX= -cubieboard2 +MAINTAINER= imp@FreeBSD.org +MASTERDIR= ${.CURDIR}/../u-boot-master -COMMENT= Cross-build U-Boot loader for Cubieboard2 - -LICENSE= GPLv2 - -# Local overrides -MASTERDIR= ${.CURDIR}/../u-boot-cubieboard -DESCR= ${.CURDIR}/pkg-descr MODEL= cubieboard2 -CONF_TARGET= Cubieboard2_defconfig +BOARD_CONFIG= Cubieboard2_defconfig +FAMILY= allwinner .include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-master/Makefile ============================================================================== --- head/sysutils/u-boot-master/Makefile Thu Jan 12 22:49:01 2017 (r431326) +++ head/sysutils/u-boot-master/Makefile Thu Jan 12 22:49:08 2017 (r431327) @@ -14,7 +14,11 @@ COMMENT= Cross-build das u-boot for ${MO LICENSE= GPLv2 -BUILD_DEPENDS= arm-none-eabi-gcc:devel/arm-none-eabi-gcc +BUILD_DEPENDS= arm-none-eabi-gcc:devel/arm-none-eabi-gcc \ + gsed:textproc/gsed \ + swig3.0:devel/swig30 \ + python:lang/python2 \ + ${PREFIX}/bin/dtc:sysutil/dtc USES= gmake @@ -27,7 +31,7 @@ UBOOT_DIR= share/u-boot/${PORTNAME}${PKG INST= ${PREFIX}/${UBOOT_DIR} DESCR?= ${.CURDIR}/pkg-descr -MAKE_ARGS+= ARCH=${UBOOT_ARCH} CROSS_COMPILE=${UBOOT_ARCH}-none-eabi- +MAKE_ARGS+= V=1 ARCH=${UBOOT_ARCH} CROSS_COMPILE=${UBOOT_ARCH}-none-eabi- NO_ARCH= yes @@ -46,6 +50,10 @@ IGNORE+= "FAMILY is not defined" UBOOT_PLIST_OMAP=u-boot.img MLO UBOOT_VERSION_OMAP=2017.01 +# Defines for ALLWINNER family +UBOOT_PLIST_ALLWINNER=u-boot.img u-boot-sunxi-with-spl.bin +UBOOT_VERSION_ALLWINNER=2017.01 + # Uboot variables .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}} Modified: head/sysutils/u-boot-olimex-a20-som-evb/Makefile ============================================================================== --- head/sysutils/u-boot-olimex-a20-som-evb/Makefile Thu Jan 12 22:49:01 2017 (r431326) +++ head/sysutils/u-boot-olimex-a20-som-evb/Makefile Thu Jan 12 22:49:08 2017 (r431327) @@ -1,51 +1,10 @@ # $FreeBSD$ -PORTNAME= u-boot -PORTVERSION= ${UBOOT_VERSION} -CATEGORIES= sysutils -MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ -PKGNAMESUFFIX?= -${MODEL} +MAINTAINER= imp@FreeBSD.org +MASTERDIR= ${.CURDIR}/../u-boot-master -MAINTAINER= manu@FreeBSD.org -COMMENT= Cross-build U-Boot loader for olimex-a20-som-evb +MODEL= olimex-a20-som-evb +BOARD_CONFIG= A20-Olimex-SOM-EVB_defconfig +FAMILY= allwinner -LICENSE= GPLv2 - -BUILD_DEPENDS= arm-none-eabi-gcc:devel/arm-none-eabi-gcc - -UBOOT_VERSION?= 2016.09 -BOARD_CONFIG?= A20-Olimex-SOM-EVB_defconfig -MODEL?= olimex-a20-som-evb - -NO_ARCH= yes - -WRKSRC= ${WRKDIR}/u-boot-${DISTVERSION} -USES= gmake tar:bzip2 -SSP_UNSAFE= yes # cross-LD does not support -fstack-protector - -U_BOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} -PLIST_FILES= ${U_BOOT_DIR}/u-boot.img \ - ${U_BOOT_DIR}/u-boot-sunxi-with-spl.bin \ - ${U_BOOT_DIR}/sunxi-spl.bin \ - ${U_BOOT_DIR}/README - -MAKE_ARGS+= ARCH=arm \ - CROSS_COMPILE=arm-none-eabi- - -post-patch: - @${REINPLACE_CMD} -e "s,%%MODEL%%,${MODEL}," \ - ${WRKSRC}/include/configs/sunxi-common.h - -do-configure: - (cd ${WRKSRC}; ${MAKE_CMD} ${BOARD_CONFIG}) - -do-install: - ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${INSTALL_DATA} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${INSTALL_DATA} ${WRKSRC}/u-boot-sunxi-with-spl.bin \ - ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${INSTALL_DATA} ${WRKSRC}/spl/sunxi-spl.bin \ - ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README - -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-olinuxino-lime/Makefile ============================================================================== --- head/sysutils/u-boot-olinuxino-lime/Makefile Thu Jan 12 22:49:01 2017 (r431326) +++ head/sysutils/u-boot-olinuxino-lime/Makefile Thu Jan 12 22:49:08 2017 (r431327) @@ -1,14 +1,10 @@ # $FreeBSD$ -PKGNAMESUFFIX= -${MODEL} +MAINTAINER= imp@FreeBSD.org +MASTERDIR= ${.CURDIR}/../u-boot-master -COMMENT= Cross-build U-Boot loader for Olinuxino Lime - -LICENSE= GPLv2 - -MASTERDIR= ${.CURDIR}/../u-boot-olimex-a20-som-evb -DESCR= ${.CURDIR}/pkg-descr MODEL= olinuxino-lime BOARD_CONFIG= A10-OLinuXino-Lime_defconfig +FAMILY= allwinner .include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-orangepi-one/Makefile ============================================================================== --- head/sysutils/u-boot-orangepi-one/Makefile Thu Jan 12 22:49:01 2017 (r431326) +++ head/sysutils/u-boot-orangepi-one/Makefile Thu Jan 12 22:49:08 2017 (r431327) @@ -1,14 +1,10 @@ # $FreeBSD$ -PKGNAMESUFFIX= -${MODEL} +MAINTAINER= imp@FreeBSD.org +MASTERDIR= ${.CURDIR}/../u-boot-master -COMMENT= Cross-build U-Boot loader for OrangePi One - -LICENSE= GPLv2 - -MASTERDIR= ${.CURDIR}/../u-boot-olimex-a20-som-evb -DESCR= ${.CURDIR}/pkg-descr MODEL= orangepi-one BOARD_CONFIG= orangepi_one_defconfig +FAMILY= allwinner .include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-pcduino3/Makefile ============================================================================== --- head/sysutils/u-boot-pcduino3/Makefile Thu Jan 12 22:49:01 2017 (r431326) +++ head/sysutils/u-boot-pcduino3/Makefile Thu Jan 12 22:49:08 2017 (r431327) @@ -1,14 +1,10 @@ # $FreeBSD$ -PKGNAMESUFFIX= -${MODEL} +MAINTAINER= imp@FreeBSD.org +MASTERDIR= ${.CURDIR}/../u-boot-master -COMMENT= Cross-build U-Boot loader for Linksprite pcDuino3 - -LICENSE= GPLv2 - -MASTERDIR= ${.CURDIR}/../u-boot-olimex-a20-som-evb -DESCR= ${.CURDIR}/pkg-descr MODEL= pcduino3 BOARD_CONFIG= Linksprite_pcDuino3_defconfig +FAMILY= allwinner .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701122249.v0CMn90U008172>