From 4863a7146481efbdd92e2da37beb496bb6da4c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= Date: Tue, 4 Apr 2023 11:24:13 +0000 Subject: [PATCH] main/u-boot: upgrade to 2023.04 add py3-elftools to makedepends bmp_logo is disabled upstream by default so don't package it ubsha1 and xway-swap-bytes are removed upstream refactor fix-tools-build.patch remove hifive-unmatched-ramdisk.patch, not needed anymore --- main/u-boot/APKBUILD | 15 +++++++-------- main/u-boot/fix-tools-build.patch | 14 +++++++------- main/u-boot/hifive-unmatched-ramdisk.patch | 19 ------------------- 3 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 main/u-boot/hifive-unmatched-ramdisk.patch diff --git a/main/u-boot/APKBUILD b/main/u-boot/APKBUILD index 748b0fa5849..9169c089839 100644 --- a/main/u-boot/APKBUILD +++ b/main/u-boot/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Timo Teras # Maintainer: Milan P. Stanić pkgname=u-boot -pkgver=2023.01 -pkgrel=2 +pkgver=2023.04 +pkgrel=0 pkgdesc="u-boot bootloader common files" url="https://www.denx.de/wiki/U-Boot/" arch="all !s390x !ppc64le" @@ -18,6 +18,7 @@ makedepends=" gnutls-dev linux-headers openssl-dev>3 + py3-elftools py3-setuptools python3-dev swig @@ -29,7 +30,6 @@ fi source="https://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2 README.txt update-u-boot - hifive-unmatched-ramdisk.patch fix-tools-build.patch " builddir="$srcdir"/u-boot-${pkgver//_/-} @@ -133,9 +133,9 @@ tools() { mkdir -p $pkgdir mkdir $subpkgdir cd "$builddir" - for tool in bmp_logo dumpimage env/fw_printenv \ + for tool in dumpimage env/fw_printenv \ fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr img2srec \ - mkenvimage mkimage ncb proftool ubsha1 xway-swap-bytes; do + mkenvimage mkimage ncb proftool; do install -D tools/$tool \ $subpkgdir/usr/bin/"$(basename $tool)" done @@ -192,9 +192,8 @@ for board_config in $board_configs; do done sha512sums=" -417a28267eb7875820d08fafc7316f164663609378637539e71648b0b9b7d28796b6c381717f31b0ab6472805fefd32628ef7d1b2e7b9f3c51c8ad122993f679 u-boot-2023.01.tar.bz2 +31a44083af8084cd657c08233f485ff9503002bbaf95114c6135d483881fa14dc5a1b7ab42fd91f1fdd6b330556e76958d475280115018cb59c62b6ab4b508e6 u-boot-2023.04.tar.bz2 f8c9bb6e84d6f0620c976ac7ad5dd7ec7ff9dfdd4b1d03d2bf6653e7beccf80bdf2debfc92fb1f696dba92fb40287d3c45897e0078951451d0835cb61a5f16d1 README.txt 2be9f81957cbf7a772745b043ed60217000a17bfad6236a5eac1a282e99d609b9ae04bc541dd8d80ab9e5b26c99f5de76fb5a556fd93c0b04ae03bd59071ec15 update-u-boot -1e8c95a37e7efb74f6519f66da44a0050417066aa2bd6d38e8a7e7135f501a9578dcc3701f66a170bf4cbd5c17b87d69ff80760979b1aa31d26e75be7cf7b97f hifive-unmatched-ramdisk.patch -3b900d833ee7d82ee3bca6e8f8cb8e297359bb65c3f095a0d22377779eb8a233c5e566e5db6ce79f3076fbe6413d002941eb9cc450e3462337f46c1805472ce0 fix-tools-build.patch +83fc42c698f8236ba1f7d71383863e0bda255ada85bb885856a24b2036944d230d918a9d965d5ff90720726c9ee85ffda5e88eefc27b94ef9e7b4f456dcfb195 fix-tools-build.patch " diff --git a/main/u-boot/fix-tools-build.patch b/main/u-boot/fix-tools-build.patch index 6f11baf43c6..f2606d5a345 100644 --- a/main/u-boot/fix-tools-build.patch +++ b/main/u-boot/fix-tools-build.patch @@ -1,17 +1,17 @@ Author: Milan P. Stanić -Date: Thu Jan 143 21:33:42 2022 +0000 +Date: 2023-04-04 10:07:00.033003320 +0200 musl libc doesn't have c_ospeed and c_ispeed types so disable build of kwboot with this patch ---- a/tools/Makefile 2022-01-10 18:46:34.000000000 +0000 -+++ b/tools/Makefile 2022-01-14 20:26:13.814939412 +0000 -@@ -217,8 +217,6 @@ +--- a/tools/Makefile 2023-04-04 10:07:00.033003320 +0200 ++++ b/tools/Makefile 2023-04-04 10:07:26.345003333 +0200 +@@ -213,8 +213,6 @@ - HOSTCFLAGS_ubsha1.o := -pedantic + hostprogs-$(CONFIG_NETCONSOLE) += ncb -hostprogs-$(CONFIG_ARCH_KIRKWOOD) += kwboot -hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot + hostprogs-y += proftool - hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela - hostprogs-$(CONFIG_RISCV) += prelink-riscv + proftool-objs = proftool.o lib/abuf.o diff --git a/main/u-boot/hifive-unmatched-ramdisk.patch b/main/u-boot/hifive-unmatched-ramdisk.patch deleted file mode 100644 index a6a1c16846b..00000000000 --- a/main/u-boot/hifive-unmatched-ramdisk.patch +++ /dev/null @@ -1,19 +0,0 @@ -On the HiFive1 the ramdisk is occasionally loaded to the wrong address -range, causing boot to hang during ramdisk loading. This patch fixes -this occasionally occurring issue. - -See https://lists.denx.de/pipermail/u-boot/2021-October/463798.html for -details. As per https://lists.denx.de/pipermail/u-boot/2021-October/463844.html -this patch should no longer be needed as soon as v2022.01 is released. - -diff -upr u-boot-2021.10.orig/include/configs/sifive-unmatched.h u-boot-2021.10/include/configs/sifive-unmatched.h ---- u-boot-2021.10.orig/include/configs/sifive-unmatched.h 2021-10-15 19:07:43.123472870 +0200 -+++ u-boot-2021.10/include/configs/sifive-unmatched.h 2021-10-15 19:08:27.357420781 +0200 -@@ -25,6 +25,7 @@ - - #endif - -+#define CONFIG_SYS_BOOTMAPSZ (256 << 20) - #define CONFIG_SYS_SDRAM_BASE 0x80000000 - #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -