mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 18:32:12 +02:00
u-boot: Upgrade to 2023.01
Upgrade to U-Boot 2023.01.
Remove the two patches that are now upstream:
e67f34f778ba ("riscv: support building double-float modules")
1dde977518f1 ("riscv: Fix build against binutils 2.38")
And add a patch that fixes u-boot-tools build.
(From OE-Core rev: ec69f295552d6dd4de755bb4562a007158cf660e)
Signed-off-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Fabio Estevam
committed by
Richard Purdie
Richard Purdie
parent
4022115a71
commit
383e97f896
@@ -0,0 +1,39 @@
|
||||
From 5d663e105f5affbe1ba771a1124855bff748b829 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Estevam <festevam@denx.de>
|
||||
Date: Wed, 18 Jan 2023 22:15:04 -0300
|
||||
Subject: [PATCH] Revert "config: tools only: add VIDEO to build bmp_logo"
|
||||
|
||||
This reverts commit 1cfba53ca46cade2dbf4e067afc8c19e72909a4b.
|
||||
|
||||
Since commit 1cfba53ca46c ("config: tools only: add VIDEO to build
|
||||
bmp_logo") the build of tools-only_defconfig fails:
|
||||
|
||||
| /bin/sh: line 1: tools/bmp_logo: No such file or directory
|
||||
|
||||
This has been noticed in OpenEmbedded and Debian [1].
|
||||
|
||||
Revert it for now.
|
||||
|
||||
[1] https://lists.denx.de/pipermail/u-boot/2023-January/504758.html
|
||||
|
||||
Upstream-Status: Submitted [https://lore.kernel.org/u-boot/20230119012321.1103067-1-festevam@denx.de/]
|
||||
Signed-off-by: Fabio Estevam <festevam@denx.de>
|
||||
---
|
||||
configs/tools-only_defconfig | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig
|
||||
index 2197063112..fb75235e3d 100644
|
||||
--- a/configs/tools-only_defconfig
|
||||
+++ b/configs/tools-only_defconfig
|
||||
@@ -29,7 +29,6 @@ CONFIG_DM_RTC=y
|
||||
CONFIG_SOUND=y
|
||||
CONFIG_SYSRESET=y
|
||||
CONFIG_TIMER=y
|
||||
-CONFIG_VIDEO=y
|
||||
# CONFIG_VIRTIO_MMIO is not set
|
||||
# CONFIG_VIRTIO_PCI is not set
|
||||
# CONFIG_VIRTIO_SANDBOX is not set
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
From 26a7f6b1e4c5f715c03e59a623f0d620498b92cf Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 13 Feb 2022 21:11:31 -0800
|
||||
Subject: [PATCH] riscv: fix build with binutils 2.38
|
||||
|
||||
From version 2.38, binutils default to ISA spec version 20191213. This
|
||||
means that the csr read/write (csrr*/csrw*) instructions and fence.i
|
||||
instruction has separated from the `I` extension, become two standalone
|
||||
extensions: Zicsr and Zifencei.
|
||||
|
||||
The fix is to specify those extensions explicitely in -march. However as
|
||||
older binutils version do not support this, we first need to detect
|
||||
that.
|
||||
|
||||
Fixes
|
||||
arch/riscv/lib/cache.c: Assembler messages:
|
||||
arch/riscv/lib/cache.c:12: Error: unrecognized opcode `fence.i'
|
||||
|
||||
Upstream-Status: Submitted []
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
arch/riscv/Makefile | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/arch/riscv/Makefile
|
||||
+++ b/arch/riscv/Makefile
|
||||
@@ -28,7 +28,12 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y)
|
||||
CMODEL = medany
|
||||
endif
|
||||
|
||||
-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_F)$(ARCH_D)$(ARCH_C) -mabi=$(ABI) \
|
||||
+# Newer binutils versions default to ISA spec version 20191213 which moves some
|
||||
+# instructions from the I extension to the Zicsr and Zifencei extensions.
|
||||
+toolchain-need-zicsr-zifencei := $(call cc-option-yn, -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_F)$(ARCH_D)$(ARCH_C)_zicsr_zifencei)
|
||||
+zicsr_zifencei-$(toolchain-need-zicsr-zifencei) := _zicsr_zifencei
|
||||
+
|
||||
+ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_F)$(ARCH_D)$(ARCH_C)$(zicsr_zifencei-y) -mabi=$(ABI) \
|
||||
-mcmodel=$(CMODEL)
|
||||
|
||||
PLATFORM_CPPFLAGS += $(ARCH_FLAGS)
|
||||
@@ -1,44 +0,0 @@
|
||||
From 66dfe0fa886f6289add06d1af8642ce2b5302852 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 9 Feb 2021 16:40:12 -0800
|
||||
Subject: [PATCH] riscv32: Use double-float ABI for rv32
|
||||
|
||||
So it can use libgcc built with OE toolchain
|
||||
Fixes
|
||||
error: "can't link hard-float modules with soft-float modules"
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
---
|
||||
arch/riscv/Makefile | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/arch/riscv/Makefile
|
||||
+++ b/arch/riscv/Makefile
|
||||
@@ -5,11 +5,15 @@
|
||||
|
||||
ifeq ($(CONFIG_ARCH_RV64I),y)
|
||||
ARCH_BASE = rv64im
|
||||
- ABI = lp64
|
||||
+ ABI = lp64d
|
||||
+ ARCH_D = d
|
||||
+ ARCH_F = f
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_RV32I),y)
|
||||
ARCH_BASE = rv32im
|
||||
- ABI = ilp32
|
||||
+ ABI = ilp32d
|
||||
+ ARCH_D = d
|
||||
+ ARCH_F = f
|
||||
endif
|
||||
ifeq ($(CONFIG_RISCV_ISA_A),y)
|
||||
ARCH_A = a
|
||||
@@ -24,7 +28,7 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y)
|
||||
CMODEL = medany
|
||||
endif
|
||||
|
||||
-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \
|
||||
+ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_F)$(ARCH_D)$(ARCH_C) -mabi=$(ABI) \
|
||||
-mcmodel=$(CMODEL)
|
||||
|
||||
PLATFORM_CPPFLAGS += $(ARCH_FLAGS)
|
||||
@@ -4,7 +4,7 @@ ARM, MIPS and several other processors, which can be installed in a boot \
|
||||
ROM and used to initialize and test the hardware or to download and run \
|
||||
application code."
|
||||
SECTION = "bootloaders"
|
||||
DEPENDS += "flex-native bison-native"
|
||||
DEPENDS += "flex-native bison-native python3-setuptools-native"
|
||||
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
|
||||
@@ -12,7 +12,7 @@ PE = "1"
|
||||
|
||||
# We use the revision in order to avoid having to fetch it from the
|
||||
# repo during parse
|
||||
SRCREV = "4debc57a3da6c3f4d3f89a637e99206f4cea0a96"
|
||||
SRCREV = "62e2ad1ceafbfdf2c44d3dc1b6efc81e768a96b9"
|
||||
|
||||
SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
require u-boot-common.inc
|
||||
require u-boot-tools.inc
|
||||
|
||||
4
meta/recipes-bsp/u-boot/u-boot-tools_2023.01.bb
Normal file
4
meta/recipes-bsp/u-boot/u-boot-tools_2023.01.bb
Normal file
@@ -0,0 +1,4 @@
|
||||
require u-boot-common.inc
|
||||
require u-boot-tools.inc
|
||||
|
||||
SRC_URI += "file://0001-Revert-config-tools-only-add-VIDEO-to-build-bmp_logo.patch"
|
||||
@@ -1,9 +0,0 @@
|
||||
require u-boot-common.inc
|
||||
require u-boot.inc
|
||||
|
||||
SRC_URI += " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch \
|
||||
file://0001-riscv-fix-build-with-binutils-2.38.patch \
|
||||
"
|
||||
|
||||
DEPENDS += "bc-native dtc-native python3-setuptools-native"
|
||||
|
||||
5
meta/recipes-bsp/u-boot/u-boot_2023.01.bb
Normal file
5
meta/recipes-bsp/u-boot/u-boot_2023.01.bb
Normal file
@@ -0,0 +1,5 @@
|
||||
require u-boot-common.inc
|
||||
require u-boot.inc
|
||||
|
||||
DEPENDS += "bc-native dtc-native"
|
||||
|
||||
Reference in New Issue
Block a user