| Message ID | 20161103145352.1436-1-moritz.fischer@ettus.com |
|---|---|
| State | Accepted |
| Commit | a2558e8729831e0bcef634ea2440e60425ef0ff6 |
| Delegated to: | Simon Glass |
| Headers | show |
On 3 November 2016 at 08:53, Moritz Fischer <moritz.fischer@ettus.com> wrote: > 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 > --- > > Changes from v1: > > * make cros_ec_decode_region static > * move over the comments > * fixed commit message s/crosec/cros_ec/g > > --- > cmd/cros_ec.c | 23 +++++++++++++++++++++++ > drivers/misc/cros_ec.c | 16 ---------------- > include/cros_ec.h | 9 --------- > 3 files changed, 23 insertions(+), 25 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 3 November 2016 at 11:31, Simon Glass <sjg@chromium.org> wrote: > On 3 November 2016 at 08:53, Moritz Fischer <moritz.fischer@ettus.com> wrote: >> 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 >> --- >> >> Changes from v1: >> >> * make cros_ec_decode_region static >> * move over the comments >> * fixed commit message s/crosec/cros_ec/g >> >> --- >> cmd/cros_ec.c | 23 +++++++++++++++++++++++ >> drivers/misc/cros_ec.c | 16 ---------------- >> include/cros_ec.h | 9 --------- >> 3 files changed, 23 insertions(+), 25 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm, thanks!
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c index abf11f0..9d42f87 100644 --- a/cmd/cros_ec.c +++ b/cmd/cros_ec.c @@ -20,6 +20,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 * * @param dev CROS-EC device to read/write diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 8073730..759bb46 100644 --- 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 ec7517c..0271f2b 100644 --- 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);
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 --- Changes from v1: * make cros_ec_decode_region static * move over the comments * fixed commit message s/crosec/cros_ec/g --- cmd/cros_ec.c | 23 +++++++++++++++++++++++ drivers/misc/cros_ec.c | 16 ---------------- include/cros_ec.h | 9 --------- 3 files changed, 23 insertions(+), 25 deletions(-)