diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index fa9e33d25960..d2adc16ab50a 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -93,7 +93,7 @@ UBOOT_METADATA_IMX6_RAW_BS= 512 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}} .endif -UBOOT_VERSION?= 2018.11 +UBOOT_VERSION?= 2019.01 .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu}) UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}} diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo index 398717f69c65..11d7c320632b 100644 --- a/sysutils/u-boot-master/distinfo +++ b/sysutils/u-boot-master/distinfo @@ -1,41 +1,5 @@ -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 +TIMESTAMP = 1549296844 +SHA256 (u-boot/u-boot-2019.01.tar.bz2) = 50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22 +SIZE (u-boot/u-boot-2019.01.tar.bz2) = 13366005 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 diff --git a/sysutils/u-boot-master/files/patch-efi_cache.c b/sysutils/u-boot-master/files/patch-efi_cache.c deleted file mode 100644 index a57e47eb3042..000000000000 --- a/sysutils/u-boot-master/files/patch-efi_cache.c +++ /dev/null @@ -1,73 +0,0 @@ -From c731cc3f2d72c7d41a9087c8eff46d3679659e20 Mon Sep 17 00:00:00 2001 -From: Emmanuel Vadot -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 - diff --git a/sysutils/u-boot-pinebook/Makefile b/sysutils/u-boot-pinebook/Makefile index e457d7e755bc..62e09f1f145f 100644 --- a/sysutils/u-boot-pinebook/Makefile +++ b/sysutils/u-boot-pinebook/Makefile @@ -2,19 +2,6 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -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 diff --git a/sysutils/u-boot-rpi-0-w/Makefile b/sysutils/u-boot-rpi-0-w/Makefile index 22e73cc4c574..a99783a8169b 100644 --- a/sysutils/u-boot-rpi-0-w/Makefile +++ b/sysutils/u-boot-rpi-0-w/Makefile @@ -2,8 +2,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -PATCHFILES+= 937869/raw \ - 939129/raw +PATCHFILES+= 939129/raw MODEL= rpi-0-w BOARD_CONFIG= rpi_0_w_defconfig diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile index 4056c0133e51..933145adcbbc 100644 --- a/sysutils/u-boot-rpi/Makefile +++ b/sysutils/u-boot-rpi/Makefile @@ -2,8 +2,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -PATCHFILES+= 937869/raw \ - 939129/raw +PATCHFILES+= 939129/raw MODEL= rpi BOARD_CONFIG= rpi_defconfig diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile index d157d0a33487..4da9cccec408 100644 --- a/sysutils/u-boot-rpi2/Makefile +++ b/sysutils/u-boot-rpi2/Makefile @@ -2,8 +2,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -PATCHFILES+= 937869/raw \ - 939129/raw +PATCHFILES+= 939129/raw MODEL= rpi2 BOARD_CONFIG= rpi_2_defconfig diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile index ec6676e4cbdf..867657cce3de 100644 --- a/sysutils/u-boot-rpi3/Makefile +++ b/sysutils/u-boot-rpi3/Makefile @@ -3,8 +3,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master EXTRA_PATCHES= ${.CURDIR}/files/ -PATCHFILES+= 937869/raw \ - 939129/raw +PATCHFILES+= 939129/raw MODEL= rpi3 BOARD_CONFIG= rpi_3_defconfig