MLK-18141-1 env: sata: Fix build warning and break

Fix below build warning and errors:
env/sata.c: In function ‘env_sata_save’:
env/sata.c:59:9: warning: implicit declaration of function ‘sata_get_dev’ [-Wimplicit-function-declaration]
  sata = sata_get_dev(env_sata);
         ^~~~~~~~~~~~
env/sata.c:59:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
  sata = sata_get_dev(env_sata);
       ^
env/sata.c: In function ‘env_sata_load’:
env/sata.c:101:10: warning: ‘return’ with a value, in function returning void
   return -EIO;
          ^
env/sata.c:94:13: note: declared here
 static void env_sata_load(void)
             ^~~~~~~~~~~~~
env/sata.c:105:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
  sata = sata_get_dev(env_sata);
       ^
env/sata.c:108:10: warning: ‘return’ with a value, in function returning void
   return -EIO;
          ^
env/sata.c:94:13: note: declared here
 static void env_sata_load(void)
             ^~~~~~~~~~~~~
env/sata.c:113:10: warning: ‘return’ with a value, in function returning void
   return -EIO;
          ^
env/sata.c:94:13: note: declared here
 static void env_sata_load(void)
             ^~~~~~~~~~~~~
env/sata.c:116:9: warning: ‘return’ with a value, in function returning void
  return env_import(buf, 1);
         ^~~~~~~~~~~~~~~~~~
env/sata.c:94:13: note: declared here
 static void env_sata_load(void)
             ^~~~~~~~~~~~~
env/sata.c: At top level:
env/sata.c:120:14: error: ‘ENVL_ESATA’ undeclared here (not in a function)
  .location = ENVL_ESATA,
              ^~~~~~~~~~
env/sata.c:122:11: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types]
  .load  = env_sata_load,

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit ffdc4c02e0a3eb18c7fddf307887265aa97699a6)
(cherry picked from commit 25cb0daa9128f15e0da7efeea2bfc436e610648c)

diff --git a/env/sata.c b/env/sata.c
index 9442cfc..9156142 100644 (file)
--- a/env/sata.c
+++ b/env/sata.c
@@ -89,7 +89,7 @@ static inline int read_env(struct blk_desc *sata, unsigned long size,
        return (n == blk_cnt) ? 0 : -1;
 }
 
-static void env_sata_load(void)
+static int env_sata_load(void)
 {
        ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
        struct blk_desc *sata = NULL;

diff --git a/include/env_internal.h b/include/env_internal.h
index 708c833..9f92207 100644 (file)
--- a/include/env_internal.h
+++ b/include/env_internal.h
@@ -127,6 +127,7 @@ extern const unsigned char default_environment[];
 enum env_location {
        ENVL_UNKNOWN,
        ENVL_EEPROM,
+       ENVL_ESATA,
        ENVL_EXT4,
        ENVL_FAT,
        ENVL_FLASH,

diff --git a/include/part.h b/include/part.h
index 7f78271..6a88758 100644 (file)
--- a/include/part.h
+++ b/include/part.h
@@ -103,6 +103,7 @@ struct disk_part {
 struct blk_desc *blk_get_dev(const char *ifname, int dev);
 
 struct blk_desc *mg_disk_get_dev(int dev);
+struct blk_desc *sata_get_dev(int dev);
 int host_get_dev_err(int dev, struct blk_desc **blk_devp);
 
 /* disk/part.c */
@@ -257,6 +258,7 @@ extern const struct block_drvr block_drvr[];
 static inline struct blk_desc *blk_get_dev(const char *ifname, int dev)
 { return NULL; }
 static inline struct blk_desc *mg_disk_get_dev(int dev) { return NULL; }
+static inline struct blk_desc *sata_get_dev(int dev) { return NULL; }
 
 static inline int part_get_info(struct blk_desc *dev_desc, int part,
                                struct disk_partition *info) { return -1; }