Patchwork [1/4] arm/imx: fix mx3_defconfig to add FEC back

login
register
mail settings
Submitter Shawn Guo
Date Nov. 10, 2011, 8:39 a.m.
Message ID <1320914372-4416-2-git-send-email-shawn.guo@linaro.org>
Download mbox | patch
Permalink /patch/124818/
State New
Headers show

Comments

Shawn Guo - Nov. 10, 2011, 8:39 a.m.
The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
which is not good, since FEC is useful for both developers and users.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/configs/mx3_defconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Richard Zhao - Nov. 10, 2011, 8:49 a.m.
Is it supposed to be generated, like by make menuconfig?

Richard
On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
> The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
> which is not good, since FEC is useful for both developers and users.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/configs/mx3_defconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig
> index cb0717f..ee50a9e 100644
> --- a/arch/arm/configs/mx3_defconfig
> +++ b/arch/arm/configs/mx3_defconfig
> @@ -67,6 +67,7 @@ CONFIG_SMSC_PHY=y
>  CONFIG_NET_ETHERNET=y
>  CONFIG_SMSC911X=y
>  CONFIG_DNET=y
> +CONFIG_FEC=y
>  # CONFIG_NETDEV_1000 is not set
>  # CONFIG_NETDEV_10000 is not set
>  # CONFIG_INPUT_MOUSEDEV is not set
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
Uwe Kleine-König - Nov. 10, 2011, 8:57 a.m.
On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
> The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
> which is not good, since FEC is useful for both developers and users.

$ git show d880db0^:drivers/net/Kconfig | grep -A4 'config FEC$'
config FEC
	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
	depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
		IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC
	default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM

So when d880db0 was created

	make savedefconfig

dropped CONFIG_FEC=y justifiably. The culprit is commit

	230dec6 (net/fec: add imx6q enet support)

which dropped the default line.

Best regards
Uwe
Shawn Guo - Nov. 11, 2011, 7:16 a.m.
On Thu, Nov 10, 2011 at 09:57:48AM +0100, Uwe Kleine-König wrote:
> On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
> > The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
> > which is not good, since FEC is useful for both developers and users.
> 
> $ git show d880db0^:drivers/net/Kconfig | grep -A4 'config FEC$'
> config FEC
> 	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
> 	depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
> 		IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC
> 	default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
> 
> So when d880db0 was created
> 
> 	make savedefconfig
> 
> dropped CONFIG_FEC=y justifiably. The culprit is commit
> 
> 	230dec6 (net/fec: add imx6q enet support)
> 
> which dropped the default line.
> 
Thanks for letting me know that's me :)

Anyway, I put what I see from 'git log -p arch/arm/configs/mx3_defconfig'
there.
Uwe Kleine-König - Nov. 11, 2011, 10:12 a.m.
On Fri, Nov 11, 2011 at 03:16:25PM +0800, Shawn Guo wrote:
> On Thu, Nov 10, 2011 at 09:57:48AM +0100, Uwe Kleine-König wrote:
> > On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
> > > The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
> > > which is not good, since FEC is useful for both developers and users.
> > 
> > $ git show d880db0^:drivers/net/Kconfig | grep -A4 'config FEC$'
> > config FEC
> > 	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
> > 	depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
> > 		IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC
> > 	default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
> > 
> > So when d880db0 was created
> > 
> > 	make savedefconfig
> > 
> > dropped CONFIG_FEC=y justifiably. The culprit is commit
> > 
> > 	230dec6 (net/fec: add imx6q enet support)
> > 
> > which dropped the default line.
> > 
> Thanks for letting me know that's me :)
:-)

I forgot to say that I prefer to add back the default line in Kconfig
instead of adding it to the defconfig again.

Best regards
Uwe
Sascha Hauer - Nov. 11, 2011, 3:58 p.m.
On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
> The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
> which is not good, since FEC is useful for both developers and users.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>

I skipped this one for now as I have hope to get the i.MX5 merge into
-rc which would remove this file. If not, I'll send this one later.

Sascha

> ---
>  arch/arm/configs/mx3_defconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig
> index cb0717f..ee50a9e 100644
> --- a/arch/arm/configs/mx3_defconfig
> +++ b/arch/arm/configs/mx3_defconfig
> @@ -67,6 +67,7 @@ CONFIG_SMSC_PHY=y
>  CONFIG_NET_ETHERNET=y
>  CONFIG_SMSC911X=y
>  CONFIG_DNET=y
> +CONFIG_FEC=y
>  # CONFIG_NETDEV_1000 is not set
>  # CONFIG_NETDEV_10000 is not set
>  # CONFIG_INPUT_MOUSEDEV is not set
> -- 
> 1.7.4.1
> 
>
Shawn Guo - Nov. 11, 2011, 11:26 p.m.
On Fri, Nov 11, 2011 at 04:58:51PM +0100, Sascha Hauer wrote:
> On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
> > The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
> > which is not good, since FEC is useful for both developers and users.
> > 
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > Cc: Sascha Hauer <s.hauer@pengutronix.de>
> 
> I skipped this one for now as I have hope to get the i.MX5 merge into
> -rc which would remove this file. If not, I'll send this one later.
> 
Sound good.

Patch

diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig
index cb0717f..ee50a9e 100644
--- a/arch/arm/configs/mx3_defconfig
+++ b/arch/arm/configs/mx3_defconfig
@@ -67,6 +67,7 @@  CONFIG_SMSC_PHY=y
 CONFIG_NET_ETHERNET=y
 CONFIG_SMSC911X=y
 CONFIG_DNET=y
+CONFIG_FEC=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_INPUT_MOUSEDEV is not set