[U-Boot] [patchv2] socfpga: move configuration options to config file

[Pavel Machek <pavel@denx.de>]

On Tue 2015-04-21 12:23:07, Pavel Machek wrote:
> Setting configuration options in header file leads to incosistency
> between .config user sees, and .config he has. What is worse, a lot of
> compile warnings is presented for any such config option user sets in
> .config.
>     
> Signed-off-by: Pavel Machek <pavel@denx.de>

Ping? Please apply.

> ---
> v2:
> 
> > You need to add these to common/Kconfig
> > as well as to your defconfig.
> > 
> > Otherwise, they do not appear in the .config file.
> > 
> > There exist CMD_RUN, CMD_PING, CMD_USB in common/Kconfig,
> > but most of the others are missing.
> 
> Ok, I did conversion only for those present in Kconfig.
> 
> diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
> index 0ebfbfc..5cfc56c 100644
> --- a/configs/socfpga_cyclone5_defconfig
> +++ b/configs/socfpga_cyclone5_defconfig
> @@ -6,3 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
>  CONFIG_DM=y
>  CONFIG_DM_SPI=y
>  CONFIG_DM_SPI_FLASH=y
> +CONFIG_CMD_DHCP=y
> +CONFIG_CMD_FPGA=y
> +CONFIG_CMD_NET=y
> +CONFIG_CMD_PING=y
> +CONFIG_CMD_USB=y
> diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
> index 873b721..0cde0e9 100644
> --- a/configs/socfpga_socrates_defconfig
> +++ b/configs/socfpga_socrates_defconfig
> @@ -6,3 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
>  CONFIG_DM=y
>  CONFIG_DM_SPI=y
>  CONFIG_DM_SPI_FLASH=y
> +CONFIG_CMD_DHCP=y
> +CONFIG_CMD_FPGA=y
> +CONFIG_CMD_NET=y
> +CONFIG_CMD_PING=y
> +CONFIG_CMD_USB=y
> diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
> index 2e3a8b6..93a0572 100644
> --- a/include/configs/socfpga_cyclone5.h
> +++ b/include/configs/socfpga_cyclone5.h
> @@ -22,19 +22,14 @@
>  #define CONFIG_CMD_BOOTZ
>  #define CONFIG_CMD_CACHE
>  #define CONFIG_CMD_DFU
> -#define CONFIG_CMD_DHCP
>  #define CONFIG_CMD_EXT4
>  #define CONFIG_CMD_EXT4_WRITE
>  #define CONFIG_CMD_FAT
> -#define CONFIG_CMD_FPGA
>  #define CONFIG_CMD_FS_GENERIC
>  #define CONFIG_CMD_GREPENV
>  #define CONFIG_CMD_MII
>  #define CONFIG_CMD_MMC
> -#define CONFIG_CMD_NET
> -#define CONFIG_CMD_PING
>  #define CONFIG_CMD_SETEXPR
> -#define CONFIG_CMD_USB
>  #define CONFIG_CMD_USB_MASS_STORAGE
>  
>  #define CONFIG_REGEX			/* Enable regular expression support */
> 
> 

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html