diff --git a/sysutils/u-boot-olimex-a20-som-evb/Makefile b/sysutils/u-boot-olimex-a20-som-evb/Makefile index bce41e20aec0..ab747a02f475 100644 --- a/sysutils/u-boot-olimex-a20-som-evb/Makefile +++ b/sysutils/u-boot-olimex-a20-som-evb/Makefile @@ -1,57 +1,57 @@ # $FreeBSD$ PORTNAME= u-boot PORTVERSION= ${UBOOT_VERSION} CATEGORIES= sysutils MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ PKGNAMESUFFIX?= -${MODEL} MAINTAINER= manu@FreeBSD.org COMMENT= Cross-build U-Boot loader for olimex-a20-som-evb LICENSE= GPLv2 BUILD_DEPENDS= arm-none-eabi-gcc:devel/arm-none-eabi-gcc -UBOOT_VERSION?= 2016.07 +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- .include .if ${OSVERSION} < 1000000 IGNORE= requires FreeBSD 10 or later .endif 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 diff --git a/sysutils/u-boot-olimex-a20-som-evb/distinfo b/sysutils/u-boot-olimex-a20-som-evb/distinfo index 956ccb60cf54..8dad18135bcf 100644 --- a/sysutils/u-boot-olimex-a20-som-evb/distinfo +++ b/sysutils/u-boot-olimex-a20-som-evb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1468333360 -SHA256 (u-boot-2016.07.tar.bz2) = 974fb7225c0af6a721307631f66b81e20dbda82a4d7cc32aba2a625727231253 -SIZE (u-boot-2016.07.tar.bz2) = 11506848 +TIMESTAMP = 1474034864 +SHA256 (u-boot-2016.09.tar.bz2) = 994e7b9e0e350d9f91f5892d5e5bff00d3714a4962f520f78a64a461ef950ba9 +SIZE (u-boot-2016.09.tar.bz2) = 11790685 diff --git a/sysutils/u-boot-olimex-a20-som-evb/files/patch-api_api__net.c b/sysutils/u-boot-olimex-a20-som-evb/files/patch-api_api__net.c deleted file mode 100644 index 2c9e4bd3bb11..000000000000 --- a/sysutils/u-boot-olimex-a20-som-evb/files/patch-api_api__net.c +++ /dev/null @@ -1,11 +0,0 @@ ---- api/api_net.c.orig 2016-07-11 19:01:01 UTC -+++ api/api_net.c -@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; - - #define errf(fmt, args...) do { printf("ERROR @ %s(): ", __func__); printf(fmt, ##args); } while (0) - --#ifdef CONFIG_CMD_NET -+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH) - - static int dev_valid_net(void *cookie) - {