diff mbox

[v2,7/7] ARM: sunxi: remove bare default for CONFIG_MMC

Message ID 1484022728-9340-8-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit f401e907fcbc94adff1a8e8097c8f0a5b0aee580
Headers show

Commit Message

Masahiro Yamada Jan. 10, 2017, 4:32 a.m. UTC
The bare default entry is wrong.  Just remove it since the (real)
entry in drivers/mmc/Kconfig has "default ARM || PPC || SANDBOX".

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Reviewed-by: Marek Vasut <marex@denx.de>

---

Changes in v2: None

 board/sunxi/Kconfig | 4 ----
 1 file changed, 4 deletions(-)

-- 
2.7.4

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

Comments

Maxime Ripard Jan. 10, 2017, 8:04 a.m. UTC | #1
Hi,

On Tue, Jan 10, 2017 at 01:32:08PM +0900, Masahiro Yamada wrote:
> The bare default entry is wrong. Just remove it since the (real)

> entry in drivers/mmc/Kconfig has "default ARM || PPC || SANDBOX".

> 

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

> Reviewed-by: Marek Vasut <marex@denx.de>

> ---

> 

> Changes in v2: None

> 

>  board/sunxi/Kconfig | 4 ----

>  1 file changed, 4 deletions(-)

> 

> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig

> index e1d4ab1..11eb82a 100644

> --- a/board/sunxi/Kconfig

> +++ b/board/sunxi/Kconfig

> @@ -291,10 +291,6 @@ config OLD_SUNXI_KERNEL_COMPAT

>  	Set this to enable various workarounds for old kernels, this results in

>  	sub-optimal settings for newer kernels, only enable if needed.

>  

> -config MMC

> -	depends on !UART0_PORT_F

> -	default y if ARCH_SUNXI

> -


The default might be useless, but the additional depends on is really
not.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Masahiro Yamada Jan. 10, 2017, 10:57 a.m. UTC | #2
2017-01-10 17:04 GMT+09:00 Maxime Ripard <maxime.ripard@free-electrons.com>:
> Hi,

>

> On Tue, Jan 10, 2017 at 01:32:08PM +0900, Masahiro Yamada wrote:

>> The bare default entry is wrong. Just remove it since the (real)

>> entry in drivers/mmc/Kconfig has "default ARM || PPC || SANDBOX".

>>

>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

>> Reviewed-by: Marek Vasut <marex@denx.de>

>> ---

>>

>> Changes in v2: None

>>

>>  board/sunxi/Kconfig | 4 ----

>>  1 file changed, 4 deletions(-)

>>

>> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig

>> index e1d4ab1..11eb82a 100644

>> --- a/board/sunxi/Kconfig

>> +++ b/board/sunxi/Kconfig

>> @@ -291,10 +291,6 @@ config OLD_SUNXI_KERNEL_COMPAT

>>       Set this to enable various workarounds for old kernels, this results in

>>       sub-optimal settings for newer kernels, only enable if needed.

>>

>> -config MMC

>> -     depends on !UART0_PORT_F

>> -     default y if ARCH_SUNXI

>> -

>

> The default might be useless, but the additional depends on is really

> not.


This is wrong anyway.


If you want to disable MMC, the following seems better.

config MMC_SUNXI
          depends on ARCH_SUNXI && !UART0_PORT_F


BTW,  UART0_PORT_F seems SUNXI specific.
If this symbol is useful, I'd like to recommend to rename it to
ARCH_SUNXI_UART0_PORT_F or something.


-- 
Best Regards
Masahiro Yamada
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Maxime Ripard Jan. 11, 2017, 9:48 p.m. UTC | #3
On Tue, Jan 10, 2017 at 07:57:22PM +0900, Masahiro Yamada wrote:
> 2017-01-10 17:04 GMT+09:00 Maxime Ripard <maxime.ripard@free-electrons.com>:

> > Hi,

> >

> > On Tue, Jan 10, 2017 at 01:32:08PM +0900, Masahiro Yamada wrote:

> >> The bare default entry is wrong. Just remove it since the (real)

> >> entry in drivers/mmc/Kconfig has "default ARM || PPC || SANDBOX".

> >>

> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

> >> Reviewed-by: Marek Vasut <marex@denx.de>

> >> ---

> >>

> >> Changes in v2: None

> >>

> >>  board/sunxi/Kconfig | 4 ----

> >>  1 file changed, 4 deletions(-)

> >>

> >> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig

> >> index e1d4ab1..11eb82a 100644

> >> --- a/board/sunxi/Kconfig

> >> +++ b/board/sunxi/Kconfig

> >> @@ -291,10 +291,6 @@ config OLD_SUNXI_KERNEL_COMPAT

> >>       Set this to enable various workarounds for old kernels, this results in

> >>       sub-optimal settings for newer kernels, only enable if needed.

> >>

> >> -config MMC

> >> -     depends on !UART0_PORT_F

> >> -     default y if ARCH_SUNXI

> >> -

> >

> > The default might be useless, but the additional depends on is really

> > not.

> 

> This is wrong anyway.


The original code might have been wrong, but you just introduced a
regression.

> If you want to disable MMC, the following seems better.

> 

> config MMC_SUNXI

>           depends on ARCH_SUNXI && !UART0_PORT_F


That looks great. Can you send a patch for it or add it to that serie?

> BTW,  UART0_PORT_F seems SUNXI specific.

> If this symbol is useful, I'd like to recommend to rename it to

> ARCH_SUNXI_UART0_PORT_F or something.


That would work for me too.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Masahiro Yamada Jan. 12, 2017, 3:18 a.m. UTC | #4
Hi Maxime,


2017-01-12 6:48 GMT+09:00 Maxime Ripard <maxime.ripard@free-electrons.com>:
> On Tue, Jan 10, 2017 at 07:57:22PM +0900, Masahiro Yamada wrote:

>> 2017-01-10 17:04 GMT+09:00 Maxime Ripard <maxime.ripard@free-electrons.com>:

>> > Hi,

>> >

>> > On Tue, Jan 10, 2017 at 01:32:08PM +0900, Masahiro Yamada wrote:

>> >> The bare default entry is wrong. Just remove it since the (real)

>> >> entry in drivers/mmc/Kconfig has "default ARM || PPC || SANDBOX".

>> >>

>> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

>> >> Reviewed-by: Marek Vasut <marex@denx.de>

>> >> ---

>> >>

>> >> Changes in v2: None

>> >>

>> >>  board/sunxi/Kconfig | 4 ----

>> >>  1 file changed, 4 deletions(-)

>> >>

>> >> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig

>> >> index e1d4ab1..11eb82a 100644

>> >> --- a/board/sunxi/Kconfig

>> >> +++ b/board/sunxi/Kconfig

>> >> @@ -291,10 +291,6 @@ config OLD_SUNXI_KERNEL_COMPAT

>> >>       Set this to enable various workarounds for old kernels, this results in

>> >>       sub-optimal settings for newer kernels, only enable if needed.

>> >>

>> >> -config MMC

>> >> -     depends on !UART0_PORT_F

>> >> -     default y if ARCH_SUNXI

>> >> -

>> >

>> > The default might be useless, but the additional depends on is really

>> > not.

>>

>> This is wrong anyway.

>

> The original code might have been wrong, but you just introduced a

> regression.

>

>> If you want to disable MMC, the following seems better.

>>

>> config MMC_SUNXI

>>           depends on ARCH_SUNXI && !UART0_PORT_F

>

> That looks great. Can you send a patch for it or add it to that serie?



OK.

Please check this:
http://patchwork.ozlabs.org/patch/714139/


-- 
Best Regards
Masahiro Yamada
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
diff mbox

Patch

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index e1d4ab1..11eb82a 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -291,10 +291,6 @@  config OLD_SUNXI_KERNEL_COMPAT
 	Set this to enable various workarounds for old kernels, this results in
 	sub-optimal settings for newer kernels, only enable if needed.
 
-config MMC
-	depends on !UART0_PORT_F
-	default y if ARCH_SUNXI
-
 config MMC0_CD_PIN
 	string "Card detect pin for mmc0"
 	default "PF6" if MACH_SUN8I_A83T || MACH_SUN8I_H3 || MACH_SUN50I