common: update: fix an "unused" warning against update_flash()
PATCH v2 1/1 common: update: fix an "unused" warning against update_flash()
Since update_flash() is used only in update_tftp(), it should be guarded with appropriate config options.
After the commit 3149e524fc1e, common/update.c will be built under either CONFIG_UDATE_TFTP, CONFIG_DFU_TFTP or CONFIG_UPDATE_FIT. Since CONFIG_UPDATE_FIT, hence fit_update(), doesn't rely on update_flash(), the compiler may cause an "unused" warning if CONFIG_UPDATE_FIT=y and CONFIG_UPDATE_TFTP=n and CONFIG_DFU_TFTP=n.
This is, for example, the case for sandbox defconfig where EFI_CAPSULE_FIRMWARE_FIT is enabled for test purpose.
image")
---
Change in v2
* modify the commit message
--- common/update.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
common/update.c +4 -4
@@ -29,7 +29,7 @@#include <errno.h> #include <mtd/cfi_flash.h> -#ifdef CONFIG_DFU_TFTP +#if defined(CONFIG_DFU_TFTP ) || defined(CONFIG_UPDATE_TFTP )/* env variable holding the location of the update file */ #define UPDATE_FILE_ENV "updatefile"
@@ -99,7 +99,6 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr)return rv; } -#endif /* CONFIG_DFU_TFTP */ #ifdef CONFIG_MTD_NOR_FLASH static int update_flash_protect (int prot,ulong addr_first,ulong addr_last)
@@ -216,6 +215,7 @@ static int update_flash(ulong addr_source, ulong addr_first, ulong size)#endif return 0; } +#endif /* CONFIG_DFU_TFTP || CONFIG_UPDATE_TFTP */ static int update_fit_getparams (const void *fit,int noffset,ulong *addr,ulong *fladdr,ulong *size)
@@ -233,7 +233,7 @@ static int update_fit_getparams(const void *fit, int noffset, ulong *addr,return 0 ; } -#ifdef CONFIG_DFU_TFTP +#if defined(CONFIG_DFU_TFTP ) || defined(CONFIG_UPDATE_TFTP )int update_tftp (ulong addr,char *interface,char *devstring) {char *filename, *env_addr, *fit_image_name;
@@ -340,7 +340,7 @@ next_node: return ret; } -#endif /* CONFIG_DFU_UPDATE */ +#endif /* CONFIG_DFU_UPDATE || CONFIG_UPDATE_TFTP */ #ifdef CONFIG_UPDATE_FIT /**
Signature · 1 line
2.28.0
PATCH v2 1/1 common: update: fix an "unused" warning against update_flash()
Quoted 9 lines · AKASHI Takahiro
Since
update_flash()is used only inupdate_tftp(), it should be guarded with appropriate config options.After the commit
3149e524fc1e,common/update.cwill be built under eitherCONFIG_UDATE_TFTP,CONFIG_DFU_TFTPorCONFIG_UPDATE_FIT. SinceCONFIG_UPDATE_FIT, hencefit_update(), doesn't rely onupdate_flash(), the compiler may cause an "unused" warning ifCONFIG_UPDATE_FIT=yandCONFIG_UPDATE_TFTP=nandCONFIG_DFU_TFTP=n.
Quoted 6 lines
This is, for example, the case for sandbox defconfig where
EFI_CAPSULE_FIRMWARE_FITis enabled for test purpose.Fixes 3149e524fc1e ("common: update: add a generic interface for FITimage")Signed-off-by AKASHI Takahiro <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201203/8a90c42e/attachment.sig>
PATCH v2 1/1 common: update: fix an "unused" warning against update_flash()
Quoted 11 lines · Tom Rini
Quoted 9 lines · AKASHI Takahiro
Since
update_flash()is used only inupdate_tftp(), it should be guarded with appropriate config options.After the commit
3149e524fc1e,common/update.cwill be built under eitherCONFIG_UDATE_TFTP,CONFIG_DFU_TFTPorCONFIG_UPDATE_FIT. SinceCONFIG_UPDATE_FIT, hencefit_update(), doesn't rely onupdate_flash(), the compiler may cause an "unused" warning ifCONFIG_UPDATE_FIT=yandCONFIG_UPDATE_TFTP=nandCONFIG_DFU_TFTP=n.
Quoted 9 lines
Quoted 6 lines
This is, for example, the case for sandbox defconfig where
EFI_CAPSULE_FIRMWARE_FITis enabled for test purpose.Fixes 3149e524fc1e ("common: update: add a generic interface for FITimage")Signed-off-by AKASHI Takahiro <[email protected]>Applied to u-boot/master, thanks!
Hello Takahiro,
sorry I missed this patch when trying to get your v10 version for capsule updates compiled. I will retest.
Best regards
Heinrich