Skip to contentSkip to conversation

u-boot: Upgrade 2020.01-rc5 -> 2020.01

PATCH New Alex Kiernan 1 participant 1 message Jan 13, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 u-boot: Upgrade 2020.01-rc5 -> 2020.01

Also drop unreferenced (already merged) patches.

---

 ...nclude-env.h-Ensure-ulong-is-defined.patch | 31 -------
 ...fix-ulong-definition-on-musl-targets.patch | 83 -------------------
 meta/recipes-bsp/u-boot/u-boot-common.inc     |  5 +-
 3 files changed, 1 insertion(+), 118 deletions(-)
 delete mode 100644 meta/recipes-bsp/u-boot/files/0001-include-env.h-Ensure-ulong-is-defined.patch
 delete mode 100644 meta/recipes-bsp/u-boot/files/0002-include-fix-ulong-definition-on-musl-targets.patch
meta/recipes-bsp/u-boot/files/0001-include-env.h-Ensure-ulong-is-defined.patch deleted +0 -31
deleted file mode 100644
index 4d623c1f3469..000000000000
@@ -1,31 +0,0 @@
-From 718170ff3a5e677db7212a86b129dacb28b1cac2 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <[email protected]>
-Date: Mon, 14 Oct 2019 17:37:30 -0700
-Subject: [PATCH] include/env.h: Ensure ulong is defined
-
-To fix these failures when building with musl:
-   include/env.h:166:1: error: unknown type name 'ulong'; did you mean 'long'?
-ensure that ulong is defined.
-
-Upstream-Status: Pending
-Signed-off-by: Alistair Francis <[email protected]>
----
- include/env.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/env.h b/include/env.h
-index d6c2d751d6..6cf5053431 100644
---- a/include/env.h
-+++ b/include/env.h
-@@ -13,6 +13,8 @@
- #include <stdbool.h>
- #include <linux/types.h>
- 
-+typedef unsigned long           ulong;
-+
- struct environment_s;
- 
- /* Value for environment validity */
--- 
-2.24.1
-
meta/recipes-bsp/u-boot/files/0002-include-fix-ulong-definition-on-musl-targets.patch deleted +0 -83

83 lines not on this page · raw message

meta/recipes-bsp/u-boot/u-boot-common.inc +1 -4
index 4799948bb17a..ce07055f878c 100644
@@ -10,12 +10,9 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 PE = "1"
 
-# Drop this line when updating to 2020.01 final
-PV = "2020.01~rc5"
-
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "ef7c2af65966a57c98d3c47e6c2fe1ce2103b7f6"
+SRCREV = "303f8fed261020c1cb7da32dad63b610bf6873dd"
 
 SRC_URI = "git://git.denx.de/u-boot.git \
           "
Signature · 1 line
2.17.1