diff mbox

arm: mxs: Update mxs_defconfig

Message ID 1356055651-27145-1-git-send-email-marex@denx.de
State New
Headers show

Commit Message

Marek Vasut Dec. 21, 2012, 2:07 a.m. UTC
Regenerate the mxs_defconfig to match recent kernel using the following
commands:

make mxs_defconfig
make savedefconfig
cp defconfig arch/arm/configs/mxs_defconfig

Then enable these features:
- MTD block access
- UBI and UBIFS
- JFFS2
- EXT2 and EXT4
- AT24 EEPROM support
- Support for most of the SPI flashes
- Support for ethernet PHYs that are usually used on mxs designs

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/configs/mxs_defconfig |   63 +++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 33 deletions(-)

NOTE: The SGTL5000 is enabled by default, it's not enabled by hand thus not
      listed above

Comments

Shawn Guo Dec. 25, 2012, 1:23 p.m. UTC | #1
On Fri, Dec 21, 2012 at 03:07:31AM +0100, Marek Vasut wrote:
> Regenerate the mxs_defconfig to match recent kernel using the following
> commands:
> 
> make mxs_defconfig
> make savedefconfig
> cp defconfig arch/arm/configs/mxs_defconfig
> 
> Then enable these features:
> - MTD block access
> - UBI and UBIFS
> - JFFS2
> - EXT2 and EXT4
> - AT24 EEPROM support
> - Support for most of the SPI flashes
> - Support for ethernet PHYs that are usually used on mxs designs
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>

Applied with one comment below to Fabio.

> ---
>  arch/arm/configs/mxs_defconfig |   63 +++++++++++++++++++---------------------
>  1 file changed, 30 insertions(+), 33 deletions(-)
> 
> NOTE: The SGTL5000 is enabled by default, it's not enabled by hand thus not
>       listed above
> 
> diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
> index 048aaca..9d30a6b 100644
> --- a/arch/arm/configs/mxs_defconfig
> +++ b/arch/arm/configs/mxs_defconfig
> @@ -1,5 +1,7 @@
>  CONFIG_EXPERIMENTAL=y
>  CONFIG_SYSVIPC=y
> +CONFIG_NO_HZ=y
> +CONFIG_HIGH_RES_TIMERS=y
>  CONFIG_TASKSTATS=y
>  CONFIG_TASK_DELAY_ACCT=y
>  CONFIG_TASK_XACCT=y
> @@ -8,7 +10,6 @@ CONFIG_IKCONFIG=y
>  CONFIG_IKCONFIG_PROC=y
>  # CONFIG_UTS_NS is not set
>  # CONFIG_IPC_NS is not set
> -# CONFIG_USER_NS is not set
>  # CONFIG_PID_NS is not set
>  # CONFIG_NET_NS is not set
>  CONFIG_PERF_EVENTS=y
> @@ -24,8 +25,6 @@ CONFIG_BLK_DEV_INTEGRITY=y
>  CONFIG_ARCH_MXS=y
>  CONFIG_MACH_MXS_DT=y
>  # CONFIG_ARM_THUMB is not set
> -CONFIG_NO_HZ=y
> -CONFIG_HIGH_RES_TIMERS=y
>  CONFIG_PREEMPT_VOLUNTARY=y
>  CONFIG_AEABI=y
>  CONFIG_AUTO_ZRELADDR=y
> @@ -46,23 +45,31 @@ CONFIG_SYN_COOKIES=y
>  CONFIG_CAN=m
>  CONFIG_CAN_RAW=m
>  CONFIG_CAN_BCM=m
> -CONFIG_CAN_DEV=m
>  CONFIG_CAN_FLEXCAN=m
>  # CONFIG_WIRELESS is not set
>  CONFIG_DEVTMPFS=y
>  # CONFIG_FIRMWARE_IN_KERNEL is not set
> -# CONFIG_BLK_DEV is not set
>  CONFIG_MTD=y
> +CONFIG_MTD_CMDLINE_PARTS=y
>  CONFIG_MTD_CHAR=y
> +CONFIG_MTD_BLOCK=y
>  CONFIG_MTD_DATAFLASH=y
> -CONFIG_MTD_M25P80
> +CONFIG_MTD_M25P80=y

Fabio,

I do not think it's reasonable to ask Marek to drop this change from
his patch, as the change is probably included here because of
savedefconfig.  So I will have to drop your patch below.  Sorry.

[PATCH] ARM: mxs_defconfig: Fix MTD_M25P80 selection
http://article.gmane.org/gmane.linux.ports.arm.kernel/203788

Shawn

> +# CONFIG_M25PXX_USE_FAST_READ is not set
> +CONFIG_MTD_SST25L=y
>  CONFIG_MTD_NAND=y
>  CONFIG_MTD_NAND_GPMI_NAND=y
> +CONFIG_MTD_UBI=y
> +# CONFIG_BLK_DEV is not set
> +CONFIG_EEPROM_AT24=y
> +CONFIG_SCSI=y
> +CONFIG_BLK_DEV_SD=y
>  CONFIG_NETDEVICES=y
> -CONFIG_NET_ETHERNET=y
>  CONFIG_ENC28J60=y
> -# CONFIG_NETDEV_1000 is not set
> -# CONFIG_NETDEV_10000 is not set
> +CONFIG_SMSC_PHY=y
> +CONFIG_ICPLUS_PHY=y
> +CONFIG_REALTEK_PHY=y
> +CONFIG_MICREL_PHY=y
>  # CONFIG_WLAN is not set
>  # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
>  CONFIG_INPUT_EVDEV=m
> @@ -89,21 +96,6 @@ CONFIG_SPI_MXS=y
>  CONFIG_DEBUG_GPIO=y
>  CONFIG_GPIO_SYSFS=y
>  # CONFIG_HWMON is not set
> -# CONFIG_MFD_SUPPORT is not set
> -CONFIG_DISPLAY_SUPPORT=m
> -# CONFIG_HID_SUPPORT is not set
> -CONFIG_SOUND=y
> -CONFIG_SND=y
> -CONFIG_SND_TIMER=y
> -CONFIG_SND_PCM=y
> -CONFIG_SND_JACK=y
> -CONFIG_SND_DRIVERS=y
> -CONFIG_SND_ARM=y
> -CONFIG_SND_SOC=y
> -CONFIG_SND_MXS_SOC=y
> -CONFIG_SND_SOC_MXS_SGTL5000=y
> -CONFIG_SND_SOC_I2C_AND_SPI=y
> -CONFIG_SND_SOC_SGTL5000=y
>  CONFIG_REGULATOR=y
>  CONFIG_REGULATOR_FIXED_VOLTAGE=y
>  CONFIG_FB=y
> @@ -115,13 +107,16 @@ CONFIG_BACKLIGHT_PWM=y
>  CONFIG_FRAMEBUFFER_CONSOLE=y
>  CONFIG_FONTS=y
>  CONFIG_LOGO=y
> +CONFIG_SOUND=y
> +CONFIG_SND=y
> +CONFIG_SND_SOC=y
> +CONFIG_SND_MXS_SOC=y
> +CONFIG_SND_SOC_MXS_SGTL5000=y
>  CONFIG_USB=y
>  CONFIG_USB_CHIPIDEA=y
>  CONFIG_USB_CHIPIDEA_HOST=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_MXS_PHY=y
> -CONFIG_SCSI=y
> -CONFIG_BLK_DEV_SD=y
>  CONFIG_MMC=y
>  CONFIG_MMC_MXS=y
>  CONFIG_NEW_LEDS=y
> @@ -145,16 +140,23 @@ CONFIG_COMMON_CLK_DEBUG=y
>  CONFIG_IIO=y
>  CONFIG_PWM=y
>  CONFIG_PWM_MXS=y
> +CONFIG_EXT2_FS=y
> +CONFIG_EXT2_FS_XATTR=y
>  CONFIG_EXT3_FS=y
> +CONFIG_EXT4_FS=y
>  # CONFIG_DNOTIFY is not set
>  CONFIG_FSCACHE=m
>  CONFIG_FSCACHE_STATS=y
>  CONFIG_CACHEFILES=m
>  CONFIG_TMPFS=y
>  CONFIG_TMPFS_POSIX_ACL=y
> -# CONFIG_MISC_FILESYSTEMS is not set
> +CONFIG_JFFS2_FS=y
> +CONFIG_JFFS2_COMPRESSION_OPTIONS=y
> +CONFIG_JFFS2_LZO=y
> +CONFIG_JFFS2_RUBIN=y
> +CONFIG_UBIFS_FS=y
> +CONFIG_UBIFS_FS_ADVANCED_COMPR=y
>  CONFIG_NFS_FS=y
> -CONFIG_NFS_V3=y
>  CONFIG_NFS_V3_ACL=y
>  CONFIG_NFS_V4=y
>  CONFIG_ROOT_NFS=y
> @@ -164,17 +166,12 @@ CONFIG_MAGIC_SYSRQ=y
>  CONFIG_UNUSED_SYMBOLS=y
>  CONFIG_DEBUG_KERNEL=y
>  CONFIG_LOCKUP_DETECTOR=y
> -CONFIG_DETECT_HUNG_TASK=y
>  CONFIG_TIMER_STATS=y
>  CONFIG_PROVE_LOCKING=y
> -CONFIG_DEBUG_SPINLOCK_SLEEP=y
>  CONFIG_DEBUG_INFO=y
> -CONFIG_SYSCTL_SYSCALL_CHECK=y
>  CONFIG_BLK_DEV_IO_TRACE=y
>  CONFIG_STRICT_DEVMEM=y
>  CONFIG_DEBUG_USER=y
> -CONFIG_CRYPTO=y
> -CONFIG_CRYPTO_CRC32C=m
>  # CONFIG_CRYPTO_ANSI_CPRNG is not set
>  # CONFIG_CRYPTO_HW is not set
>  CONFIG_CRC_ITU_T=m
> -- 
> 1.7.10.4
>
Fabio Estevam Dec. 25, 2012, 1:27 p.m. UTC | #2
On Tue, Dec 25, 2012 at 11:23 AM, Shawn Guo <shawn.guo@linaro.org> wrote:

> Fabio,
>
> I do not think it's reasonable to ask Marek to drop this change from
> his patch, as the change is probably included here because of
> savedefconfig.  So I will have to drop your patch below.  Sorry.
>
> [PATCH] ARM: mxs_defconfig: Fix MTD_M25P80 selection
> http://article.gmane.org/gmane.linux.ports.arm.kernel/203788

No problem, Shawn.

Marek's patch is complete and fix the issue from my previous patch, so
it makes sense to use only Marek's patch instead.

Regards,

Fabio Estevam
Fabio Estevam Jan. 15, 2013, 7:31 p.m. UTC | #3
Shawn,

On Tue, Dec 25, 2012 at 11:23 AM, Shawn Guo <shawn.guo@linaro.org> wrote:

> Applied with one comment below to Fabio.

Which tree this was applied?

I would like to make another update and base my patch on top of Marek's patch.
Shawn Guo Jan. 17, 2013, 1:20 a.m. UTC | #4
On Tue, Jan 15, 2013 at 05:31:05PM -0200, Fabio Estevam wrote:
> Shawn,
> 
> On Tue, Dec 25, 2012 at 11:23 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> 
> > Applied with one comment below to Fabio.
> 
> Which tree this was applied?
> 
Just pushed out branch mxs/soc.

Shawn
Marek Vasut Jan. 17, 2013, 1:22 a.m. UTC | #5
Dear Shawn Guo,

> On Tue, Jan 15, 2013 at 05:31:05PM -0200, Fabio Estevam wrote:
> > Shawn,
> > 
> > On Tue, Dec 25, 2012 at 11:23 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > > Applied with one comment below to Fabio.
> > 
> > Which tree this was applied?
> 
> Just pushed out branch mxs/soc.

Do you think this can be made a stable matter for 3.7 ? It's a defconfig update 
afterall and it help a great deal.

> Shawn

Best regards,
Marek Vasut
Shawn Guo Jan. 17, 2013, 2:12 a.m. UTC | #6
On Thu, Jan 17, 2013 at 02:22:50AM +0100, Marek Vasut wrote:
> Do you think this can be made a stable matter for 3.7 ? It's a defconfig update 
> afterall and it help a great deal.
> 
No, I don't think so.  Sorry.

Shawn
Marek Vasut March 3, 2013, 9:28 p.m. UTC | #7
Dear Shawn Guo,

> On Thu, Jan 17, 2013 at 02:22:50AM +0100, Marek Vasut wrote:
> > Do you think this can be made a stable matter for 3.7 ? It's a defconfig
> > update afterall and it help a great deal.
> 
> No, I don't think so.  Sorry.

Was this patch ever applied? I can't find it in 3.8 nor in -next :-(

Best regards,
Marek Vasut
Shawn Guo March 4, 2013, 1:07 a.m. UTC | #8
On Sun, Mar 03, 2013 at 10:28:25PM +0100, Marek Vasut wrote:
> Dear Shawn Guo,
> 
> > On Thu, Jan 17, 2013 at 02:22:50AM +0100, Marek Vasut wrote:
> > > Do you think this can be made a stable matter for 3.7 ? It's a defconfig
> > > update afterall and it help a great deal.
> > 
> > No, I don't think so.  Sorry.
> 
> Was this patch ever applied? I can't find it in 3.8 nor in -next :-(

Isn't it on mainline right now as 77d168a (ARM: mxs: Update mxs_defconfig)?

Shawn
Marek Vasut March 4, 2013, 12:15 p.m. UTC | #9
Dear Shawn Guo,

> On Sun, Mar 03, 2013 at 10:28:25PM +0100, Marek Vasut wrote:
> > Dear Shawn Guo,
> > 
> > > On Thu, Jan 17, 2013 at 02:22:50AM +0100, Marek Vasut wrote:
> > > > Do you think this can be made a stable matter for 3.7 ? It's a
> > > > defconfig update afterall and it help a great deal.
> > > 
> > > No, I don't think so.  Sorry.
> > 
> > Was this patch ever applied? I can't find it in 3.8 nor in -next :-(
> 
> Isn't it on mainline right now as 77d168a (ARM: mxs: Update mxs_defconfig)?

So it's a 3.9 matter then ?

Best regards,
Marek Vasut
diff mbox

Patch

diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 048aaca..9d30a6b 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -1,5 +1,7 @@ 
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
@@ -8,7 +10,6 @@  CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_UTS_NS is not set
 # CONFIG_IPC_NS is not set
-# CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
 # CONFIG_NET_NS is not set
 CONFIG_PERF_EVENTS=y
@@ -24,8 +25,6 @@  CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_ARCH_MXS=y
 CONFIG_MACH_MXS_DT=y
 # CONFIG_ARM_THUMB is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
 CONFIG_AUTO_ZRELADDR=y
@@ -46,23 +45,31 @@  CONFIG_SYN_COOKIES=y
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
-CONFIG_CAN_DEV=m
 CONFIG_CAN_FLEXCAN=m
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_BLK_DEV is not set
 CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
 CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80
+CONFIG_MTD_M25P80=y
+# CONFIG_M25PXX_USE_FAST_READ is not set
+CONFIG_MTD_SST25L=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_GPMI_NAND=y
+CONFIG_MTD_UBI=y
+# CONFIG_BLK_DEV is not set
+CONFIG_EEPROM_AT24=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
 CONFIG_ENC28J60=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
+CONFIG_SMSC_PHY=y
+CONFIG_ICPLUS_PHY=y
+CONFIG_REALTEK_PHY=y
+CONFIG_MICREL_PHY=y
 # CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=m
@@ -89,21 +96,6 @@  CONFIG_SPI_MXS=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
-# CONFIG_MFD_SUPPORT is not set
-CONFIG_DISPLAY_SUPPORT=m
-# CONFIG_HID_SUPPORT is not set
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_JACK=y
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_ARM=y
-CONFIG_SND_SOC=y
-CONFIG_SND_MXS_SOC=y
-CONFIG_SND_SOC_MXS_SGTL5000=y
-CONFIG_SND_SOC_I2C_AND_SPI=y
-CONFIG_SND_SOC_SGTL5000=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_FB=y
@@ -115,13 +107,16 @@  CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FONTS=y
 CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_MXS_SOC=y
+CONFIG_SND_SOC_MXS_SGTL5000=y
 CONFIG_USB=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_MXS_PHY=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_MMC=y
 CONFIG_MMC_MXS=y
 CONFIG_NEW_LEDS=y
@@ -145,16 +140,23 @@  CONFIG_COMMON_CLK_DEBUG=y
 CONFIG_IIO=y
 CONFIG_PWM=y
 CONFIG_PWM_MXS=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
 # CONFIG_DNOTIFY is not set
 CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
 CONFIG_CACHEFILES=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
@@ -164,17 +166,12 @@  CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOCKUP_DETECTOR=y
-CONFIG_DETECT_HUNG_TASK=y
 CONFIG_TIMER_STATS=y
 CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_DEBUG_INFO=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_DEBUG_USER=y
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
 CONFIG_CRC_ITU_T=m