On 5/5/21 6:43 PM, Jan Kiszka wrote:

On 05.05.21 10:21, Q. Gylstorff wrote:

From: Quirin Gylstorff <quirin.gylstorff@...>

This patch removes the variable U_BOOT from the swupdate-config.bbclass.
It also adds the suffix `SWUPDATE` to the variable BOOTLOADER.

If a custom u-boot is used in concunction with swupdate it is
recommened to set `U_BOOT_CONFIG_PACKAGE` to '1'. This now adds
a dependency from SWupdate to u-boot-{MACHINE}-config for installing
fw_env.config.

Changes in V2:
- fix typo in commit message
- use variable in kas/opt/*.yml

Changes in V3:
- remove variable U_BOOT
- split into 2 commits

Changes in V4:
- Add missing Changes log
- Correct commit message

Quirin Gylstorff (2):
swupdate-config: remove variable U_BOOT
swupdate-config: add prefix to variable BOOTLOADER

classes/swupdate-config.bbclass | 17 ++++++++++-------
kas/opt/ebg-secure-boot-snakeoil.yml | 2 +-
kas/opt/ebg-swu.yml | 4 ++--
kas/opt/qemu-swupdate.yml | 2 +-
4 files changed, 14 insertions(+), 11 deletions(-)

Thanks, applied to next.
We may eventually also want to do a renaming of qemu-swupdate.yml to
qemu-amd64-swupdate.yml - just for the case that there will also be ARM
qemu target to demonstrate/test swupdate.

Alternative would be to change
`
-WKS_FILE = "qemu-amd64-${SWUPDATE_BOOTLOADER}.wks"
+WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
`
Quirin

Jan