Re: [U-Boot] [PATCH v2 2/5] sunxi: Turn MMC_SUNXI_SLOT_EXTRA into a proper Kconfig option

2014-10-12 Thread Hans de Goede 
Hi,

On 10/11/2014 05:40 PM, Ian Campbell wrote:
> On Mon, 2014-10-06 at 19:57 +0200, Hans de Goede wrote:
>> Note we also drop the SPL check for initializing the 2nd mmc slot, the SPL
>> check is not necessary with Kconfig, because only options explicitly marked
>> as also being for the SPL get set during SPL builds.
>>
>> Signed-off-by: Hans de Goede 
>> ---
>>  board/sunxi/Kconfig | 8 
>>  board/sunxi/board.c | 2 +-
>>  2 files changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
>> index 497b093..cb4a881 100644
>> --- a/board/sunxi/Kconfig
>> +++ b/board/sunxi/Kconfig
>> @@ -32,6 +32,14 @@ config USB_KEYBOARD
>>  Say Y here to add support for using a USB keyboard (typically used
>>  in combination with a graphical console on HDMI).
>>  
>> +config MMC_SUNXI_SLOT_EXTRA
>> +int "mmc extra slot number"
>> +default -1
>> +---help---
>> +sunxi builds always enable mmc0, some boards also have a sdcard slot
>> +or emmc on mmc2 or mmc3. Setting this to 2 or 3 will enable support
>> +for this.
> 
> What happened to mmc1?

When writing this I was under the assumption that nothing was actually using
mmc1, I will fix the help text.

> 
> Regardless:
> 
> Acked-by: Ian Campbell 

Regards,

Hans
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v2 2/5] sunxi: Turn MMC_SUNXI_SLOT_EXTRA into a proper Kconfig option

2014-10-11 Thread Ian Campbell 
On Mon, 2014-10-06 at 19:57 +0200, Hans de Goede wrote:
> Note we also drop the SPL check for initializing the 2nd mmc slot, the SPL
> check is not necessary with Kconfig, because only options explicitly marked
> as also being for the SPL get set during SPL builds.
> 
> Signed-off-by: Hans de Goede 
> ---
>  board/sunxi/Kconfig | 8 
>  board/sunxi/board.c | 2 +-
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> index 497b093..cb4a881 100644
> --- a/board/sunxi/Kconfig
> +++ b/board/sunxi/Kconfig
> @@ -32,6 +32,14 @@ config USB_KEYBOARD
>   Say Y here to add support for using a USB keyboard (typically used
>   in combination with a graphical console on HDMI).
>  
> +config MMC_SUNXI_SLOT_EXTRA
> + int "mmc extra slot number"
> + default -1
> + ---help---
> + sunxi builds always enable mmc0, some boards also have a sdcard slot
> + or emmc on mmc2 or mmc3. Setting this to 2 or 3 will enable support
> + for this.

What happened to mmc1?

Regardless:

Acked-by: Ian Campbell 


___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v2 2/5] sunxi: Turn MMC_SUNXI_SLOT_EXTRA into a proper Kconfig option

2014-10-06 Thread Hans de Goede 
Note we also drop the SPL check for initializing the 2nd mmc slot, the SPL
check is not necessary with Kconfig, because only options explicitly marked
as also being for the SPL get set during SPL builds.

Signed-off-by: Hans de Goede 
---
 board/sunxi/Kconfig | 8 
 board/sunxi/board.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 497b093..cb4a881 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -32,6 +32,14 @@ config USB_KEYBOARD
Say Y here to add support for using a USB keyboard (typically used
in combination with a graphical console on HDMI).
 
+config MMC_SUNXI_SLOT_EXTRA
+   int "mmc extra slot number"
+   default -1
+   ---help---
+   sunxi builds always enable mmc0, some boards also have a sdcard slot
+   or emmc on mmc2 or mmc3. Setting this to 2 or 3 will enable support
+   for this.
+
 config MMC0_CD_PIN
string "Card detect pin for mmc0"
default ""
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index e819b12..4d602ca 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -110,7 +110,7 @@ int board_mmc_init(bd_t *bis)
 {
mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT);
sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT);
-#if !defined (CONFIG_SPL_BUILD) && defined (CONFIG_MMC_SUNXI_SLOT_EXTRA)
+#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT_EXTRA);
sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT_EXTRA);
 #endif
-- 
2.1.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot