Skip to content

Conversation

@bhstalel
Copy link

When ENABLE_FLASHLAYOUT_CONFIG_FWUP is disabled (set to 0) then STM32MP_METADATA_NAME variable will be empty and this causes an endless parsing WARNING:

WARNING: <..>.bb: Variable key FLASHLAYOUT_PARTITION_ENABLE:${STM32MP_SSBL1_PROGRAMMER_NAME} (-) replaces original key FLASHLAYOUT_PARTITION_ENABLE: (${@bb.utils.contains('MACHINE_FEATURES', 'fw-update', 'PD', 'PED', d)})

what happens when STM32MP_METADATA_NAME is empty, the following FLASHLAYOUT_PARTITION_ENABLE:${STM32MP_METADATA_NAME} will be just FLASHLAYOUT_PARTITION_ENABLE:

which triggers these errors saying that other variants replaces it with other content.

This commit sets the default metadata variable and introduces a new variable to simply tell if it needs to be enabled in the flashlayout or not based on ENABLE_FLASHLAYOUT_CONFIG_FWUP.

This also fixes another line:

ENABLE_FLASHLAYOUT_CONFIG_FWUP ?= "${@bb.utils.contains('MACHINE_FEATURES', 'fw-update', '1', '0', d)}"

which was commented and 1 is forced.

When ENABLE_FLASHLAYOUT_CONFIG_FWUP is disabled (set to 0)
STM32MP_METADATA_NAME variable will be empty and this
causes an endless parsing WARNING:

WARNING: <..>.bb: Variable key FLASHLAYOUT_PARTITION_ENABLE:${STM32MP_SSBL1_PROGRAMMER_NAME} (-)
replaces original key FLASHLAYOUT_PARTITION_ENABLE: (${@bb.utils.contains('MACHINE_FEATURES', 'fw-update', 'PD', 'PED', d)})

what happens when STM32MP_METADATA_NAME is empty, the following
FLASHLAYOUT_PARTITION_ENABLE:${STM32MP_METADATA_NAME} will be just:
FLASHLAYOUT_PARTITION_ENABLE:

which triggers these errors saying that other variants replaces it with other content.

This commit sets the default metadata variable and introduces a new variable
to simply tell if it needs to be enabled in the flashlayout or not based on:
ENABLE_FLASHLAYOUT_CONFIG_FWUP.

This also fixes another line:
ENABLE_FLASHLAYOUT_CONFIG_FWUP ?= "${@bb.utils.contains('MACHINE_FEATURES', 'fw-update', '1', '0', d)}"
which was commented and "1" is forced.

Signed-off-by: Talel BELHAJSALEM <[email protected]>
@BernardPuel
Copy link
Contributor

Many thanks for your contribution !
Your patch will be intergated in ST internal releases and push to github branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants