From ec9d426f51cbc8afe9160b356ef39f2c23b32963 Mon Sep 17 00:00:00 2001 From: armink Date: Thu, 28 Jul 2016 12:05:45 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E5=87=A0=E5=A4=84=E5=85=BC=E5=AE=B9=E6=80=A7=E4=B8=8D=E5=A5=BD?= =?UTF-8?q?=E7=9A=84=E6=96=AD=E8=A8=80=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: armink --- easyflash/inc/easyflash.h | 2 +- easyflash/src/ef_env.c | 4 ---- easyflash/src/ef_env_wl.c | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/easyflash/inc/easyflash.h b/easyflash/inc/easyflash.h index bf2268e..b1cafec 100644 --- a/easyflash/inc/easyflash.h +++ b/easyflash/inc/easyflash.h @@ -67,7 +67,7 @@ if (!(EXPR)) \ while (1); \ } /* EasyFlash software version number */ -#define EF_SW_VERSION "1.12.16" +#define EF_SW_VERSION "2.07.28" typedef struct _ef_env{ char *key; diff --git a/easyflash/src/ef_env.c b/easyflash/src/ef_env.c index 02678c5..568ad3d 100644 --- a/easyflash/src/ef_env.c +++ b/easyflash/src/ef_env.c @@ -188,10 +188,8 @@ EfErrCode ef_env_set_default(void){ */ static uint32_t get_env_system_addr(void) { #ifndef EF_ENV_USING_PFS_MODE - EF_ASSERT(env_start_addr); return env_start_addr; #else - EF_ASSERT(cur_load_area_addr); return cur_load_area_addr; #endif } @@ -307,8 +305,6 @@ static char *find_env(const char *key) { char *env_start, *env_end, *env, *found_env = NULL; size_t key_len = strlen(key), env_len; - EF_ASSERT(env_start_addr); - if (*key == NULL) { EF_INFO("Flash ENV name must be not empty!\n"); return NULL; diff --git a/easyflash/src/ef_env_wl.c b/easyflash/src/ef_env_wl.c index eb51800..c4821e4 100644 --- a/easyflash/src/ef_env_wl.c +++ b/easyflash/src/ef_env_wl.c @@ -192,7 +192,6 @@ EfErrCode ef_env_set_default(void){ * @return ENV start address in flash */ static uint32_t get_env_start_addr(void) { - EF_ASSERT(env_start_addr); return env_start_addr; } /**