u-boot: Upgrade 2020.01-rc5 -> 2020.01

Also drop unreferenced (already merged) patches.

(From OE-Core rev: 7b1440dff8129a997400cd7d4b5372455ddd1fe4)

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alex Kiernan
2020-01-13 07:01:01 +00:00
committed by Richard Purdie
parent 05bab64806
commit 369e217c2f
3 changed files with 1 additions and 118 deletions

View File

@@ -1,31 +0,0 @@
From 718170ff3a5e677db7212a86b129dacb28b1cac2 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
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 <alistair.francis@wdc.com>
---
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

View File

@@ -1,83 +0,0 @@
From dccfea2e95cd3f26d1295e02d41012d014827dd9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Mon, 16 Dec 2019 23:36:40 +0000
Subject: [PATCH 2/2] include: fix 'ulong' definition on musl targets
The build failure was originally reported on arm64-musl
target at https://bugs.gentoo.org/703132. Here is the amd64-musl
variant:
```
$ LANG=C make CROSS_COMPILE=x86_64-gentoo-linux-musl- tools-only_defconfig -j$(nproc)
$ LANG=C make CROSS_COMPILE=x86_64-gentoo-linux-musl- tools-all -j$(nproc)
...
In file included from tools/env/../../env/flags.c:7,
from tools/env/env_flags.c:1:
include/env.h:159:1: error: unknown type name 'ulong'; did you mean 'long'?
159 | ulong env_get_ulong(const char *name, int base, ulong default_val);
| ^~~~~
| long
```
Note: 'ulong' is not defined there.
On glibc 'ulong' comes from <sys/types.h>:
```c
/* Old compatibility names for C types. */
typedef unsigned long int ulong;
```
On musl it comes from <sys/types.h> as well but from under different guards:
```c
typedef unsigned long u_long, ulong;
```
The change inlines 'ulong' define similar to 'uint' define.
Upstream-Status: Pending
Bug: https://bugs.gentoo.org/703132
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Message-Id: <20191216233640.518168-1-slyfox@gentoo.org>
---
include/compiler.h | 2 +-
include/u-boot/crc.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/compiler.h b/include/compiler.h
index 29507f9840..90372f239c 100644
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -46,7 +46,6 @@
# include <byteswap.h>
#elif defined(__MACH__) || defined(__FreeBSD__)
# include <machine/endian.h>
-typedef unsigned long ulong;
#endif
#ifdef __FreeBSD__
# include <sys/endian.h> /* htole32 and friends */
@@ -66,6 +65,7 @@ typedef uint8_t __u8;
typedef uint16_t __u16;
typedef uint32_t __u32;
typedef unsigned int uint;
+typedef unsigned long ulong;
#define uswap_16(x) \
((((x) & 0xff00) >> 8) | \
diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h
index 1086d2168c..b96b50d98b 100644
--- a/include/u-boot/crc.h
+++ b/include/u-boot/crc.h
@@ -8,6 +8,8 @@
#ifndef _UBOOT_CRC_H
#define _UBOOT_CRC_H
+#include <compiler.h> /* unit definition */
+
/**
* crc8() - Calculate and return CRC-8 of the data
*
--
2.24.1

View File

@@ -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 \
"