configlines.remove('BR2_TARGET_BAREBOX_USE_DEFCONFIG=y\n')
configlines.remove('BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n')
+ if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \
+ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n' in configlines and \
+ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n' in configlines:
+ configlines.remove('BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n')
+ configlines.append('BR2_TARGET_OPTEE_OS_LATEST=y\n')
+ configlines.remove('BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n')
+
if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \
'BR2_TARGET_OPTEE_OS_PLATFORM=""\n' in configlines:
configlines.remove('BR2_TARGET_OPTEE_OS=y\n')