svn commit: r393757 - in head/sysutils/u-boot-cubox-hummingboard: . files

[Ian Lepore]

Author: ian (src committer)
Date: Sun Aug  9 02:16:54 2015
New Revision: 393757
URL: https://svnweb.freebsd.org/changeset/ports/393757

Log:
  Use gcc 4.9.2 to cross-compile u-boot for Cubox and Hummingboard.
  
  Also, fix a board-type detection problem that prevents booting on
  hummingboard, by initializing fdt_board to something non-zero, so that it
  ends up in the data segment instead of bss (and thus survives the memory
  init process which includes zeroing bss and runs after board detection).
  
  Approved by:	rpaulo

Modified:
  head/sysutils/u-boot-cubox-hummingboard/Makefile
  head/sysutils/u-boot-cubox-hummingboard/files/patch-board_solidrun_mx6__cubox-i_mx6__cubox-i.c

Modified: head/sysutils/u-boot-cubox-hummingboard/Makefile
==============================================================================
--- head/sysutils/u-boot-cubox-hummingboard/Makefile	Sun Aug  9 01:52:16 2015	(r393756)
+++ head/sysutils/u-boot-cubox-hummingboard/Makefile	Sun Aug  9 02:16:54 2015	(r393757)
@@ -2,6 +2,7 @@
 
 PORTNAME=	u-boot
 PORTVERSION=	2013.10
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-cubox-hummingboard
 
@@ -10,7 +11,9 @@ COMMENT=	Cross-build U-Boot loader for S
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=  arm-none-eabi-gcc:${PORTSDIR}/devel/arm-none-eabi-gcc
+BUILD_DEPENDS=	${CROSS_GCC}:${PORTSDIR}/devel/arm-none-eabi-gcc492
+
+CROSS_GCC=	arm-none-eabi-gcc-4.9.2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SolidRun
@@ -28,8 +31,9 @@ PLIST_FILES=	${U_BOOT_DIR}/u-boot.imx \
 		${U_BOOT_DIR}/README
 
 MAKE_ARGS+=	ARCH=arm \
+		CC=${CROSS_GCC} \
 		CROSS_COMPILE=arm-none-eabi- \
-		HOSTCC=clang
+		HOSTCC=cc
 
 do-configure:
 	cd ${WRKSRC}; ${GMAKE} ${MAKE_ARGS} mx6_cubox-i_config

Modified: head/sysutils/u-boot-cubox-hummingboard/files/patch-board_solidrun_mx6__cubox-i_mx6__cubox-i.c
==============================================================================
--- head/sysutils/u-boot-cubox-hummingboard/files/patch-board_solidrun_mx6__cubox-i_mx6__cubox-i.c	Sun Aug  9 01:52:16 2015	(r393756)
+++ head/sysutils/u-boot-cubox-hummingboard/files/patch-board_solidrun_mx6__cubox-i_mx6__cubox-i.c	Sun Aug  9 02:16:54 2015	(r393757)
@@ -12,7 +12,7 @@
  }
  
  static char const *board_type = "uninitialized";
-+static char const *fdt_board;
++static char const *fdt_board  = "uninitialized";
  
  int checkboard(void)
  {