From owner-svn-ports-head@freebsd.org Fri Feb 19 23:15:25 2016 Return-Path: Delivered-To: svn-ports-head@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 AEB2EAAEA6A; Fri, 19 Feb 2016 23:15:25 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 70F0815F0; Fri, 19 Feb 2016 23:15:25 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1JNFO9s075674; Fri, 19 Feb 2016 23:15:24 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1JNFOJA075669; Fri, 19 Feb 2016 23:15:24 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201602192315.u1JNFOJA075669@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Fri, 19 Feb 2016 23:15:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409216 - in head/sysutils/u-boot-rpi: . 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Feb 2016 23:15:25 -0000 Author: ian Date: Fri Feb 19 23:15:23 2016 New Revision: 409216 URL: https://svnweb.freebsd.org/changeset/ports/409216 Log: Update u-boot-rpi to the latest versions of u-boot and firmware files. The updated boot firmware reportedly supports the new Rpi Zero as well as existing models. The latest u-boot now runs with caches enabled for faster booting. These changes add the standard freebsd API patch to flush caches on device close. Also, CONFIG_CMD_ELF is removed from our config changes, because it's now on by default for rpi in 2016.01. Approved by: sbruno(mentor) Differential Revision: https://reviews.freebsd.org/D5150 Modified: head/sysutils/u-boot-rpi/Makefile head/sysutils/u-boot-rpi/distinfo head/sysutils/u-boot-rpi/files/patch-api_api.c head/sysutils/u-boot-rpi/files/patch-common_cmd__elf.c head/sysutils/u-boot-rpi/files/patch-include_configs_rpi-common.h Modified: head/sysutils/u-boot-rpi/Makefile ============================================================================== --- head/sysutils/u-boot-rpi/Makefile Fri Feb 19 23:05:08 2016 (r409215) +++ head/sysutils/u-boot-rpi/Makefile Fri Feb 19 23:15:23 2016 (r409216) @@ -1,13 +1,13 @@ # $FreeBSD$ PORTNAME= u-boot -PORTVERSION= 2015.10 +PORTVERSION= 2016.01 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ \ LOCAL/ian/:bootfiles PKGNAMESUFFIX= -rpi DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - rpi-boot-files-2014.10_2.tar.bz2:bootfiles + rpi-boot-files-2016.01.tar.bz2:bootfiles MAINTAINER= ian@FreeBSD.org COMMENT= Cross-build U-Boot loader for Raspberry Pi @@ -26,7 +26,7 @@ WRK_BOOTFILES= ${WRKDIR}/rpi-boot-files U_BOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} PLIST_FILES= ${U_BOOT_DIR}/u-boot.img \ ${U_BOOT_DIR}/LICENCE.broadcom \ - ${U_BOOT_DIR}/README \ + ${U_BOOT_DIR}/README-BootDetails \ ${U_BOOT_DIR}/bootcode.bin \ ${U_BOOT_DIR}/config.txt \ ${U_BOOT_DIR}/fixup.dat \ Modified: head/sysutils/u-boot-rpi/distinfo ============================================================================== --- head/sysutils/u-boot-rpi/distinfo Fri Feb 19 23:05:08 2016 (r409215) +++ head/sysutils/u-boot-rpi/distinfo Fri Feb 19 23:15:23 2016 (r409216) @@ -1,4 +1,4 @@ -SHA256 (u-boot-2015.10.tar.bz2) = bdc68d5f9455ad933b059c735d983f2c8b6b552dafb062e5ff1444f623021955 -SIZE (u-boot-2015.10.tar.bz2) = 10416503 -SHA256 (rpi-boot-files-2014.10_2.tar.bz2) = bcaa493d3585151fde755245bee44b7d30d0e9c7ec9cc7f4dccdad57caf18cdc -SIZE (rpi-boot-files-2014.10_2.tar.bz2) = 1893216 +SHA256 (u-boot-2016.01.tar.bz2) = e5792fba9399d9804aa2ef667f14ff771e2cdece72367d340250265bf095a5d5 +SIZE (u-boot-2016.01.tar.bz2) = 10602974 +SHA256 (rpi-boot-files-2016.01.tar.bz2) = d912abb1e91a1f38f7fa62cbf2202e8279a832106b15a76c30989ce36a04aea7 +SIZE (rpi-boot-files-2016.01.tar.bz2) = 2006903 Modified: head/sysutils/u-boot-rpi/files/patch-api_api.c ============================================================================== --- head/sysutils/u-boot-rpi/files/patch-api_api.c Fri Feb 19 23:05:08 2016 (r409215) +++ head/sysutils/u-boot-rpi/files/patch-api_api.c Fri Feb 19 23:15:23 2016 (r409216) @@ -1,6 +1,21 @@ ---- api/api.c.orig 2015-10-19 23:59:38 UTC +--- api/api.c.orig 2015-08-05 16:53:17 UTC +++ api/api.c -@@ -495,45 +495,47 @@ static int API_env_set(va_list ap) +@@ -290,6 +290,14 @@ static int API_dev_close(va_list ap) + if (!err) + di->state = DEV_STA_CLOSED; + ++ /* ++ * FreeBSD loader(8) just loaded code to some random location that may ++ * contain stale icache entries. Now that the device is closed it's ++ * about to run that code, so clean the caches. ++ */ ++ flush_dcache_all(); ++ invalidate_icache_all(); ++ + return err; + } + +@@ -495,45 +503,47 @@ static int API_env_set(va_list ap) */ static int API_env_enum(va_list ap) { Modified: head/sysutils/u-boot-rpi/files/patch-common_cmd__elf.c ============================================================================== --- head/sysutils/u-boot-rpi/files/patch-common_cmd__elf.c Fri Feb 19 23:05:08 2016 (r409215) +++ head/sysutils/u-boot-rpi/files/patch-common_cmd__elf.c Fri Feb 19 23:15:23 2016 (r409216) @@ -1,6 +1,6 @@ ---- common/cmd_elf.c.orig 2015-10-19 23:59:38 UTC +--- common/cmd_elf.c.orig 2016-01-12 14:06:54 UTC +++ common/cmd_elf.c -@@ -35,22 +35,15 @@ static unsigned long do_bootelf_exec(ulo +@@ -110,22 +110,15 @@ static unsigned long do_bootelf_exec(ulo unsigned long ret; /* Modified: head/sysutils/u-boot-rpi/files/patch-include_configs_rpi-common.h ============================================================================== --- head/sysutils/u-boot-rpi/files/patch-include_configs_rpi-common.h Fri Feb 19 23:05:08 2016 (r409215) +++ head/sysutils/u-boot-rpi/files/patch-include_configs_rpi-common.h Fri Feb 19 23:15:23 2016 (r409216) @@ -1,6 +1,6 @@ ---- include/configs/rpi-common.h.orig 2015-10-19 23:59:38 UTC +--- include/configs/rpi-common.h.orig 2016-01-12 14:06:54 UTC +++ include/configs/rpi-common.h -@@ -183,4 +183,56 @@ +@@ -182,4 +182,55 @@ #define CONFIG_BOOTDELAY 2 @@ -9,7 +9,6 @@ + ****************************************************************************/ + +#define CONFIG_API -+#define CONFIG_CMD_ELF +#define CONFIG_EFI_PARTITION +#define CONFIG_PREBOOT +