Prepare v2020.01

[oweals/u-boot.git] / env / ubi.c

diff --git a/env/ubi.c b/env/ubi.c
index 1dfdf0a8c8a41f768d07023d430d0eafe90acc63..08aac47df2b6a7c5e7c04f1d9232f6db62e43bac 100644 (file)
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -7,7 +7,8 @@
 #include <common.h>
 
 #include <command.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
 #include <errno.h>
 #include <malloc.h>
 #include <memalign.h>
@@ -15,6 +16,15 @@
 #include <ubi_uboot.h>
 #undef crc32
 
+#define _QUOTE(x) #x
+#define QUOTE(x) _QUOTE(x)
+
+#if (CONFIG_ENV_UBI_VID_OFFSET == 0)
+ #define UBI_VID_OFFSET NULL
+#else
+ #define UBI_VID_OFFSET QUOTE(CONFIG_ENV_UBI_VID_OFFSET)
+#endif
+
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_CMD_SAVEENV
@@ -28,7 +38,7 @@ static int env_ubi_save(void)
        if (ret)
                return ret;
 
-       if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) {
+       if (ubi_part(CONFIG_ENV_UBI_PART, UBI_VID_OFFSET)) {
                printf("\n** Cannot find mtd partition \"%s\"\n",
                       CONFIG_ENV_UBI_PART);
                return 1;
@@ -70,7 +80,7 @@ static int env_ubi_save(void)
        if (ret)
                return ret;
 
-       if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) {
+       if (ubi_part(CONFIG_ENV_UBI_PART, UBI_VID_OFFSET)) {
                printf("\n** Cannot find mtd partition \"%s\"\n",
                       CONFIG_ENV_UBI_PART);
                return 1;
@@ -111,10 +121,10 @@ static int env_ubi_load(void)
        tmp_env1 = (env_t *)env1_buf;
        tmp_env2 = (env_t *)env2_buf;
 
-       if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) {
+       if (ubi_part(CONFIG_ENV_UBI_PART, UBI_VID_OFFSET)) {
                printf("\n** Cannot find mtd partition \"%s\"\n",
                       CONFIG_ENV_UBI_PART);
-               set_default_env(NULL, 0);
+               env_set_default(NULL, 0);
                return -EIO;
        }
 
@@ -148,17 +158,17 @@ static int env_ubi_load(void)
         */
        memset(buf, 0x0, CONFIG_ENV_SIZE);
 
-       if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) {
+       if (ubi_part(CONFIG_ENV_UBI_PART, UBI_VID_OFFSET)) {
                printf("\n** Cannot find mtd partition \"%s\"\n",
                       CONFIG_ENV_UBI_PART);
-               set_default_env(NULL, 0);
+               env_set_default(NULL, 0);
                return -EIO;
        }
 
        if (ubi_volume_read(CONFIG_ENV_UBI_VOLUME, buf, CONFIG_ENV_SIZE)) {
                printf("\n** Unable to read env from %s:%s **\n",
                       CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME);
-               set_default_env(NULL, 0);
+               env_set_default(NULL, 0);
                return -EIO;
        }