armsr: Remove kernel 6.1 configuration

[openwrt/openwrt.git] / tools / mkimage / Makefile

diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 5ed4107e1d6b4b62f84f996dc58211a0ef088ade..6d2cc5f7643846dc9b4f11b71cc8d1c11d085b05 100644 (file)
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -7,25 +7,28 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mkimage
-PKG_VERSION:=2021.10
+PKG_VERSION:=2024.04
 
 PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
        https://mirror.cyberbits.eu/u-boot \
        https://ftp.denx.de/pub/u-boot \
        ftp://ftp.denx.de/pub/u-boot
-PKG_HASH:=cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4
+PKG_HASH:=18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Host/Prepare
-       $(Host/Prepare/Default)
-       mkdir -p $(HOST_BUILD_DIR)/include/config
-       touch $(HOST_BUILD_DIR)/include/config/auto.conf
-       mkdir -p $(HOST_BUILD_DIR)/include/generated/
-       touch $(HOST_BUILD_DIR)/include/generated/autoconf.h
+define Host/Configure
+       $(MAKE) -C $(HOST_BUILD_DIR) \
+               HOSTCFLAGS="$(HOST_CFLAGS)" \
+               HOSTLDFLAGS="$(HOST_LDFLAGS)" \
+               PKG_CONFIG_EXTRAARGS="--static" \
+               V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1) \
+               tools-only_config
+
+       sed -i 's/CONFIG_TOOLS_MKEFICAPSULE=y/# CONFIG_TOOLS_MKEFICAPSULE is not set/' $(HOST_BUILD_DIR)/.config
 endef
 
 define Host/Compile
@@ -33,12 +36,7 @@ define Host/Compile
                HOSTCFLAGS="$(HOST_CFLAGS)" \
                HOSTLDFLAGS="$(HOST_LDFLAGS)" \
                PKG_CONFIG_EXTRAARGS="--static" \
-               no-dot-config-targets=tools-only \
-               CONFIG_MKIMAGE_DTC_PATH=dtc \
-               CONFIG_FIT=y \
-               CONFIG_FIT_SIGNATURE=y \
-               CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 \
-               CONFIG_TOOLS_LIBCRYPTO=y \
+               V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1) \
                tools-only
 endef