From owner-svn-ports-all@freebsd.org Sun Aug 9 02:16:56 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68E309B2369; Sun, 9 Aug 2015 02:16:56 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CB96FEB; Sun, 9 Aug 2015 02:16:56 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t792Gup6085616; Sun, 9 Aug 2015 02:16:56 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t792Gt5f085614; Sun, 9 Aug 2015 02:16:55 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201508090216.t792Gt5f085614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 9 Aug 2015 02:16:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393757 - in head/sysutils/u-boot-cubox-hummingboard: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Aug 2015 02:16:56 -0000 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) {