[U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option

[Hans de Goede]

Hi,

On 10/04/2014 10:48 AM, Ian Campbell wrote:
> It's unfortunate that this needs to be present in both .config and spl/.config
> since it makes it slightly hard to enable FEL mode for a regular defconfig. It
> can be done with:
>     echo CONFIG_SPL_FEL=y >> .config
>     echo CONFIG_SPL_FEL=y >> spl/.config
> 
> Ideally only one of those would be needed.
> 
> Signed-off-by: Ian Campbell <ijc at hellion.org.uk>
> ---
>  board/sunxi/Kconfig               | 4 ++++
>  configs/Cubieboard2_FEL_defconfig | 3 ++-
>  configs/Cubietruck_FEL_defconfig  | 3 ++-
>  3 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> index 6e9308d..f467ade 100644
> --- a/board/sunxi/Kconfig
> +++ b/board/sunxi/Kconfig
> @@ -32,6 +32,10 @@ config SYS_BOARD
>  config SYS_SOC
>  	default "sunxi"
>  
> +config SPL_FEL
> +	bool "SPL/FEL mode support"
> +	default n
> +
>  config FDTFILE
>  	string "Default fdtfile env setting for this board"
>  

Ack to this bit.

> diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig
> index 967be18..8d68275 100644
> --- a/configs/Cubieboard2_FEL_defconfig
> +++ b/configs/Cubieboard2_FEL_defconfig
> @@ -1,5 +1,6 @@
>  CONFIG_SPL=y
> -CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
> ++S:CONFIG_SPL_FEL=y
> +CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
>  +S:CONFIG_ARM=y
>  +S:CONFIG_TARGET_SUNXI=y
> diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig
> index 1cda577..64fbc34 100644
> --- a/configs/Cubietruck_FEL_defconfig
> +++ b/configs/Cubietruck_FEL_defconfig
> @@ -1,5 +1,6 @@
>  CONFIG_SPL=y
> -CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
> ++S:CONFIG_SPL_FEL=y
> +CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
>  +S:CONFIG_ARM=y
>  +S:CONFIG_TARGET_SUNXI=y
> 

But not do this but, I don't see how these 2 are so special that they have to get
a FEL version of the defconfig, where others do not. I was planning to do a similar
patch (but have not gotten around to it), but my plan was to simply remove these 2
defconfigs then.

This is:

Acked-by: Hans de Goede <hdegoede at redhat.com>

With the 2 FEL defconfigs completely removed. If you disagree with removing them,
this is going to need some more discussion :)

Regards,

Hans