cmd: crosec: Move cros_ec_decode_region helper to cmd/cros_ec.c

The cros_ec_decode_region() function is only used in combination
with the crosec cmds. Move the function to the correct place.

Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: u-boot@lists.denx.de
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index abf11f07b277b16d0cd654e1fb0b7f77aeb13221..9d42f870dc9a4e3ea61a7d267591a73a38b3135b 100644 (file)
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -19,6 +19,29 @@ static const char * const ec_current_image_name[] = {"unknown", "RO", "RW"};
 
 DECLARE_GLOBAL_DATA_PTR;
 
+/**
+ * Decode a flash region parameter
+ *
+ * @param argc Number of params remaining
+ * @param argv List of remaining parameters
+ * @return flash region (EC_FLASH_REGION_...) or -1 on error
+ */
+static int cros_ec_decode_region(int argc, char * const argv[])
+{
+       if (argc > 0) {
+               if (0 == strcmp(*argv, "rw"))
+                       return EC_FLASH_REGION_RW;
+               else if (0 == strcmp(*argv, "ro"))
+                       return EC_FLASH_REGION_RO;
+
+               debug("%s: Invalid region '%s'\n", __func__, *argv);
+       } else {
+               debug("%s: Missing region parameter\n", __func__);
+       }
+
+       return -1;
+}
+
 /**
  * Perform a flash read or write command
  *

diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index 807373053c411ecbc21b654f60e136398ebf57c4..759bb46c57b2ec7555c152394956505d18716a1d 100644 (file)
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -1024,22 +1024,6 @@ int cros_ec_register(struct udevice *dev)
        return 0;
 }
 
-int cros_ec_decode_region(int argc, char * const argv[])
-{
-       if (argc > 0) {
-               if (0 == strcmp(*argv, "rw"))
-                       return EC_FLASH_REGION_RW;
-               else if (0 == strcmp(*argv, "ro"))
-                       return EC_FLASH_REGION_RO;
-
-               debug("%s: Invalid region '%s'\n", __func__, *argv);
-       } else {
-               debug("%s: Missing region parameter\n", __func__);
-       }
-
-       return -1;
-}
-
 int cros_ec_decode_ec_flash(const void *blob, int node,
                            struct fdt_cros_ec *config)
 {

diff --git a/include/cros_ec.h b/include/cros_ec.h
index ec7517c5ae27adf2423a13f5acddf9a80b125810..0271f2b827cd4bfbe0c8d1174c2f46e1138846d7 100644 (file)
--- a/include/cros_ec.h
+++ b/include/cros_ec.h
@@ -250,15 +250,6 @@ void cros_ec_dump_data(const char *name, int cmd, const uint8_t *data, int len);
  */
 int cros_ec_calc_checksum(const uint8_t *data, int size);
 
-/**
- * Decode a flash region parameter
- *
- * @param argc Number of params remaining
- * @param argv List of remaining parameters
- * @return flash region (EC_FLASH_REGION_...) or -1 on error
- */
-int cros_ec_decode_region(int argc, char * const argv[]);
-
 int cros_ec_flash_erase(struct cros_ec_dev *dev, uint32_t offset,
                uint32_t size);