From 18fc33cccc68c1bc568ba51287b7a18fb1a2ab3a Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@turris.com>
Date: Fri, 9 Dec 2022 15:55:28 +0100
Subject: [PATCH] uboot-tools: Enable FIT image support

We need FIT image support for netboot, but it is also in general quite a
handy feature.
---
 .../to-upstream/0019-u-boot-tools-Add-mkimage-tool.patch      | 4 ++--
 .../to-upstream/0020-u-boot-tools-disable-efi-turris1x.patch  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/patches/openwrt/to-upstream/0019-u-boot-tools-Add-mkimage-tool.patch b/patches/openwrt/to-upstream/0019-u-boot-tools-Add-mkimage-tool.patch
index ef5465bfa..9e0442e1f 100644
--- a/patches/openwrt/to-upstream/0019-u-boot-tools-Add-mkimage-tool.patch
+++ b/patches/openwrt/to-upstream/0019-u-boot-tools-Add-mkimage-tool.patch
@@ -103,8 +103,8 @@ index a9eccec..1e2c351 100644
 +		NO_SDL=1 \
 +		envtools defconfig
 +	mv $(PKG_BUILD_DIR)/tools/env/fw_printenv $(PKG_BUILD_DIR)
-+	sed -i 's|^\(CONFIG_RSA.*\)=y|# \1 is not set|' $(PKG_BUILD_DIR)/.config
-+	sed -i 's|^\(CONFIG_FIT\)=y|# \1 is not set|' $(PKG_BUILD_DIR)/.config
++	echo 'CONFIG_FIT=y' >> $(PKG_BUILD_DIR)/.config
++	echo 'CONFIG_MULTI_DTB_FIT=n' >> $(PKG_BUILD_DIR)/.config
 +	$(MAKE) -C $(PKG_BUILD_DIR) \
 +		CROSS_COMPILE="$(TARGET_CROSS)" \
 +		TARGET_CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/patches/openwrt/to-upstream/0020-u-boot-tools-disable-efi-turris1x.patch b/patches/openwrt/to-upstream/0020-u-boot-tools-disable-efi-turris1x.patch
index d4c70c84b..b8fe624d0 100644
--- a/patches/openwrt/to-upstream/0020-u-boot-tools-disable-efi-turris1x.patch
+++ b/patches/openwrt/to-upstream/0020-u-boot-tools-disable-efi-turris1x.patch
@@ -13,8 +13,8 @@ index 1e2c35178c..467d0c9b86 100644
 +++ b/package/boot/uboot-tools/Makefile
 @@ -80,6 +80,9 @@ define Build/Compile
  	mv $(PKG_BUILD_DIR)/tools/env/fw_printenv $(PKG_BUILD_DIR)
- 	sed -i 's|^\(CONFIG_RSA.*\)=y|# \1 is not set|' $(PKG_BUILD_DIR)/.config
- 	sed -i 's|^\(CONFIG_FIT\)=y|# \1 is not set|' $(PKG_BUILD_DIR)/.config
+ 	echo 'CONFIG_FIT=y' >> $(PKG_BUILD_DIR)/.config
+ 	echo 'CONFIG_MULTI_DTB_FIT=n' >> $(PKG_BUILD_DIR)/.config
 +ifeq ($(CONFIG_TARGET_mpc85xx_p2020_DEVICE_cznic_turris1x),y)
 +	sed -i 's|^\(CONFIG_EFI_LOADER=y\)|CONFIG_EFI_LOADER=n|' $(PKG_BUILD_DIR)/.config
 +endif
-- 
GitLab