Merge patch series "Add Android 14 bootflow support for AM62X and AM62P board"

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

diff --git a/env/ubi.c b/env/ubi.c
index 445d34fedb893e9b447cb5c23b01567e599ee827..2f4ca571edb544a9989def8fd9863b41ef0e2da6 100644 (file)
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -4,7 +4,6 @@
  *        Joe Hershberger <[email protected]>
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 
 #include <command.h>
@@ -54,7 +53,7 @@ static int env_ubi_save(void)
        if (gd->env_valid == ENV_VALID) {
                puts("Writing to redundant UBI... ");
                if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME_REDUND,
-                                    (void *)env_new, CONFIG_ENV_SIZE)) {
+                                    (void *)env_new, 0, CONFIG_ENV_SIZE)) {
                        printf("\n** Unable to write env to %s:%s **\n",
                               CONFIG_ENV_UBI_PART,
                               CONFIG_ENV_UBI_VOLUME_REDUND);
@@ -63,7 +62,7 @@ static int env_ubi_save(void)
        } else {
                puts("Writing to UBI... ");
                if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME,
-                                    (void *)env_new, CONFIG_ENV_SIZE)) {
+                                    (void *)env_new, 0, CONFIG_ENV_SIZE)) {
                        printf("\n** Unable to write env to %s:%s **\n",
                               CONFIG_ENV_UBI_PART,
                               CONFIG_ENV_UBI_VOLUME);
@@ -93,7 +92,7 @@ static int env_ubi_save(void)
                return 1;
        }
 
-       if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME, (void *)env_new,
+       if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME, (void *)env_new, 0,
                             CONFIG_ENV_SIZE)) {
                printf("\n** Unable to write env to %s:%s **\n",
                       CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME);
@@ -135,14 +134,14 @@ static int env_ubi_load(void)
                return -EIO;
        }
 
-       read1_fail = ubi_volume_read(CONFIG_ENV_UBI_VOLUME, (void *)tmp_env1,
+       read1_fail = ubi_volume_read(CONFIG_ENV_UBI_VOLUME, (void *)tmp_env1, 0,
                                     CONFIG_ENV_SIZE);
        if (read1_fail)
                printf("\n** Unable to read env from %s:%s **\n",
                       CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME);
 
        read2_fail = ubi_volume_read(CONFIG_ENV_UBI_VOLUME_REDUND,
-                                    (void *)tmp_env2, CONFIG_ENV_SIZE);
+                                    (void *)tmp_env2, 0, CONFIG_ENV_SIZE);
        if (read2_fail)
                printf("\n** Unable to read redundant env from %s:%s **\n",
                       CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME_REDUND);
@@ -172,7 +171,7 @@ static int env_ubi_load(void)
                return -EIO;
        }
 
-       if (ubi_volume_read(CONFIG_ENV_UBI_VOLUME, buf, CONFIG_ENV_SIZE)) {
+       if (ubi_volume_read(CONFIG_ENV_UBI_VOLUME, buf, 0, CONFIG_ENV_SIZE)) {
                printf("\n** Unable to read env from %s:%s **\n",
                       CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME);
                env_set_default(NULL, 0);
@@ -197,7 +196,7 @@ static int env_ubi_erase(void)
        memset(env_buf, 0x0, CONFIG_ENV_SIZE);
 
        if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME,
-                            (void *)env_buf, CONFIG_ENV_SIZE)) {
+                            (void *)env_buf, 0, CONFIG_ENV_SIZE)) {
                printf("\n** Unable to erase env to %s:%s **\n",
                       CONFIG_ENV_UBI_PART,
                       CONFIG_ENV_UBI_VOLUME);
@@ -205,7 +204,7 @@ static int env_ubi_erase(void)
        }
        if (IS_ENABLED(CONFIG_SYS_REDUNDAND_ENVIRONMENT)) {
                if (ubi_volume_write(ENV_UBI_VOLUME_REDUND,
-                                    (void *)env_buf, CONFIG_ENV_SIZE)) {
+                                    (void *)env_buf, 0, CONFIG_ENV_SIZE)) {
                        printf("\n** Unable to erase env to %s:%s **\n",
                               CONFIG_ENV_UBI_PART,
                               ENV_UBI_VOLUME_REDUND);