From fd6d797eaea2b790365900b12786db1b25dd076d Mon Sep 17 00:00:00 2001 From: David Escalona Date: Thu, 10 Aug 2023 17:06:18 +0200 Subject: [PATCH] meta-digi-dey: swu-images: enable upgrade available feature only for CCIMX6 The CCIMX6 platform is the only one that will keep using the 'bootcount' value stored in the environment. For this reason, that is the only platform requiring the 'upgrade_available' flag to be set after a firmware update. For the rest of the platforms, remove it. https://onedigi.atlassian.net/browse/DEL-8506 Signed-off-by: David Escalona --- .../files/ccimx6ul/sw-description-images_template | 8 -------- .../swu-images/files/sw-description-images_template | 4 ++-- .../swu-images/files/sw-description-rdiff_template | 4 ++-- meta-digi-dey/recipes-digi/swu-images/swu.inc | 4 ++++ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description-images_template b/meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description-images_template index 0cc414a85..d617686f8 100644 --- a/meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description-images_template +++ b/meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description-images_template @@ -15,10 +15,6 @@ software = } ); uboot: ( - { - name = "upgrade_available"; - value = "1"; - }, { name = "rootfstype" value = "@@SWUPDATE_ROOTFS_TYPE@@" @@ -36,10 +32,6 @@ software = } ); uboot: ( - { - name = "upgrade_available"; - value = "1"; - }, { name = "rootfstype" value = "@@SWUPDATE_ROOTFS_TYPE@@" diff --git a/meta-digi-dey/recipes-digi/swu-images/files/sw-description-images_template b/meta-digi-dey/recipes-digi/swu-images/files/sw-description-images_template index 577cd71d4..dd0559912 100644 --- a/meta-digi-dey/recipes-digi/swu-images/files/sw-description-images_template +++ b/meta-digi-dey/recipes-digi/swu-images/files/sw-description-images_template @@ -18,7 +18,7 @@ software = uboot: ( { name = "upgrade_available"; - value = "1"; + value = "@@UPGRADE_AVAILABLE@@"; } ); } @@ -36,7 +36,7 @@ software = uboot: ( { name = "upgrade_available"; - value = "1"; + value = "@@UPGRADE_AVAILABLE@@"; } ); } diff --git a/meta-digi-dey/recipes-digi/swu-images/files/sw-description-rdiff_template b/meta-digi-dey/recipes-digi/swu-images/files/sw-description-rdiff_template index ad06f926d..797095ed8 100644 --- a/meta-digi-dey/recipes-digi/swu-images/files/sw-description-rdiff_template +++ b/meta-digi-dey/recipes-digi/swu-images/files/sw-description-rdiff_template @@ -19,7 +19,7 @@ software = uboot: ( { name = "upgrade_available"; - value = "1"; + value = "@@UPGRADE_AVAILABLE@@"; } ); } @@ -38,7 +38,7 @@ software = uboot: ( { name = "upgrade_available"; - value = "1"; + value = "@@UPGRADE_AVAILABLE@@"; } ); } diff --git a/meta-digi-dey/recipes-digi/swu-images/swu.inc b/meta-digi-dey/recipes-digi/swu-images/swu.inc index 94199300f..6d6933350 100644 --- a/meta-digi-dey/recipes-digi/swu-images/swu.inc +++ b/meta-digi-dey/recipes-digi/swu-images/swu.inc @@ -67,6 +67,10 @@ python do_swuimage:prepend() { shutil.copyfile(updatescript, os.path.join(imgdeploydir, os.path.basename(updatescript))) } +# Upgrade available. +UPGRADE_AVAILABLE = "" +UPGRADE_AVAILABLE:ccimx6 = "1" + # Create and fill 'sw-description' file. fill_description() { if [ "${SWUPDATE_UBOOTIMG}" = "true" ]; then