From 541e794a959914d1189570c3674908eb5db08ce8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 17 May 2022 16:58:21 -0600 Subject: [PATCH] utils/genrandconfig: add ARM trusted firmware fixup Fixes: boot/arm-trusted-firmware/arm-trusted-firmware.mk:200: *** No repository specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL. Stop. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/genrandconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 60ef8739cc..cf43778183 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -426,6 +426,27 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_KERNEL_HEADERS_CUSTOM_TARBALL=y\n') configlines.remove('BR2_KERNEL_HEADERS_CUSTOM_TARBALL_LOCATION=""\n') + if 'BR2_TARGET_ARM_TRUSTED_FIRMWARE=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE=""\n' in configlines: + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y\n') + configlines.append('BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION=y\n') + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE=""\n') + + if 'BR2_TARGET_ARM_TRUSTED_FIRMWARE=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION=""\n' in configlines: + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y\n') + configlines.append('BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION=y\n') + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION=""\n') + + if 'BR2_TARGET_ARM_TRUSTED_FIRMWARE=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL=""\n' in configlines: + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y\n') + configlines.append('BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION=y\n') + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL=""\n') + if 'BR2_TARGET_AT91BOOTSTRAP3=y\n' in configlines and \ 'BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG=""\n' in configlines: configlines.remove('BR2_TARGET_AT91BOOTSTRAP3=y\n')