From owner-svn-ports-all@FreeBSD.ORG Fri Jan 2 02:09:31 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B3458723; Fri, 2 Jan 2015 02:09:31 +0000 (UTC) Received: from svn.freebsd.org (svn.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 946D116D6; Fri, 2 Jan 2015 02:09:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0229VB0095745; Fri, 2 Jan 2015 02:09:31 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0229ULd095738; Fri, 2 Jan 2015 02:09:30 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201501020209.t0229ULd095738@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Fri, 2 Jan 2015 02:09:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376035 - in head/sysutils/u-boot-beaglebone: . 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.18-1 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: Fri, 02 Jan 2015 02:09:31 -0000 Author: ian (src committer) Date: Fri Jan 2 02:09:29 2015 New Revision: 376035 URL: https://svnweb.freebsd.org/changeset/ports/376035 QAT: https://qat.redports.org/buildarchive/r376035/ Log: Leave caches enabled when launching u-boot, it speeds up loader(8) and the kernel can tolerate being entered with caches enabled as of r276445. Approved by: imp Modified: head/sysutils/u-boot-beaglebone/Makefile head/sysutils/u-boot-beaglebone/files/patch-common_cmd__elf.c head/sysutils/u-boot-beaglebone/files/patch-include_configs_am335x__evm.h Modified: head/sysutils/u-boot-beaglebone/Makefile ============================================================================== --- head/sysutils/u-boot-beaglebone/Makefile Thu Jan 1 23:28:41 2015 (r376034) +++ head/sysutils/u-boot-beaglebone/Makefile Fri Jan 2 02:09:29 2015 (r376035) @@ -2,6 +2,7 @@ PORTNAME= u-boot PORTVERSION= 2014.10 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ PKGNAMESUFFIX= -beaglebone Modified: head/sysutils/u-boot-beaglebone/files/patch-common_cmd__elf.c ============================================================================== --- head/sysutils/u-boot-beaglebone/files/patch-common_cmd__elf.c Thu Jan 1 23:28:41 2015 (r376034) +++ head/sysutils/u-boot-beaglebone/files/patch-common_cmd__elf.c Fri Jan 2 02:09:29 2015 (r376035) @@ -1,10 +1,29 @@ --- common/cmd_elf.c.orig 2014-10-14 08:47:15 UTC +++ common/cmd_elf.c -@@ -46,6 +46,7 @@ unsigned long do_bootelf_exec(ulong (*en - * pass address parameter as argv[0] (aka command name), - * and all remaining args +@@ -35,22 +35,12 @@ unsigned long do_bootelf_exec(ulong (*en + unsigned long ret; + + /* +- * QNX images require the data cache is disabled. +- * Data cache is already flushed, so just turn it off. +- */ +- int dcache = dcache_status(); +- if (dcache) +- dcache_disable(); +- +- /* +- * pass address parameter as argv[0] (aka command name), +- * and all remaining args ++ * FreeBSD wants the caches enabled while ubldr runs, and as of r276397 ++ * the kernel can tolerate being entered with internal (but not external ++ * PL310) caches enabled on armv6/7 systems. So don't disable caches ++ * here, just launch the program directly. */ -+ cleanup_before_linux(); ret = entry(argc, argv); +- +- if (dcache) +- dcache_enable(); +- + return ret; + } - if (dcache) Modified: head/sysutils/u-boot-beaglebone/files/patch-include_configs_am335x__evm.h ============================================================================== --- head/sysutils/u-boot-beaglebone/files/patch-include_configs_am335x__evm.h Thu Jan 1 23:28:41 2015 (r376034) +++ head/sysutils/u-boot-beaglebone/files/patch-include_configs_am335x__evm.h Fri Jan 2 02:09:29 2015 (r376035) @@ -1,6 +1,6 @@ --- include/configs/am335x_evm.h.orig 2014-10-14 08:47:15 UTC +++ include/configs/am335x_evm.h -@@ -479,4 +479,76 @@ +@@ -479,4 +479,79 @@ #endif #endif /* NOR support */ @@ -15,6 +15,9 @@ +#define CONFIG_CMD_ENV_EXISTS +#define CONFIG_EFI_PARTITION +#define CONFIG_SYS_MMC_MAX_DEVICE 2 ++#ifndef CONFIG_SYS_DCACHE_OFF ++#define CONFIG_CMD_CACHE ++#endif +#endif + +/* Save the env to the fat partition. */