[U-Boot] [RFC PATCH 3/7] Move CONFIG_FPGA_SPARTAN options to defconfig

[Michal Simek]

On 22.11.2016 09:48, Chris Packham wrote:
> Signed-off-by: Chris Packham <judge.packham at gmail.com>
> ---
> 
>  configs/PMC440_defconfig         | 3 +++
>  configs/apf27_defconfig          | 2 ++
>  configs/astro_mcf5373l_defconfig | 2 ++
>  configs/mt_ventoux_defconfig     | 2 ++
>  configs/x600_defconfig           | 2 ++
>  include/configs/PMC440.h         | 4 ----
>  include/configs/apf27.h          | 5 -----
>  include/configs/astro_mcf5373l.h | 3 ---
>  include/configs/mt_ventoux.h     | 3 ---
>  include/configs/x600.h           | 3 ---
>  10 files changed, 11 insertions(+), 18 deletions(-)
> 
> diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig
> index cd2f0d2a5b4b..8a2e9c964e14 100644
> --- a/configs/PMC440_defconfig
> +++ b/configs/PMC440_defconfig
> @@ -16,6 +16,9 @@ CONFIG_CMD_DHCP=y
>  CONFIG_CMD_MII=y
>  CONFIG_CMD_PING=y
>  CONFIG_CMD_FAT=y
> +CONFIG_FPGA_XILINX=y
> +CONFIG_FPGA_SPARTAN3=y
> +CONFIG_FPGA_SPARTAN2=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
> diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
> index a02e180d2f2c..f8f177ad56ce 100644
> --- a/configs/apf27_defconfig
> +++ b/configs/apf27_defconfig
> @@ -21,4 +21,6 @@ CONFIG_CMD_CACHE=y
>  CONFIG_CMD_EXT2=y
>  CONFIG_CMD_FAT=y
>  CONFIG_CMD_UBI=y
> +CONFIG_FPGA_XILINX=y
> +CONFIG_FPGA_SPARTAN3=y
>  CONFIG_OF_LIBFDT=y
> diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
> index 94e931eabadc..5ea1b66e5b2a 100644
> --- a/configs/astro_mcf5373l_defconfig
> +++ b/configs/astro_mcf5373l_defconfig
> @@ -9,3 +9,5 @@ CONFIG_CMD_I2C=y
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
>  CONFIG_CMD_CACHE=y
> +CONFIG_FPGA_XILINX=y
> +CONFIG_FPGA_SPARTAN3=y
> diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
> index 9e330a7f44ca..d4e58395cf22 100644
> --- a/configs/mt_ventoux_defconfig
> +++ b/configs/mt_ventoux_defconfig
> @@ -24,6 +24,8 @@ CONFIG_CMD_CACHE=y
>  CONFIG_CMD_EXT2=y
>  CONFIG_CMD_FAT=y
>  CONFIG_CMD_UBI=y
> +CONFIG_FPGA_XILINX=y
> +CONFIG_FPGA_SPARTAN3=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_USB=y
>  CONFIG_USB_ULPI_VIEWPORT_OMAP=y
> diff --git a/configs/x600_defconfig b/configs/x600_defconfig
> index 65b7d9565aac..0db6b5c6ba20 100644
> --- a/configs/x600_defconfig
> +++ b/configs/x600_defconfig
> @@ -26,6 +26,8 @@ CONFIG_CMD_CACHE=y
>  CONFIG_CMD_FAT=y
>  CONFIG_CMD_FS_GENERIC=y
>  CONFIG_CMD_UBI=y
> +CONFIG_FPGA_XILINX=y
> +CONFIG_FPGA_SPARTAN3=y
>  CONFIG_SYS_I2C_DW=y
>  CONFIG_NETDEVICES=y
>  CONFIG_ETH_DESIGNWARE=y
> diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
> index 2e7f6e480323..750f8447220c 100644
> --- a/include/configs/PMC440.h
> +++ b/include/configs/PMC440.h
> @@ -343,10 +343,6 @@
>  /*-----------------------------------------------------------------------
>   * FPGA stuff
>   *----------------------------------------------------------------------*/
> -#define CONFIG_FPGA
> -#define CONFIG_FPGA_XILINX
> -#define CONFIG_FPGA_SPARTAN2
> -#define CONFIG_FPGA_SPARTAN3
>  
>  #define CONFIG_FPGA_COUNT	2
>  /*-----------------------------------------------------------------------
> diff --git a/include/configs/apf27.h b/include/configs/apf27.h
> index a97ba9f39c50..00798fa1027f 100644
> --- a/include/configs/apf27.h
> +++ b/include/configs/apf27.h
> @@ -260,12 +260,7 @@
>  /*
>   * FPGA
>   */
> -#ifndef CONFIG_SPL_BUILD
> -#define CONFIG_FPGA
> -#endif

Isn't this causing some compilation issue for SPL case?

Thanks,
Michal


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161123/57a6b180/attachment.sig>