u-boot: Upgrade to 2023.01
PATCH v3 1/1 u-boot: Upgrade to 2023.01
From: Fabio Estevam <[email protected]>
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.
Signed-off-by Fabio Estevam <[email protected]>
---
Changes since v2:
- Add a patch to fix u-boot-tools.
...ols-only-add-VIDEO-to-build-bmp_logo.patch | 39 ++++++++++++++++ ...1-riscv-fix-build-with-binutils-2.38.patch | 40 ----------------- ...iscv32-Use-double-float-ABI-for-rv32.patch | 44 ------------------- meta/recipes-bsp/u-boot/u-boot-common.inc | 4 +- .../u-boot/u-boot-tools_2022.10.bb | 3 -- .../u-boot/u-boot-tools_2023.01.bb | 4 ++ meta/recipes-bsp/u-boot/u-boot_2022.10.bb | 9 ---- meta/recipes-bsp/u-boot/u-boot_2023.01.bb | 5 +++ 8 files changed, 50 insertions(+), 98 deletions(-) create mode 100644 meta/recipes-bsp/u-boot/files/0001-Revert-config-tools-only-add-VIDEO-to-build-bmp_logo.patch delete mode 100644 meta/recipes-bsp/u-boot/files/0001-riscv-fix-build-with-binutils-2.38.patch delete mode 100644 meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot-tools_2022.10.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-tools_2023.01.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2022.10.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot_2023.01.bb
meta/recipes-bsp/u-boot/files/0001-Revert-config-tools-only-add-VIDEO-to-build-bmp_logo.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 5d663e105f5affbe1ba771a1124855bff748b829 Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <[email protected]> +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/[email protected]/] +Signed-off-by: Fabio Estevam <[email protected]> +--- + 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 +
meta/recipes-bsp/u-boot/files/0001-riscv-fix-build-with-binutils-2.38.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 26a7f6b1e4c5f715c03e59a623f0d620498b92cf Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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 <[email protected]> ---- - 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)
meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch deleted +0 -44
44 lines not on this page · raw message
meta/recipes-bsp/u-boot/u-boot-common.inc +2 -2
@@ -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"
meta/recipes-bsp/u-boot/u-boot-tools_2022.10.bb deleted +0 -3
@@ -1,3 +0,0 @@ -require u-boot-common.inc -require u-boot-tools.inc -
meta/recipes-bsp/u-boot/u-boot-tools_2023.01.bb new file +4 -0
@@ -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"
meta/recipes-bsp/u-boot/u-boot_2022.10.bb deleted +0 -9
@@ -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" -
meta/recipes-bsp/u-boot/u-boot_2023.01.bb new file +5 -0
@@ -0,0 +1,5 @@ +require u-boot-common.inc +require u-boot.inc + +DEPENDS += "bc-native dtc-native python3-setuptools-native" +
Signature · 1 line
2.25.1
Em qui., 19 de jan. de 2023 às 15:26, Fabio Estevam <[email protected]> escreveu:
meta/recipes-bsp/u-boot/u-boot_2023.01.bb line 5
Quoted 8 lines
+++ b/meta/recipes-bsp/u-boot/u-boot_2023.01.bb
meta/recipes-bsp/u-boot/u-boot_2023.01.bb new file +5
-0@@ -0,0 +1,5 @@ +require u-boot-common.inc +require u-boot.inc + +DEPENDS += "bc-native dtc-native python3-setuptools-native" +
python3-setuptools-native has been included in the common.inc so this depends can be removed.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750