diff --git a/main/u-boot/APKBUILD b/main/u-boot/APKBUILD index 84e0dfb7a9e..d85db8f52ad 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=2024.04 -pkgrel=1 +pkgver=2024.07 +pkgrel=0 pkgdesc="u-boot bootloader common files" url="https://www.denx.de/wiki/U-Boot/" arch="all !s390x !ppc64le" @@ -17,6 +17,7 @@ makedepends=" flex gnutls-dev linux-headers + ncurses-dev openssl-dev py3-elftools py3-setuptools @@ -46,7 +47,7 @@ fi case "$CARCH" in arm*) board_configs=" - beagleboard:am335x_boneblack_vboot + beagleboard:am335x_evm linksprite:Linksprite_pcDuino3_Nano cuboxi:mx6cuboxi raspberrypi:rpi_0_w,rpi,rpi_2,rpi_3_32b @@ -59,7 +60,7 @@ aarch64) board_configs=" thunderx:thunderx_88xx raspberrypi:rpi_3,rpi_arm64 odroid:odroid-c2,odroid-n2 - snapdragon:starqltechn + snapdragon:qcom exynos:a3y17lte,a5y17lte,a7y17lte libretech:libretech-cc rockchip:rockpro64-rk3399,roc-pc-rk3399,roc-cc-rk3328,pinebook-pro-rk3399 @@ -194,8 +195,8 @@ for board_config in $board_configs; do done sha512sums=" -a71270302b38e9e68a83b3acdf8f7635f72d9fa75169e3c2241cdfa21eab834b8f25dfd35c281191bccb2fcec1e86d6b64afcf1d2ed5cd4fdc02258cd75fc236 u-boot-2024.04.tar.bz2 +678f44e2b9132140f0bf05c637e57e638c73c278611037a41824b3ebff2131af4dec0163da4664bb2e5c4fd8034ba8c95b93b57f7aa9f4c045da322d87c3b5e9 u-boot-2024.07.tar.bz2 f8c9bb6e84d6f0620c976ac7ad5dd7ec7ff9dfdd4b1d03d2bf6653e7beccf80bdf2debfc92fb1f696dba92fb40287d3c45897e0078951451d0835cb61a5f16d1 README.txt 6cf882785fa12abcfdfa82119f6a3446229bc75f4c19d5751676625dda81df5ca428c2b631187ecbc39261b081b1a8b53bceeac9f43a3229f7610abc4d9862a2 update-u-boot -83fc42c698f8236ba1f7d71383863e0bda255ada85bb885856a24b2036944d230d918a9d965d5ff90720726c9ee85ffda5e88eefc27b94ef9e7b4f456dcfb195 fix-tools-build.patch +1ccba2c96703d82e16126c77c8a88e468ecd704a0a89b015efb7889ca40c6f6a05104269f465cb0d79b824d8e0d1616689d8165c70403a8f52c7d91fa1637623 fix-tools-build.patch " diff --git a/main/u-boot/fix-tools-build.patch b/main/u-boot/fix-tools-build.patch index f2606d5a345..28ee7b2642d 100644 --- a/main/u-boot/fix-tools-build.patch +++ b/main/u-boot/fix-tools-build.patch @@ -1,17 +1,16 @@ Author: Milan P. Stanić -Date: 2023-04-04 10:07:00.033003320 +0200 +Date: 2024-01-08 16:37:48.000000000 +0100 -musl libc doesn't have c_ospeed and c_ispeed types so disable -build of kwboot with this patch +Alpine doesn't have tinfo lib so build tools/kwboot with ncursesw ---- 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 @@ +--- a/tools/Makefile 2024-01-08 16:37:48.000000000 +0100 ++++ b/tools/Makefile 2024-04-12 11:00:20.921739870 +0200 +@@ -200,7 +200,7 @@ + HOSTCFLAGS_kwboot.o += -pthread + HOSTLDLIBS_kwboot += -pthread + HOSTLDLIBS_kwboot += \ +- $(shell pkg-config --libs tinfo 2> /dev/null || echo "-ltinfo") ++ $(shell pkg-config --libs ncursesw 2> /dev/null || echo "-lncursesw") - hostprogs-$(CONFIG_NETCONSOLE) += ncb - --hostprogs-$(CONFIG_ARCH_KIRKWOOD) += kwboot --hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot - - hostprogs-y += proftool - proftool-objs = proftool.o lib/abuf.o + ifdtool-objs := $(LIBFDT_OBJS) ifdtool.o + hostprogs-$(CONFIG_X86) += ifdtool