4 files changed, 7 insertions, 42 deletions

diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index 8cdd2034fe7e..f0b1feb3cf11 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
 MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/
@@ -84,6 +84,12 @@ UBOOT_PLIST_RPI=	u-boot.bin
 UBOOT_METADATA_RPI_FILES=	${UBOOT_PLIST_RPI}
 UBOOT_METADATA_RPI_METHOD=	file
 
+# Overrides for IMX6 family
+UBOOT_METADATA_IMX6_FILES=	u-boot.imx
+UBOOT_METADATA_IMX6_METHOD=	raw
+UBOOT_METADATA_IMX6_RAW_OFFSET=	2
+UBOOT_METADATA_IMX6_RAW_BS=	512
+
 # Uboot variables
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
diff --git a/sysutils/u-boot-master/files/patch-api_api.c b/sysutils/u-boot-master/files/patch-api_api.c
deleted file mode 100644
index 5c8de4dead08..000000000000
--- a/sysutils/u-boot-master/files/patch-api_api.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- api/api.c.orig	2018-01-09 01:25:29 UTC
-+++ api/api.c
-@@ -290,6 +290,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;
- }
- 
diff --git a/sysutils/u-boot-master/files/patch-cmd_boot.c b/sysutils/u-boot-master/files/patch-cmd_boot.c
deleted file mode 100644
index b3e2a6583e88..000000000000
--- a/sysutils/u-boot-master/files/patch-cmd_boot.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmd/boot.c.orig	2018-01-09 01:25:29 UTC
-+++ cmd/boot.c
-@@ -19,6 +19,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);
- }
- 
diff --git a/sysutils/u-boot-master/files/patch-cmd_elf.c b/sysutils/u-boot-master/files/patch-cmd_elf.c
deleted file mode 100644
index f332c2528a2b..000000000000
--- a/sysutils/u-boot-master/files/patch-cmd_elf.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- cmd/elf.c.orig	2018-01-09 01:25:29 UTC
-+++ cmd/elf.c
-@@ -109,6 +109,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