summaryrefslogtreecommitdiff
path: root/package/u-boot
diff options
context:
space:
mode:
Diffstat (limited to 'package/u-boot')
-rw-r--r--package/u-boot/Makefile15
-rw-r--r--package/u-boot/patches/patch-tools_Makefile11
2 files changed, 9 insertions, 17 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index ba64d7356..65c430802 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= u-boot
-PKG_VERSION:= 2024.07
+PKG_VERSION:= 2025.04
PKG_RELEASE:= 1
-PKG_HASH:= f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
+PKG_HASH:= 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718
PKG_DESCR:= portable bootloader
PKG_SECTION:= base/boot
-HOST_BUILDDEP:= openssl-host dtc-host swig-host python3-host python-setuptools-host
-PKG_BUILDDEP:= python3-host python-setuptools-host swig-host u-boot-host
+HOST_BUILDDEP:= gnutls-host openssl-host dtc-host swig-host python3-host python3-setuptools-host
+PKG_BUILDDEP:= python3-host python3-setuptools-host swig-host u-boot-host
PKG_URL:= http://www.denx.de/wiki/U-Boot
PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/
@@ -39,6 +39,7 @@ UBOOT:= u-boot.img
endif
ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y)
CONFIG:= Linksprite_pcDuino3_defconfig
+UBOOT:= u-boot-sunxi-with-spl.bin
endif
ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
CONFIG:= rpi_defconfig
@@ -91,6 +92,8 @@ CONFIG:= starfive_visionfive2_defconfig
UBOOT:= u-boot.itb
endif
+MAKE_FLAGS+= HOSTCFLAGS="-I$(STAGING_HOST_DIR)/usr/include" \
+ HOSTLDFLAGS="$(HOST_LDFLAGS)"
HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \
HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl"
HOST_STYLE:= manual
@@ -104,9 +107,9 @@ endif
host-build:
(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
- $(HOST_MAKE_FLAGS) sandbox_defconfig )
+ $(HOST_MAKE_FLAGS) tools-only_defconfig )
(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
- $(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
+ $(HOST_MAKE_FLAGS) tools-only $(MAKE_TRACE) )
u-boot-hostinstall:
$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \
diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile
deleted file mode 100644
index fc284ad58..000000000
--- a/package/u-boot/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- u-boot-2024.01.orig/tools/Makefile 2024-01-08 16:37:48.000000000 +0100
-+++ u-boot-2024.01/tools/Makefile 2024-01-17 17:56:21.004096375 +0100
-@@ -250,7 +250,7 @@ HOSTLDLIBS_mkeficapsule += \
- $(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls")
- HOSTLDLIBS_mkeficapsule += \
- $(shell pkg-config --libs uuid 2> /dev/null || echo "-luuid")
--hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
-+#hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
-
- mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o
- HOSTLDLIBS_mkfwumdata += -luuid