svn commit: r478727 - in head/sysutils/u-boot-master: . files

[Emmanuel Vadot]

Author: manu (src committer)
Date: Sat Sep  1 20:43:36 2018
New Revision: 478727
URL: https://svnweb.freebsd.org/changeset/ports/478727

Log:
  u-boot: Re-add cache patches
  
  Some boards (like Allwinner ones) still needs them.
  This fixes booting with ubldr.
  
  Approved by:	bapt (implicit)

Added:
  head/sysutils/u-boot-master/files/patch-api_api.c   (contents, props changed)
  head/sysutils/u-boot-master/files/patch-cmd_boot.c   (contents, props changed)
  head/sysutils/u-boot-master/files/patch-cmd_elf.c   (contents, props changed)
Modified:
  head/sysutils/u-boot-master/Makefile

Modified: head/sysutils/u-boot-master/Makefile
==============================================================================
--- head/sysutils/u-boot-master/Makefile	Sat Sep  1 20:42:41 2018	(r478726)
+++ head/sysutils/u-boot-master/Makefile	Sat Sep  1 20:43:36 2018	(r478727)
@@ -5,7 +5,7 @@
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
 MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/

Added: head/sysutils/u-boot-master/files/patch-api_api.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/u-boot-master/files/patch-api_api.c	Sat Sep  1 20:43:36 2018	(r478727)
@@ -0,0 +1,14 @@
+--- api/api.c.orig	2018-07-09 14:24:14 UTC
++++ api/api.c
+@@ -289,6 +289,11 @@ static int API_dev_close(va_list ap)
+ 	if (!err)
+ 		di->state = DEV_STA_CLOSED;
+ 
++	if (dcache_status())
++		flush_dcache_all();
++	if (icache_status())
++		invalidate_icache_all();
++
+ 	return err;
+ }
+ 

Added: head/sysutils/u-boot-master/files/patch-cmd_boot.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/u-boot-master/files/patch-cmd_boot.c	Sat Sep  1 20:43:36 2018	(r478727)
@@ -0,0 +1,13 @@
+--- cmd/boot.c.orig	2018-07-09 14:24:14 UTC
++++ cmd/boot.c
+@@ -18,6 +18,10 @@ __attribute__((weak))
+ unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
+ 				 char * const argv[])
+ {
++	if (dcache_status())
++		flush_dcache_all();
++	if (icache_status())
++		invalidate_icache_all();
+ 	return entry (argc, argv);
+ }
+ 

Added: head/sysutils/u-boot-master/files/patch-cmd_elf.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/u-boot-master/files/patch-cmd_elf.c	Sat Sep  1 20:43:36 2018	(r478727)
@@ -0,0 +1,14 @@
+--- cmd/elf.c.orig	2018-07-09 14:24:14 UTC
++++ cmd/elf.c
+@@ -153,6 +153,11 @@ static unsigned long do_bootelf_exec(ulong (*entry)(in
+ {
+ 	unsigned long ret;
+ 
++	if (dcache_status())
++		flush_dcache_all();
++	if (icache_status())
++		invalidate_icache_all();
++
+ 	/*
+ 	 * pass address parameter as argv[0] (aka command name),
+ 	 * and all remaining args