Index: head/sysutils/u-boot-rpi/Makefile
===================================================================
--- head/sysutils/u-boot-rpi/Makefile
+++ head/sysutils/u-boot-rpi/Makefile
@@ -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 @@
 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 \
Index: head/sysutils/u-boot-rpi/distinfo
===================================================================
--- head/sysutils/u-boot-rpi/distinfo
+++ head/sysutils/u-boot-rpi/distinfo
@@ -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
Index: head/sysutils/u-boot-rpi/files/patch-api_api.c
===================================================================
--- head/sysutils/u-boot-rpi/files/patch-api_api.c
+++ head/sysutils/u-boot-rpi/files/patch-api_api.c
@@ -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)
  {
Index: head/sysutils/u-boot-rpi/files/patch-common_cmd__elf.c
===================================================================
--- head/sysutils/u-boot-rpi/files/patch-common_cmd__elf.c
+++ head/sysutils/u-boot-rpi/files/patch-common_cmd__elf.c
@@ -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;
  
  	/*
Index: head/sysutils/u-boot-rpi/files/patch-include_configs_rpi-common.h
===================================================================
--- head/sysutils/u-boot-rpi/files/patch-include_configs_rpi-common.h
+++ head/sysutils/u-boot-rpi/files/patch-include_configs_rpi-common.h
@@ -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
 +