Page MenuHomeFreeBSD
Files F142583783

D18312.diff
No OneTemporary
Actions

D18312.diff
View Options

Index: sysutils/u-boot-master/Makefile
===================================================================
--- sysutils/u-boot-master/Makefile
+++ sysutils/u-boot-master/Makefile
@@ -5,7 +5,6 @@
PORTNAME= u-boot
PORTVERSION= ${UBOOT_VERSION}
-PORTREVISION= 3
CATEGORIES= sysutils
PKGNAMESUFFIX?= -${MODEL}
MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/
@@ -94,7 +93,7 @@
.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}}
Index: sysutils/u-boot-master/distinfo
===================================================================
--- sysutils/u-boot-master/distinfo
+++ sysutils/u-boot-master/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1538666163
-SHA256 (u-boot/u-boot-2018.09.tar.bz2) = 839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268
-SIZE (u-boot/u-boot-2018.09.tar.bz2) = 12744107
+TIMESTAMP = 1542990628
+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
Index: sysutils/u-boot-master/files/patch-efi_cache.c
===================================================================
--- /dev/null
+++ sysutils/u-boot-master/files/patch-efi_cache.c
@@ -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
+
Index: sysutils/u-boot-rpi2/files/rpi2_fragment
===================================================================
--- sysutils/u-boot-rpi2/files/rpi2_fragment
+++ sysutils/u-boot-rpi2/files/rpi2_fragment
@@ -1,3 +1,5 @@
CONFIG_OF_EMBED=n
CONFIG_OF_BOARD=y
CONFIG_API=y
+CONFIG_ARMV7_NONSEC=n
+CONFIG_CMD_CACHE=y

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 6:45 AM (16 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27832888
Default Alt Text
D18312.diff (4 KB)

Event Timeline