Index: head/sysutils/u-boot-master/Makefile
===================================================================
--- head/sysutils/u-boot-master/Makefile	(revision 485931)
+++ head/sysutils/u-boot-master/Makefile	(revision 485932)
@@ -1,201 +1,200 @@
 # $FreeBSD$
 #
 # Common infrastructure for u-boot ports
 #
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
-PORTREVISION=	3
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
 MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/
 DIST_SUBDIR=	u-boot
 
 MAINTAINER?=	uboot@FreeBSD.org
 COMMENT=	Cross-build das u-boot for model ${MODEL}
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS+=	gsed:textproc/gsed \
 		swig3.0:devel/swig30 \
 		dtc>=1.4.1:sysutils/dtc \
 		mkimage:sysutils/u-boot-tools
 BUILD_DEPENDS+=	${COMPILER}:devel/${COMPILER}
 
 USES=		bison gmake python:2.7,build shebangfix tar:bz2
 BINARY_ALIAS=	bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed swig=swig3.0
 
 SHEBANG_FILES=	tools/binman/binman.py
 SSP_UNSAFE=	yes
 UBOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
 INST=		${PREFIX}/${UBOOT_DIR}
 DESCR?=		${.CURDIR}/pkg-descr
 
 MAKE_ARGS+=	V=1 CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} ${ARCHFLAGS}
 
 NO_ARCH=	yes
 
 # Use upstreamed patches not yet mainlined
 PATCH_DIST_STRIP=	-p1
 PATCH_SITES+=	http://patchwork.ozlabs.org/patch/
 
 # Sanity checks
 .if !defined(MODEL) && !defined(BOARD_CONFIG) && !defined(FAMILY)
 MODEL=		NONE
 IGNORE=		is a metaport; there is nothing to build
 .else
 .if !defined(MODEL)
 IGNORE+=	MODEL is not defined
 .endif
 .if !defined(BOARD_CONFIG)
 IGNORE+=	BOARD_CONFIG is not defined
 .endif
 .if !defined(FAMILY)
 IGNORE+=	FAMILY is not defined
 .endif
 .endif
 
 # Overrides for OMAP family
 UBOOT_PLIST_OMAP=u-boot.img MLO
 UBOOT_METADATA_OMAP_FILES=	${UBOOT_PLIST_OMAP}
 UBOOT_METADATA_OMAP_METHOD=	file
 
 # Overrides for ALLWINNER family
 UBOOT_PLIST_ALLWINNER=u-boot-sunxi-with-spl.bin
 UBOOT_METADATA_ALLWINNER_FILES=		${UBOOT_PLIST_ALLWINNER}
 UBOOT_METADATA_ALLWINNER_METHOD=	raw
 UBOOT_METADATA_ALLWINNER_RAW_OFFSET=	8
 UBOOT_METADATA_ALLWINNER_RAW_BS=	1k
 
 # Overrides for ALLWINNER64 family
 UBOOT_PLIST_ALLWINNER64=${UBOOT_PLIST_ALLWINNER}
 UBOOT_ARCH_ALLWINNER64=aarch64
 UBOOT_METADATA_ALLWINNER64_FILES=	${UBOOT_PLIST_ALLWINNER64}
 UBOOT_METADATA_ALLWINNER64_METHOD=	raw
 UBOOT_METADATA_ALLWINNER64_RAW_OFFSET=	8
 UBOOT_METADATA_ALLWINNER64_RAW_BS=	1k
 
 # Overrides for Zynq 7000 family
 UBOOT_PLIST_ZYNQ_7000=u-boot.img boot.bin uEnv.txt
 UBOOT_MOVE_ZYNQ_7000=${WRKSRC}/spl/boot.bin ${.CURDIR}/files/uEnv.txt
 
 # Overrides for RPI family
 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}}
 .endif
-UBOOT_VERSION?=	2018.09
+UBOOT_VERSION?=	2018.11
 
 .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu})
 UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}}
 .endif
 UBOOT_PLIST?=u-boot.img
 
 .if !defined(UBOOT_ARCH) && defined(UBOOT_ARCH_${FAMILY:tu})
 UBOOT_ARCH=${UBOOT_ARCH_${FAMILY:tu}}
 .endif
 UBOOT_ARCH?=	arm
 
 .if ${UBOOT_ARCH} == arm
 CROSS_COMPILE=arm-none-eabi-
 ARCHFLAGS=ARCH=${UBOOT_ARCH}
 UBOOT_PLIST+=	boot.scr
 .elif ${UBOOT_ARCH} == aarch64
 CROSS_COMPILE=aarch64-none-elf-
 ARCHFLAGS=ARCH=arm
 .else
 # Best guess for other architectures
 CROSS_COMPILE=${UBOOT_ARCH}-none-elf-
 ARCHFLAGS=ARCH=${UBOOT_ARCH}
 .endif
 COMPILER?=${CROSS_COMPILE}gcc
 
 .if !defined(UBOOT_MOVE) && defined(UBOOT_MOVE_${FAMILY:tu})
 UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}}
 .endif
 
 # Per family dependancies
 .if defined(FAMILY) && ${FAMILY} == allwinner64
 BUILD_DEPENDS+=	${LOCALBASE}/share/atf-allwinner/bl31.bin:sysutils/atf-allwinner
 MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-allwinner/bl31.bin
 .endif
 
 # Each u-boot family has different files to include, bring them in.
 .for i in ${UBOOT_PLIST}
 PLIST_FILES+=	${UBOOT_DIR}/${i}
 .endfor
 PLIST_FILES+=	${UBOOT_DIR}/README
 
 .if defined(UBOOT_METADATA_${FAMILY:tu}_METHOD)
 METADATA_METHOD=${UBOOT_METADATA_${FAMILY:tu}_METHOD}
 METADATA_FILES=${UBOOT_METADATA_${FAMILY:tu}_FILES}
 PLIST_FILES+=	${UBOOT_DIR}/metadata
 UBOOT_PLIST+=	metadata
 .if ${METADATA_METHOD} == "raw"
 METADATA_OFFSET=${UBOOT_METADATA_${FAMILY:tu}_RAW_OFFSET}
 METADATA_BS=${UBOOT_METADATA_${FAMILY:tu}_RAW_BS}
 .elif ${METADATA_METHOD} == "file"
 .else
 .error "Unsupported METADATA_METHOD"
 .endif
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|make|${MAKE_CMD}|" ${WRKSRC}/scripts/kconfig/merge_config.sh
 	${CP} ${FILESDIR}/boot.cmd ${WRKSRC}/
 .if defined(METADATA_METHOD)
 	@echo "METHOD=uboot-${METADATA_METHOD}" > ${WRKSRC}/metadata
 	@echo "FILES=\"${METADATA_FILES}\"" >> ${WRKSRC}/metadata
 .if ${METADATA_METHOD} == "raw"
 	@echo "OFFSET=${METADATA_OFFSET}" >> ${WRKSRC}/metadata
 	@echo "BS=${METADATA_BS}" >> ${WRKSRC}/metadata
 .elif ${METADATA_METHOD} == "file"
 .endif
 .endif
 
 .if ${UBOOT_ARCH} == arm && !defined(CONFIG_FRAGMENT)
 # For armv6/v7 we want CONFIG_API
 # Use a KConfig fragment for that
 FRAGMENT_NAME=		FreeBSD_Fragment
 CONFIG_FRAGMENT=	${FILESDIR}/${FRAGMENT_NAME}
 .endif
 
 .if defined(CONFIG_FRAGMENT)
 do-configure:
 	${CP} ${CONFIG_FRAGMENT} ${WRKSRC}/configs/
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME})
 .else
 do-configure:
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
 .endif
 
 .if ${UBOOT_ARCH} == arm
 post-build:
 	mkimage -C none -A arm -T script -d ${FILESDIR}/boot.cmd ${WRKSRC}/boot.scr
 .endif
 
 # If we need to put anything into WRKSRC, do so now so we can build the PLIST
 # in do-install
 .if defined(UBOOT_MOVE)
 pre-install:
 	${CP} ${UBOOT_MOVE} ${WRKSRC}
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${INST}
 .for i in ${UBOOT_PLIST}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${INST}
 .endfor
 	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README
 
 .include <bsd.port.mk>
Index: head/sysutils/u-boot-master/distinfo
===================================================================
--- head/sysutils/u-boot-master/distinfo	(revision 485931)
+++ head/sysutils/u-boot-master/distinfo	(revision 485932)
@@ -1,17 +1,41 @@
-TIMESTAMP = 1538666163
-SHA256 (u-boot/u-boot-2018.09.tar.bz2) = 839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268
-SIZE (u-boot/u-boot-2018.09.tar.bz2) = 12744107
+TIMESTAMP = 1542996560
+SHA256 (u-boot/u-boot-2018.11.tar.bz2) = 737c93f2ea03fec669e840dbee32bcf6238e6924ff5f20e4f1c472ee24e5d37e
+SIZE (u-boot/u-boot-2018.11.tar.bz2) = 13045125
 SHA256 (u-boot/937869/raw) = 5959afb53dc744d9548a2d05a2a98d7c76e66570156353fc4f1220a648b8ac05
 SIZE (u-boot/937869/raw) = 322
 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
 SIZE (u-boot/939129/raw) = 310
 SHA256 (u-boot/976729/raw) = a41021bd21fb6d4cb594f9fe62712ce186e56f47353e53becc6c689aca17b4ba
 SIZE (u-boot/976729/raw) = 3243
 SHA256 (u-boot/976733/raw) = 7b7520d18df56d066c618953e2ab52d63c797a72559390b4dc8f6b2b11599646
 SIZE (u-boot/976733/raw) = 730
 SHA256 (u-boot/976732/raw) = 036f576190c6711d59a59ea4aa6c14f95d6540f22c6a769d17108a6ad0d57431
 SIZE (u-boot/976732/raw) = 411
 SHA256 (u-boot/976731/raw) = 303fab17d125b4bcc887772eb0227cc33323e43c2dc0aa52312d8454439ee602
 SIZE (u-boot/976731/raw) = 2258
 SHA256 (u-boot/976730/raw) = 42683e57759a7e6fb5f813678e8caf0fd7a5e347ac618bbc2c5b752487f77a7b
 SIZE (u-boot/976730/raw) = 4991
+SHA256 (u-boot/990016/raw) = 2c74f4570459edaa3e2ce94a84cf68bde0f2375404e0ed5ced6d3b0e34d46f72
+SIZE (u-boot/990016/raw) = 2617
+SHA256 (u-boot/990030/raw) = d346aabdaa65b0132ac12747ca51c6e070d4521a450f2482bff893a6ecc40ed5
+SIZE (u-boot/990030/raw) = 30369
+SHA256 (u-boot/990031/raw) = 33da4e196b33faf55cf2312938c0159727c3f9275fedde99bb14c0793d4cef30
+SIZE (u-boot/990031/raw) = 442
+SHA256 (u-boot/990032/raw) = d6ac026aa126cd36fb3456ec015f0edaf63e6159847dd04706c34c62d6524621
+SIZE (u-boot/990032/raw) = 1219
+SHA256 (u-boot/990033/raw) = b1e6c24fcb6ce000ee43f0465b37c8f8635c5048848e77a28d1de44a8a21f9d6
+SIZE (u-boot/990033/raw) = 2853
+SHA256 (u-boot/993502/raw) = aa566dd02f2f0bf1365e0f9eaec41721faf4b78d3445d97e45fac577d2102c3d
+SIZE (u-boot/993502/raw) = 2485
+SHA256 (u-boot/993503/raw) = bfa789179c355726a679cdb5cac49f2a207111bc17e0ab12278fb32b2e1d718c
+SIZE (u-boot/993503/raw) = 1400
+SHA256 (u-boot/993504/raw) = 30c4a67a07c747abffa543098a40ba3cd590bafdb7cfcf765412b462078a16e1
+SIZE (u-boot/993504/raw) = 857
+SHA256 (u-boot/993505/raw) = 0031f23969d760c9011d3c4c51adba141a378b2f6b3b5020102645e08a517588
+SIZE (u-boot/993505/raw) = 7812
+SHA256 (u-boot/994067/raw) = 3ace5a4a20e42e7949fefd5b62e96d641d304ddc515a78f108b44b24491fafb4
+SIZE (u-boot/994067/raw) = 1279
+SHA256 (u-boot/994070/raw) = 4fbd816d6d91f02aec6ddb91cd5308f22ebdb442b7ae2fa0d50cf2f1889f7d3c
+SIZE (u-boot/994070/raw) = 489
+SHA256 (u-boot/994068/raw) = 0082f6ecf6d75e07e5080eebefc906e9b696aabc0df607c66cc5a529d5f98215
+SIZE (u-boot/994068/raw) = 1208
Index: head/sysutils/u-boot-master/files/patch-efi_cache.c
===================================================================
--- head/sysutils/u-boot-master/files/patch-efi_cache.c	(nonexistent)
+++ head/sysutils/u-boot-master/files/patch-efi_cache.c	(revision 485932)
@@ -0,0 +1,73 @@
+From c731cc3f2d72c7d41a9087c8eff46d3679659e20 Mon Sep 17 00:00:00 2001
+From: Emmanuel Vadot <manu@freebsd.org>
+Date: Fri, 23 Nov 2018 17:33:47 +0100
+Subject: [PATCH] Revert "efi_loader: remove efi_exit_caches()"
+
+This reverts commit 3170db63c41a2eda6ee6573353bb4de8c7c1b9d5.
+---
+ lib/efi_loader/efi_boottime.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
+index da978d2b34..54c597f042 100644
+--- lib/efi_loader/efi_boottime.c
++++ lib/efi_loader/efi_boottime.c
+@@ -26,6 +26,14 @@ LIST_HEAD(efi_obj_list);
+ /* List of all events */
+ LIST_HEAD(efi_events);
+ 
++/*
++ * If we're running on nasty systems (32bit ARM booting into non-EFI Linux)
++ * we need to do trickery with caches. Since we don't want to break the EFI
++ * aware boot path, only apply hacks when loading exiting directly (breaking
++ * direct Linux EFI booting along the way - oh well).
++ */
++static bool efi_is_direct_boot = true;
++
+ #ifdef CONFIG_ARM
+ /*
+  * The "gd" pointer lives in a register on ARM and AArch64 that we declare
+@@ -1678,6 +1686,8 @@ static efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle,
+ 
+ 	EFI_ENTRY("%p, %p, %p", image_handle, exit_data_size, exit_data);
+ 
++	efi_is_direct_boot = false;
++
+ 	/* call the image! */
+ 	if (setjmp(&image_obj->exit_jmp)) {
+ 		/*
+@@ -1785,6 +1795,21 @@ static efi_status_t EFIAPI efi_unload_image(efi_handle_t image_handle)
+ 	return EFI_EXIT(EFI_SUCCESS);
+ }
+ 
++/**
++ * efi_exit_caches() - fix up caches for EFI payloads if necessary
++ */
++static void efi_exit_caches(void)
++{
++#if defined(CONFIG_ARM) && !defined(CONFIG_ARM64)
++	/*
++	 * Grub on 32bit ARM needs to have caches disabled before jumping into
++	 * a zImage, but does not know of all cache layers. Give it a hand.
++	 */
++	if (efi_is_direct_boot)
++		cleanup_before_linux();
++#endif
++}
++
+ /**
+  * efi_exit_boot_services() - stop all boot services
+  * @image_handle: handle of the loaded image
+@@ -1838,6 +1863,9 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
+ 
+ 	board_quiesce_devices();
+ 
++	/* Fix up caches for EFI payloads if necessary */
++	efi_exit_caches();
++
+ 	/* This stops all lingering devices */
+ 	bootm_disable_interrupts();
+ 
+-- 
+2.19.0
+

Property changes on: head/sysutils/u-boot-master/files/patch-efi_cache.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/u-boot-pinebook/Makefile
===================================================================
--- head/sysutils/u-boot-pinebook/Makefile	(revision 485931)
+++ head/sysutils/u-boot-pinebook/Makefile	(revision 485932)
@@ -1,15 +1,22 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PATCHFILES+=	976729/raw	\
-		976733/raw	\
-		976732/raw	\
-		976731/raw	\
-		976730/raw
+PATCHFILES+=	990016/raw      \
+		990030/raw      \
+		990031/raw      \
+		990032/raw      \
+		990033/raw      \
+		993502/raw      \
+		993503/raw      \
+		993504/raw      \
+		993505/raw      \
+		994067/raw      \
+		994070/raw      \
+		994068/raw
 
 MODEL=		pinebook
 BOARD_CONFIG=	pinebook_defconfig
 FAMILY=		allwinner64
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-rpi2/files/rpi2_fragment
===================================================================
--- head/sysutils/u-boot-rpi2/files/rpi2_fragment	(revision 485931)
+++ head/sysutils/u-boot-rpi2/files/rpi2_fragment	(revision 485932)
@@ -1,3 +1,5 @@
 CONFIG_OF_EMBED=n
 CONFIG_OF_BOARD=y
 CONFIG_API=y
+CONFIG_ARMV7_NONSEC=n
+CONFIG_CMD_CACHE=y