diff options
author | Tom Rini <trini@konsulko.com> | 2023-01-10 11:19:36 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-01-20 12:27:06 -0500 |
commit | 2d1e2e5717669d91f527866465da81e0f9e65c32 (patch) | |
tree | 8f7c777e413f5b9284345ea5756d323d67043501 /common/update.c | |
parent | 6e73ab32d826d4baca78872dbbaabcf511728bed (diff) |
common/update: Finish Kconfig migration
We can enforce the dependencies of this module via Kconfig now, so do so
rather than with #error statements. Further, we can ensure that all
required values are set to their defaults in Kconfig, and in fact
already do so, so remove the tests here. The exception is
CONFIG_UPDATE_LOAD_ADDR which needed to be migrated to Kconfig in the
first place.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/update.c')
-rw-r--r-- | common/update.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/common/update.c b/common/update.c index 80f16af653..3502713d7d 100644 --- a/common/update.c +++ b/common/update.c @@ -10,14 +10,6 @@ #include <cpu_func.h> #include <image.h> -#if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT)) -#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 <net.h> @@ -31,19 +23,6 @@ /* env variable holding the location of the update file */ #define UPDATE_FILE_ENV "updatefile" -/* set configuration defaults if needed */ -#ifndef CONFIG_UPDATE_LOAD_ADDR -#define CONFIG_UPDATE_LOAD_ADDR 0x100000 -#endif - -#ifndef CONFIG_UPDATE_TFTP_MSEC_MAX -#define CONFIG_UPDATE_TFTP_MSEC_MAX 100 -#endif - -#ifndef CONFIG_UPDATE_TFTP_CNT_MAX -#define CONFIG_UPDATE_TFTP_CNT_MAX 0 -#endif - extern ulong tftp_timeout_ms; extern int tftp_timeout_count_max; #ifdef CONFIG_MTD_NOR_FLASH |