| Message ID | 20220517225821.1572443-1-james.hilliard1@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] utils/genrandconfig: add ARM trusted firmware fixup | expand |
On 18/05/2022 00:58, James Hilliard wrote: > 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 <james.hilliard1@gmail.com> Applied to master, thanks. Regards, Arnout > --- > 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')
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')
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 <james.hilliard1@gmail.com> --- utils/genrandconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)