diff mbox series

[U-Boot] imx: ventana: Rework CONFIG_CMD_EECONFIG code to not be included in SPL

Message ID 1514988922-23060-1-git-send-email-trini@konsulko.com
State Accepted
Commit c10b1c43fdd80fe01ad527e6d024bfaa19eb361a
Delegated to: Stefano Babic
Headers show
Series [U-Boot] imx: ventana: Rework CONFIG_CMD_EECONFIG code to not be included in SPL | expand

Commit Message

Tom Rini Jan. 3, 2018, 2:15 p.m. UTC
The command can only be used from full U-Boot, so do not build it into
SPL.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/gateworks/gw_ventana/eeprom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Tim Harvey Jan. 3, 2018, 4:17 p.m. UTC | #1
On Wed, Jan 3, 2018 at 6:15 AM, Tom Rini <trini@konsulko.com> wrote:
> The command can only be used from full U-Boot, so do not build it into
> SPL.
>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Tim Harvey <tharvey@gateworks.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  board/gateworks/gw_ventana/eeprom.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/board/gateworks/gw_ventana/eeprom.c b/board/gateworks/gw_ventana/eeprom.c
> index 2c07a84fffcb..a435dd9fb7b7 100644
> --- a/board/gateworks/gw_ventana/eeprom.c
> +++ b/board/gateworks/gw_ventana/eeprom.c
> @@ -119,7 +119,7 @@ struct ventana_eeprom_config econfig[] = {
>         { /* Sentinel */ }
>  };
>
> -#ifdef CONFIG_CMD_EECONFIG
> +#if defined(CONFIG_CMD_EECONFIG) && !defined(CONFIG_SPL_BUILD)
>  static struct ventana_eeprom_config *get_config(const char *name)
>  {
>         struct ventana_eeprom_config *cfg = econfig;
> @@ -135,7 +135,7 @@ static struct ventana_eeprom_config *get_config(const char *name)
>  static u8 econfig_bytes[sizeof(ventana_info.config)];
>  static int econfig_init = -1;
>
> -int do_econfig(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
> +static int do_econfig(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
>  {
>         struct ventana_eeprom_config *cfg;
>         struct ventana_board_info *info = &ventana_info;
> --
> 2.7.4
>

Acked-by: Tim Harvey <tharvey@gateworks.com>

Thanks Tom,

Tim
Fabio Estevam Jan. 3, 2018, 4:22 p.m. UTC | #2
On Wed, Jan 3, 2018 at 12:15 PM, Tom Rini <trini@konsulko.com> wrote:
> The command can only be used from full U-Boot, so do not build it into
> SPL.
>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Tim Harvey <tharvey@gateworks.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Stefano Babic Jan. 12, 2018, 1:34 p.m. UTC | #3
On 03/01/2018 15:15, Tom Rini wrote:
> The command can only be used from full U-Boot, so do not build it into
> SPL.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Tim Harvey <tharvey@gateworks.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  board/gateworks/gw_ventana/eeprom.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/board/gateworks/gw_ventana/eeprom.c b/board/gateworks/gw_ventana/eeprom.c
> index 2c07a84fffcb..a435dd9fb7b7 100644
> --- a/board/gateworks/gw_ventana/eeprom.c
> +++ b/board/gateworks/gw_ventana/eeprom.c
> @@ -119,7 +119,7 @@ struct ventana_eeprom_config econfig[] = {
>  	{ /* Sentinel */ }
>  };
>  
> -#ifdef CONFIG_CMD_EECONFIG
> +#if defined(CONFIG_CMD_EECONFIG) && !defined(CONFIG_SPL_BUILD)
>  static struct ventana_eeprom_config *get_config(const char *name)
>  {
>  	struct ventana_eeprom_config *cfg = econfig;
> @@ -135,7 +135,7 @@ static struct ventana_eeprom_config *get_config(const char *name)
>  static u8 econfig_bytes[sizeof(ventana_info.config)];
>  static int econfig_init = -1;
>  
> -int do_econfig(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
> +static int do_econfig(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
>  {
>  	struct ventana_eeprom_config *cfg;
>  	struct ventana_board_info *info = &ventana_info;
> 
Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/board/gateworks/gw_ventana/eeprom.c b/board/gateworks/gw_ventana/eeprom.c
index 2c07a84fffcb..a435dd9fb7b7 100644
--- a/board/gateworks/gw_ventana/eeprom.c
+++ b/board/gateworks/gw_ventana/eeprom.c
@@ -119,7 +119,7 @@  struct ventana_eeprom_config econfig[] = {
 	{ /* Sentinel */ }
 };
 
-#ifdef CONFIG_CMD_EECONFIG
+#if defined(CONFIG_CMD_EECONFIG) && !defined(CONFIG_SPL_BUILD)
 static struct ventana_eeprom_config *get_config(const char *name)
 {
 	struct ventana_eeprom_config *cfg = econfig;
@@ -135,7 +135,7 @@  static struct ventana_eeprom_config *get_config(const char *name)
 static u8 econfig_bytes[sizeof(ventana_info.config)];
 static int econfig_init = -1;
 
-int do_econfig(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_econfig(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	struct ventana_eeprom_config *cfg;
 	struct ventana_board_info *info = &ventana_info;