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 ef5465bfab5268f5eb22408fefe418d7e84730a3..9e0442e1fc8b9087020ea479044aa4f5f3cb4b65 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 d4c70c84b6bd5f54b99c4306df0c54e7bd1bcf0d..b8fe624d0bd7ed9924cb9ffe62d4ea9df0a18181 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