[U-Boot] [PATCH 19/41] Convert CONFIG_CMD_SAVES to Kconfig
Bin Meng
bmeng.cn at gmail.com
Sat Jul 22 16:00:25 UTC 2017
Hi Simon,
On Sat, Jul 22, 2017 at 7:11 AM, Simon Glass <sjg at chromium.org> wrote:
> This converts the following to Kconfig:
> CONFIG_CMD_SAVES
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> README | 1 -
> arch/arm/Kconfig | 6 ++++++
> cmd/Kconfig | 6 ++++++
> configs/ethernut5_defconfig | 1 +
> configs/microblaze-generic_defconfig | 1 +
> configs/x600_defconfig | 1 +
> configs/xtfpga_defconfig | 1 +
> include/config_cmd_all.h | 1 -
> include/configs/calimain.h | 1 -
> include/configs/da850evm.h | 1 -
> include/configs/ea20.h | 1 -
> include/configs/ethernut5.h | 1 -
> include/configs/ipam390.h | 1 -
> include/configs/legoev3.h | 1 -
> include/configs/microblaze-generic.h | 8 --------
> include/configs/omapl138_lcdk.h | 1 -
> include/configs/spear-common.h | 1 -
> include/configs/ti_armv7_keystone2.h | 1 -
> include/configs/x600.h | 1 -
> include/configs/xtfpga.h | 2 --
> scripts/config_whitelist.txt | 1 -
> 21 files changed, 16 insertions(+), 23 deletions(-)
>
> diff --git a/README b/README
> index cb954098e4..ce179b828e 100644
> --- a/README
> +++ b/README
> @@ -816,7 +816,6 @@ The following options need to be configured:
> CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network
> host
> CONFIG_CMD_RUN run command in env variable
> - CONFIG_CMD_SAVES * save S record dump
> CONFIG_CMD_SDRAM * print SDRAM configuration information
> (requires CONFIG_CMD_I2C)
> CONFIG_CMD_SF * Read/write/erase SPI NOR flash
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 6ab79a7a7a..c3c389298d 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -308,6 +308,7 @@ config TARGET_GPLUGD
> config ARCH_DAVINCI
> bool "TI DaVinci"
> select CPU_ARM926EJS
> + imply CMD_SAVES
> help
> Support for TI's DaVinci platform.
>
> @@ -409,21 +410,25 @@ config TARGET_SPEAR300
> bool "Support spear300"
> select CPU_ARM926EJS
> select BOARD_EARLY_INIT_F
> + imply CMD_SAVES
>
> config TARGET_SPEAR310
> bool "Support spear310"
> select CPU_ARM926EJS
> select BOARD_EARLY_INIT_F
> + imply CMD_SAVES
>
> config TARGET_SPEAR320
> bool "Support spear320"
> select CPU_ARM926EJS
> select BOARD_EARLY_INIT_F
> + imply CMD_SAVES
>
> config TARGET_SPEAR600
> bool "Support spear600"
> select CPU_ARM926EJS
> select BOARD_EARLY_INIT_F
> + imply CMD_SAVES
>
> config TARGET_STV0991
> bool "Support stv0991"
> @@ -571,6 +576,7 @@ config ARCH_KEYSTONE
> select CMD_POWEROFF
> imply FIT
> imply CMD_MTDPARTS
> + imply CMD_SAVES
>
> config ARCH_OMAP2PLUS
> bool "TI OMAP2+"
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index aac79f4bcf..4be801cdfe 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -798,6 +798,12 @@ config CMD_REGINFO
> help
> Provides access to low-level register information.
>
> +config CMD_SAVES
> + bool "saves - Save a file over serial in S-Record format"
> + help
> + Provides a way to save a binary file using the Motorola S-Record
> + format over the serial line.
> +
> endmenu
>
>
> diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
> index 197052dba6..20bff59cac 100644
> --- a/configs/ethernut5_defconfig
> +++ b/configs/ethernut5_defconfig
> @@ -16,6 +16,7 @@ CONFIG_CMD_SPI=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_USB=y
> # CONFIG_CMD_FPGA is not set
> +CONFIG_CMD_SAVES=y
> CONFIG_CMD_RARP=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
> index f79907ba14..471be29ee5 100644
> --- a/configs/microblaze-generic_defconfig
> +++ b/configs/microblaze-generic_defconfig
> @@ -24,6 +24,7 @@ CONFIG_SYS_PROMPT="U-Boot-mONStR> "
> CONFIG_CMD_ASKENV=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_MFSL=y
> +CONFIG_CMD_SAVES=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TFTPPUT=y
> CONFIG_CMD_DHCP=y
> diff --git a/configs/x600_defconfig b/configs/x600_defconfig
> index 2e5d5f1ae8..f10d81116a 100644
> --- a/configs/x600_defconfig
> +++ b/configs/x600_defconfig
> @@ -22,6 +22,7 @@ CONFIG_CMD_I2C=y
> CONFIG_CMD_USB=y
> CONFIG_CMD_FPGA_LOADMK=y
> CONFIG_CMD_GPIO=y
> +CONFIG_CMD_SAVES=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig
> index 9f85d63965..0fc7141257 100644
> --- a/configs/xtfpga_defconfig
> +++ b/configs/xtfpga_defconfig
> @@ -9,6 +9,7 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press <SPACE> to stop\n"
> CONFIG_AUTOBOOT_STOP_STR=" "
> CONFIG_CMD_ASKENV=y
> CONFIG_CRC32_VERIFY=y
> +CONFIG_CMD_SAVES=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_PING=y
> CONFIG_CMD_DIAG=y
> diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
> index 26c08eeef6..6ad3f17169 100644
> --- a/include/config_cmd_all.h
> +++ b/include/config_cmd_all.h
> @@ -14,7 +14,6 @@
> */
>
> #define CONFIG_CMD_NAND /* NAND support */
> -#define CONFIG_CMD_SAVES /* save S record dump */
> #define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */
> #define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */
> #define CONFIG_CMD_UBIFS /* UBIFS Support */
> diff --git a/include/configs/calimain.h b/include/configs/calimain.h
> index d43e3314a7..e0fe981b43 100644
> --- a/include/configs/calimain.h
> +++ b/include/configs/calimain.h
> @@ -298,7 +298,6 @@
> /*
> * U-Boot commands
> */
The above comments should be removed.
> -#define CONFIG_CMD_SAVES
>
> #ifndef CONFIG_DRIVER_TI_EMAC
> #endif
> diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
> index 1bb38651d2..689f68c869 100644
> --- a/include/configs/da850evm.h
> +++ b/include/configs/da850evm.h
> @@ -272,7 +272,6 @@
> /*
> * U-Boot commands
> */
ditto.
> -#define CONFIG_CMD_SAVES
>
> #ifdef CONFIG_CMD_BDI
> #define CONFIG_CLOCKS
> diff --git a/include/configs/ea20.h b/include/configs/ea20.h
> index 0b8464c044..38cf11076d 100644
> --- a/include/configs/ea20.h
> +++ b/include/configs/ea20.h
> @@ -127,7 +127,6 @@
> /*
> * U-Boot commands
> */
ditto.
> -#define CONFIG_CMD_SAVES
>
> #ifdef CONFIG_CMD_BDI
> #define CONFIG_CLOCKS
> diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
> index 8b9aaaa2c4..4ad114e8ba 100644
> --- a/include/configs/ethernut5.h
> +++ b/include/configs/ethernut5.h
> @@ -87,7 +87,6 @@
> #define CONFIG_CMD_NAND
>
> #ifndef MINIMAL_LOADER
> -#define CONFIG_CMD_SAVES
> #define CONFIG_CMD_UBIFS
> #endif
>
> diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
> index b2b969ade2..95cd769843 100644
> --- a/include/configs/ipam390.h
> +++ b/include/configs/ipam390.h
> @@ -240,7 +240,6 @@
> /*
> * U-Boot commands
> */
ditto.
> -#define CONFIG_CMD_SAVES
>
> #ifdef CONFIG_CMD_BDI
> #define CONFIG_CLOCKS
> diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
> index 15da4074f2..34c65f3920 100644
> --- a/include/configs/legoev3.h
> +++ b/include/configs/legoev3.h
> @@ -200,7 +200,6 @@
> /*
> * U-Boot commands
> */
ditto.
> -#define CONFIG_CMD_SAVES
>
> #ifdef CONFIG_CMD_BDI
> #define CONFIG_CLOCKS
> diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
> index 84b4154ec5..5a1875ad15 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -172,16 +172,8 @@
> #if defined(FLASH)
> # undef CONFIG_CMD_UBIFS
>
> -# if !defined(RAMENV)
> -# define CONFIG_CMD_SAVES
> -# endif
> -
> #else
> #if defined(SPIFLASH)
> -
> -# if !defined(RAMENV)
> -# define CONFIG_CMD_SAVES
> -# endif
> #else
> # undef CONFIG_CMD_UBIFS
> #endif
> diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
> index dee0ae0d9a..168da4ab95 100644
> --- a/include/configs/omapl138_lcdk.h
> +++ b/include/configs/omapl138_lcdk.h
> @@ -283,7 +283,6 @@
> /*
> * U-Boot commands
> */
ditto.
> -#define CONFIG_CMD_SAVES
> #ifdef CONFIG_CMD_BDI
> #define CONFIG_CLOCKS
> #endif
> diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
> index 86e14ffac8..d69e116085 100644
> --- a/include/configs/spear-common.h
> +++ b/include/configs/spear-common.h
> @@ -97,7 +97,6 @@
> * Command support defines
> */
> #define CONFIG_CMD_NAND
> -#define CONFIG_CMD_SAVES
>
> /*
> * Default Environment Varible definitions
> diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
> index ac8dabd9ca..b76d20c969 100644
> --- a/include/configs/ti_armv7_keystone2.h
> +++ b/include/configs/ti_armv7_keystone2.h
> @@ -202,7 +202,6 @@
> #define CONFIG_USB_PHY_CFG_BASE KS2_USB_PHY_CFG_BASE
>
> /* U-Boot command configuration */
> -#define CONFIG_CMD_SAVES
> #define CONFIG_CMD_UBIFS
>
> /* U-Boot general configuration */
> diff --git a/include/configs/x600.h b/include/configs/x600.h
> index 3ff6b70bde..c5fd973147 100644
> --- a/include/configs/x600.h
> +++ b/include/configs/x600.h
> @@ -107,7 +107,6 @@
> * Command support defines
> */
> #define CONFIG_CMD_NAND
> -#define CONFIG_CMD_SAVES
> #define CONFIG_CMD_UBIFS
> #define CONFIG_LZO
>
> diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
> index 7d7d9bb983..44120db963 100644
> --- a/include/configs/xtfpga.h
> +++ b/include/configs/xtfpga.h
> @@ -127,8 +127,6 @@
> /* U-Boot commands */
> /*=================*/
>
ditto.
> -#define CONFIG_CMD_SAVES
> -
> /*==============================*/
> /* U-Boot autoboot configuration */
> /*==============================*/
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 221525b78a..a0b39a355f 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10
> CONFIG_CMDLINE_EDITING
> CONFIG_CMDLINE_PS_SUPPORT
> CONFIG_CMDLINE_TAG
> -CONFIG_CMD_SAVES
> CONFIG_CMD_SCSI
> CONFIG_CMD_SDRAM
> CONFIG_CMD_SF_TEST
> --
Regards,
Bin
More information about the U-Boot
mailing list