Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Oct 2016 21:09:19 +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: r424735 - in head/sysutils: u-boot-beaglebone u-boot-beaglebone/files u-boot-master
Message-ID:  <201610262109.u9QL9J01020213@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Wed Oct 26 21:09:18 2016
New Revision: 424735
URL: https://svnweb.freebsd.org/changeset/ports/424735

Log:
  Create a new u-boot-master port to consolidate all different u-boot
  ports.  Switch to using my github branch for grabbing ports.  Convert
  the Beaglebone family of ports over to using the new setup.

Added:
  head/sysutils/u-boot-beaglebone/files/keep-me   (contents, props changed)
  head/sysutils/u-boot-master/
  head/sysutils/u-boot-master/Makefile   (contents, props changed)
  head/sysutils/u-boot-master/distinfo   (contents, props changed)
Deleted:
  head/sysutils/u-boot-beaglebone/files/patch-api_api.c
  head/sysutils/u-boot-beaglebone/files/patch-api_api__storage.c
  head/sysutils/u-boot-beaglebone/files/patch-common_cmd__elf.c
  head/sysutils/u-boot-beaglebone/files/patch-common_cmd__test.c
  head/sysutils/u-boot-beaglebone/files/patch-drivers_mmc_mmc.c
  head/sysutils/u-boot-beaglebone/files/patch-include_configs_am335x__evm.h
Modified:
  head/sysutils/u-boot-beaglebone/Makefile   (contents, props changed)
  head/sysutils/u-boot-beaglebone/distinfo   (contents, props changed)

Modified: head/sysutils/u-boot-beaglebone/Makefile
==============================================================================
--- head/sysutils/u-boot-beaglebone/Makefile	Wed Oct 26 20:11:07 2016	(r424734)
+++ head/sysutils/u-boot-beaglebone/Makefile	Wed Oct 26 21:09:18 2016	(r424735)
@@ -1,43 +1,10 @@
 # $FreeBSD$
 
-PORTNAME=	u-boot
-PORTVERSION=	2014.10
-PORTREVISION=	1
-CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/
-PKGNAMESUFFIX=	-beaglebone
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-MAINTAINER=	ian@FreeBSD.org
-COMMENT=	Cross-build U-Boot loader for BeagleBone and BeagleBone Black
+MODEL=		beaglebone
+BOARD_CONFIG=	am335x_boneblack_defconfig
+FAMILY=		omap
 
-LICENSE=	GPLv2
-
-BUILD_DEPENDS=	${CROSS_GCC}:devel/arm-none-eabi-gcc492
-
-CROSS_GCC=	arm-none-eabi-gcc-4.9.2
-
-NO_ARCH=	yes
-
-WRKSRC=		${WRKDIR}/u-boot-${PORTVERSION}
-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}/MLO \
-		${U_BOOT_DIR}/README
-
-MAKE_ARGS+=	ARCH=arm \
-		CC=${CROSS_GCC} \
-		CROSS_COMPILE=arm-none-eabi-
-
-do-configure:
-	(cd ${WRKSRC}; ${MAKE_CMD} am335x_boneblack_defconfig)
-
-do-install:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}
-	${INSTALL_DATA} ${WRKSRC}/MLO ${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-beaglebone/distinfo
==============================================================================
--- head/sysutils/u-boot-beaglebone/distinfo	Wed Oct 26 20:11:07 2016	(r424734)
+++ head/sysutils/u-boot-beaglebone/distinfo	Wed Oct 26 21:09:18 2016	(r424735)
@@ -1,2 +1,3 @@
-SHA256 (u-boot-2014.10.tar.bz2) = d3b132a7a9b3f3182b7aad71c2dfbd4fc15bea83e12c76134eb3ffefc07d1c71
-SIZE (u-boot-2014.10.tar.bz2) = 10217685
+TIMESTAMP = 1476714127
+SHA256 (bsdimp-u-boot-beaglebone-ports-v2016.05_GH0.tar.gz) = aa9dfb1167398dc7e649f7a9062f628a6bbe89f018a6b1ab856a8a8cd81c8ac0
+SIZE (bsdimp-u-boot-beaglebone-ports-v2016.05_GH0.tar.gz) = 14363966

Added: head/sysutils/u-boot-beaglebone/files/keep-me
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/u-boot-beaglebone/files/keep-me	Wed Oct 26 21:09:18 2016	(r424735)
@@ -0,0 +1 @@
+bite-me

Added: head/sysutils/u-boot-master/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/u-boot-master/Makefile	Wed Oct 26 21:09:18 2016	(r424735)
@@ -0,0 +1,79 @@
+# $FreeBSD$
+#
+# Common infrastructure for u-boot ports
+#
+
+PORTNAME=	u-boot
+PORTVERSION=	${UBOOT_VERSION}
+DISTVERSIONPREFIX= ports-v
+CATEGORIES=	sysutils
+PKGNAMESUFFIX?=	-${MODEL}
+
+MAINTAINER=	imp@FreeBSD.org
+COMMENT=	Cross-build das u-boot for ${MODEL}
+
+LICENSE=	GPLv2
+
+USES=		gmake
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	bsdimp
+GH_PROJECT=	u-boot
+
+SSP_UNSAFE=	yes
+UBOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
+INST=		${PREFIX}/${UBOOT_DIR}
+DESCR?=		${.CURDIR}/pkg-descr
+
+MAKE_ARGS+=	ARCH=${UBOOT_ARCH} CROSS_COMPILE=${UBOOT_ARCH}-none-eabi-
+
+NO_ARCH=	yes
+
+# Sanity checks
+.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
+
+# Defines for OMAP family
+UBOOT_PLIST_OMAP=u-boot.img MLO
+UBOOT_VERSION_OMAP=2016.05
+
+# Uboot variables
+.if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
+UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
+.endif
+UBOOT_VERSION?=	2016.05
+
+.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
+
+# 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
+
+do-configure:
+	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
+
+do-install:
+	${MKDIR} ${STAGEDIR}/${INST}
+.for i in ${UBOOT_PLIST}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${INST}
+.endfor
+	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README
+
+.include <bsd.port.mk>

Added: head/sysutils/u-boot-master/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/u-boot-master/distinfo	Wed Oct 26 21:09:18 2016	(r424735)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1476745087
+SHA256 (bsdimp-u-boot-ports-v2016.05_GH0.tar.gz) = aa9dfb1167398dc7e649f7a9062f628a6bbe89f018a6b1ab856a8a8cd81c8ac0
+SIZE (bsdimp-u-boot-ports-v2016.05_GH0.tar.gz) = 14363966



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610262109.u9QL9J01020213>