common: update_tftp: remove unnecessary build check
PATCH 1/1 common: update_tftp: remove unnecessary build check
Logically, the current update_tftp() should and does compile and work correctly even without satisfying the following condition:
Quoted 4 lines
#if
defined(CONFIG_UPDATE_TFTP)&& !defined(CONFIG_MTD_NOR_FLASH) #error "CONFIG_UPDATE_TFTPand !CONFIG_MTD_NOR_FLASH needed for
legacy behaviour"
#endif
It would be better to just drop it so that this function will be used on wider range of platforms.
--- common/update.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
common/update.c +2 -5
@@ -14,10 +14,6 @@#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"#endif -#if defined(CONFIG_UPDATE_TFTP ) && !defined(CONFIG_MTD_NOR_FLASH ) -#error "CONFIG_UPDATE_TFTP and !CONFIG_MTD_NOR_FLASH needed for legacy behaviour" -#endif -#include <command.h> #include <env.h> #include <flash.h>
@@ -210,8 +206,9 @@ static int update_flash(ulong addr_source, ulong addr_first, ulong size)printf ("Error: could not protect flash sectors\n" );return 1 ; } +#else +return -1 ;#endif -return 0 ; } static int update_fit_getparams(const void *fit, int noffset, ulong *addr,
Signature · 1 line
2.24.0
PATCH 1/1 common: update_tftp: remove unnecessary build check
Quoted 10 lines · AKASHI Takahiro
Logically, the current
update_tftp()should and does compile and work correctly even without satisfying the following condition:Quoted 4 lines
#if
defined(CONFIG_UPDATE_TFTP)&& !defined(CONFIG_MTD_NOR_FLASH) #error "CONFIG_UPDATE_TFTPand !CONFIG_MTD_NOR_FLASH needed for
legacy behaviour"
#endifIt would be better to just drop it so that this function will be used on wider range of platforms.
Function update_tftp() calls update_flash(). update_flash() does nothing if CONFIG_MTD_NOR_FLASH=n.
Please, describe which configuration would be additionally usable if your patch is applied.
Best regards
Heinrich
Quoted 33 lines
Signed-off-by AKASHI Takahiro <[email protected]>--- common/update.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)common/update.c +2
-5@@ -14,10 +14,6 @@#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"#endif -#if defined(CONFIG_UPDATE_TFTP ) && !defined(CONFIG_MTD_NOR_FLASH ) -#error "CONFIG_UPDATE_TFTP and !CONFIG_MTD_NOR_FLASH needed for legacy behaviour" -#endif -#include <command.h> #include <env.h> #include <flash.h> @@ -210,8 +206,9 @@ static int update_flash(ulong addr_source, ulong addr_first, ulong size)printf ("Error: could not protect flash sectors\n" );return 1 ; } +#else +return -1 ;#endif -return 0 ; } static int update_fit_getparams(const void *fit, int noffset, ulong *addr,
PATCH 1/1 common: update_tftp: remove unnecessary build check
Quoted 9 lines · Heinrich Schuchardt
Quoted 8 lines · AKASHI Takahiro
Logically, the current
update_tftp()should and does compile and work correctly even without satisfying the following condition:Quoted 4 lines
#if
defined(CONFIG_UPDATE_TFTP)&& !defined(CONFIG_MTD_NOR_FLASH) #error "CONFIG_UPDATE_TFTPand !CONFIG_MTD_NOR_FLASH needed for
legacy behaviour"
#endif
Quoted 8 lines
Quoted 2 lines
It would be better to just drop it so that this function will be used on wider range of platforms.
Function
update_tftp()callsupdate_flash().update_flash()does nothing ifCONFIG_MTD_NOR_FLASH=n.Please, describe which configuration would be additionally usable if your patch is applied.
update_tftp() takes additional two parameters, interface and devstring, since the commit c7ff5528439a ("update: tftp: dfu: Extend update_tftp() function to support DFU").CONFIG_DFU and COFIG_DFU_XXX, without MTD_NOR_FLASH, does work.
Thanks,
-Takahiro Akashi
Quoted 38 lines
Best regards
Heinrich
Quoted 33 lines
Signed-off-by AKASHI Takahiro <[email protected]>--- common/update.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)common/update.c +2
-5@@ -14,10 +14,6 @@#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"#endif -#if defined(CONFIG_UPDATE_TFTP ) && !defined(CONFIG_MTD_NOR_FLASH ) -#error "CONFIG_UPDATE_TFTP and !CONFIG_MTD_NOR_FLASH needed for legacy behaviour" -#endif -#include <command.h> #include <env.h> #include <flash.h> @@ -210,8 +206,9 @@ static int update_flash(ulong addr_source, ulong addr_first, ulong size)printf ("Error: could not protect flash sectors\n" );return 1 ; } +#else +return -1 ;#endif -return 0 ; } static int update_fit_getparams(const void *fit, int noffset, ulong *addr,
PATCH 1/1 common: update_tftp: remove unnecessary build check
Quoted 16 lines · AKASHI Takahiro
Quoted 15 lines · Heinrich Schuchardt
Quoted 10 lines · AKASHI Takahiro
Logically, the current
update_tftp()should and does compile and work correctly even without satisfying the following condition:Quoted 4 lines
#if
defined(CONFIG_UPDATE_TFTP)&& !defined(CONFIG_MTD_NOR_FLASH) #error "CONFIG_UPDATE_TFTPand !CONFIG_MTD_NOR_FLASH needed for
legacy behaviour"
#endifIt would be better to just drop it so that this function will be used on wider range of platforms.
Function
update_tftp()callsupdate_flash().update_flash()does nothing ifCONFIG_MTD_NOR_FLASH=n.
Quoted 7 lines
Quoted 2 lines
Please, describe which configuration would be additionally usable if your patch is applied.
update_tftp()takes additional two parameters, interface and devstring, since the commitc7ff5528439a("update: tftp: dfu: Extendupdate_tftp()function to support DFU").CONFIG_DFUandCOFIG_DFU_XXX, withoutMTD_NOR_FLASH, does work.
But would you use CONFIG_UPDATE_TFTP in conjunction with CONFIG_DFU*?
common/Kconfig describes UPDATE_TFTP as: "This option allows performing update of NOR with data in fitImage sent via TFTP boot."
doc/README.dfutftp says:
"* Update TFTP (CONFIG_UPDATE_TFTP) only supports writing code to NAND memory via TFTP.
* DFU supports writing data to the variety of mediums (NAND, eMMC, SD, partitions, RAM, etc) via USB."
I assume README.dfutftp saying "NAND" and not "NOR" is a documentation error.
So why do you specifically need to allowCONFIG_UPDATE_TFTP=y && CONFIG_MTD_NOR_FLASH=n ?
Best regards
Heinrich
Quoted 43 lines
Thanks,
-Takahiro AkashiQuoted 38 lines
Best regards
Heinrich
Quoted 33 lines
Signed-off-by AKASHI Takahiro <[email protected]>--- common/update.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)common/update.c +2
-5@@ -14,10 +14,6 @@#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"#endif -#if defined(CONFIG_UPDATE_TFTP ) && !defined(CONFIG_MTD_NOR_FLASH ) -#error "CONFIG_UPDATE_TFTP and !CONFIG_MTD_NOR_FLASH needed for legacy behaviour" -#endif -#include <command.h> #include <env.h> #include <flash.h> @@ -210,8 +206,9 @@ static int update_flash(ulong addr_source, ulong addr_first, ulong size)printf ("Error: could not protect flash sectors\n" );return 1 ; } +#else +return -1 ;#endif -return 0 ; } static int update_fit_getparams(const void *fit, int noffset, ulong *addr,
PATCH 1/1 common: update_tftp: remove unnecessary build check
Quoted 20 lines · Heinrich Schuchardt
Quoted 19 lines · AKASHI Takahiro
Quoted 17 lines · Heinrich Schuchardt
Quoted 10 lines · AKASHI Takahiro
Logically, the current
update_tftp()should and does compile and work correctly even without satisfying the following condition:Quoted 4 lines
#if
defined(CONFIG_UPDATE_TFTP)&& !defined(CONFIG_MTD_NOR_FLASH) #error "CONFIG_UPDATE_TFTPand !CONFIG_MTD_NOR_FLASH needed for
legacy behaviour"
#endifIt would be better to just drop it so that this function will be used on wider range of platforms.
Function
update_tftp()callsupdate_flash().update_flash()does nothing ifCONFIG_MTD_NOR_FLASH=n.Please, describe which configuration would be additionally usable if your patch is applied.
Quoted 6 lines
Quoted 4 lines
update_tftp()takes additional two parameters, interface and devstring, since the commitc7ff5528439a("update: tftp: dfu: Extendupdate_tftp()function to support DFU").CONFIG_DFUandCOFIG_DFU_XXX, withoutMTD_NOR_FLASH, does work.But would you use
CONFIG_UPDATE_TFTPin conjunction with CONFIG_DFU*?
common/update.c is only compiled under CONFIG_UPDATE_TFTP. So without CNFIG_DFU*, the commit c7ff5528439a doens't make any sense.
Quoted 11 lines
common/Kconfig describes
UPDATE_TFTPas: "This option allows performing update of NOR with data in fitImage sent via TFTP boot."doc/README.dfutftp says:
"* Update TFTP (CONFIG_UPDATE_TFTP) only supports writing code to NAND memory via TFTP.
* DFU supports writing data to the variety of mediums (NAND, eMMC, SD, partitions, RAM, etc) via USB."I assume README.dfutftp saying "NAND" and not "NOR" is a documentation error.
I believe that the document should be overhauled.
Quoted 2 lines
So why do you specifically need to allow
CONFIG_UPDATE_TFTP=y&&CONFIG_MTD_NOR_FLASH=n?
Do you remember that I'm now working on capsule update? That is why I included you in Cc.
Anyhow, Lukasz should have a comment here.
Thanks,
-Takahiro Akashi
Quoted 48 lines
Best regards
Heinrich
Quoted 43 lines
Thanks,
-Takahiro AkashiQuoted 38 lines
Best regards
Heinrich
Quoted 33 lines
Signed-off-by AKASHI Takahiro <[email protected]>--- common/update.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)common/update.c +2
-5@@ -14,10 +14,6 @@#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"#endif -#if defined(CONFIG_UPDATE_TFTP ) && !defined(CONFIG_MTD_NOR_FLASH ) -#error "CONFIG_UPDATE_TFTP and !CONFIG_MTD_NOR_FLASH needed for legacy behaviour" -#endif -#include <command.h> #include <env.h> #include <flash.h> @@ -210,8 +206,9 @@ static int update_flash(ulong addr_source, ulong addr_first, ulong size)printf ("Error: could not protect flash sectors\n" );return 1 ; } +#else +return -1 ;#endif -return 0 ; } static int update_fit_getparams(const void *fit, int noffset, ulong *addr,
PATCH 1/1 common: update_tftp: remove unnecessary build check
In reply to AKASHI TakahiroQuoted 8 lines · AKASHI Takahiro
Logically, the current
update_tftp()should and does compile and work correctly even without satisfying the following condition:Quoted 4 lines
#if
defined(CONFIG_UPDATE_TFTP)&& !defined(CONFIG_MTD_NOR_FLASH) #error "CONFIG_UPDATE_TFTPand !CONFIG_MTD_NOR_FLASH needed for
legacy behaviour"
#endif
Quoted 4 lines
It would be better to just drop it so that this function will be used on wider range of platforms.
Signed-off-by AKASHI Takahiro <[email protected]>
In common/main.c:37:void main_loop(void) we have a call:
??????? if (IS_ENABLED(CONFIG_UPDATE_TFTP))
????????????????update_tftp(0UL, NULL, NULL);
When you implement UEFI capsule updates you probably are not interested in this call.
So I would suggest that you take the code after the label got_update_file and put it into a new function in a new file drivers/dfu/dfu_fit.c which is only compiled if both CONFIG_DFU and CONFIG_FIT are specified.
This way we get a clean separation between tFTP updates and capsule updates.
---
We should get rid of any config checks in code. Those checks should be in Kconfig. This should also cover the CONFIG_FIT && CONFIG_OF_LIBFDT test.
@Takahiro:
Why do you want to allow CONFIG_UPDATE_TFTP=y and CONFIG_MTD_NOR_FLASH=y? In your capsule update series you use DFU. DFU_MTD depends on DFU and DM_MTD. So the flash driver called from DFU is not in common/flash.c but somewhere in drivers/mtd.
Best regards
Heinrich
Quoted 31 lines
--- common/update.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)common/update.c +2
-5@@ -14,10 +14,6 @@#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"#endif -#if defined(CONFIG_UPDATE_TFTP ) && !defined(CONFIG_MTD_NOR_FLASH ) -#error "CONFIG_UPDATE_TFTP and !CONFIG_MTD_NOR_FLASH needed for legacy behaviour" -#endif -#include <command.h> #include <env.h> #include <flash.h> @@ -210,8 +206,9 @@ static int update_flash(ulong addr_source, ulong addr_first, ulong size)printf ("Error: could not protect flash sectors\n" );return 1 ; } +#else +return -1 ;#endif -return 0 ; } static int update_fit_getparams(const void *fit, int noffset, ulong *addr,