[PATCH 16/16] eukrea_cpuimx25&35: update defconfig
Sascha Hauer
s.hauer at pengutronix.de
Thu May 17 13:45:44 EDT 2012
On Thu, May 17, 2012 at 05:46:18PM +0200, Eric Bénard wrote:
> Signed-off-by: Eric Bénard <eric at eukrea.com>
> ---
> arch/arm/configs/eukrea_cpuimx25_defconfig | 10 +++-------
> arch/arm/configs/eukrea_cpuimx35_defconfig | 9 +++------
That's the third time these defconfigs are updated in this series. Is
this necessary?
Sascha
> 2 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/configs/eukrea_cpuimx25_defconfig b/arch/arm/configs/eukrea_cpuimx25_defconfig
> index 32833f8..94ae670 100644
> --- a/arch/arm/configs/eukrea_cpuimx25_defconfig
> +++ b/arch/arm/configs/eukrea_cpuimx25_defconfig
> @@ -13,7 +13,6 @@ CONFIG_GLOB=y
> CONFIG_HUSH_FANCY_PROMPT=y
> CONFIG_CMDLINE_EDITING=y
> CONFIG_AUTO_COMPLETE=y
> -CONFIG_MENU=y
> # CONFIG_CONSOLE_ACTIVATE_FIRST is not set
> CONFIG_CONSOLE_ACTIVATE_ALL=y
> CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
> @@ -24,8 +23,6 @@ CONFIG_CMD_SAVEENV=y
> CONFIG_CMD_EXPORT=y
> CONFIG_CMD_PRINTENV=y
> CONFIG_CMD_READLINE=y
> -CONFIG_CMD_MENU=y
> -CONFIG_CMD_MENU_MANAGEMENT=y
> CONFIG_CMD_AUTOMOUNT=y
> CONFIG_CMD_ECHO_E=y
> CONFIG_CMD_LOADB=y
> @@ -50,13 +47,14 @@ CONFIG_CMD_GPIO=y
> CONFIG_CMD_UNCOMPRESS=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_LED=y
> +CONFIG_CMD_LED_TRIGGER=y
> CONFIG_NET=y
> CONFIG_NET_DHCP=y
> +CONFIG_NET_NFS=y
> CONFIG_NET_PING=y
> CONFIG_NET_TFTP=y
> CONFIG_NET_TFTP_PUSH=y
> CONFIG_NET_NETCONSOLE=y
> -CONFIG_NET_RESOLV=y
> CONFIG_DRIVER_NET_FEC_IMX=y
> # CONFIG_SPI is not set
> CONFIG_I2C=y
> @@ -64,9 +62,6 @@ CONFIG_I2C_IMX=y
> CONFIG_MTD=y
> CONFIG_MTD_RAW_DEVICE=y
> CONFIG_NAND=y
> -# CONFIG_NAND_ECC_SOFT is not set
> -# CONFIG_NAND_ECC_HW_SYNDROME is not set
> -# CONFIG_NAND_ECC_HW_NONE is not set
> CONFIG_NAND_IMX=y
> CONFIG_USB=y
> CONFIG_USB_EHCI=y
> @@ -80,6 +75,7 @@ CONFIG_MCI=y
> CONFIG_MCI_IMX_ESDHC=y
> CONFIG_LED=y
> CONFIG_LED_GPIO=y
> +CONFIG_LED_TRIGGERS=y
> CONFIG_FS_FAT=y
> CONFIG_FS_FAT_WRITE=y
> CONFIG_FS_FAT_LFN=y
> diff --git a/arch/arm/configs/eukrea_cpuimx35_defconfig b/arch/arm/configs/eukrea_cpuimx35_defconfig
> index 44be126..a888765 100644
> --- a/arch/arm/configs/eukrea_cpuimx35_defconfig
> +++ b/arch/arm/configs/eukrea_cpuimx35_defconfig
> @@ -14,7 +14,6 @@ CONFIG_GLOB=y
> CONFIG_HUSH_FANCY_PROMPT=y
> CONFIG_CMDLINE_EDITING=y
> CONFIG_AUTO_COMPLETE=y
> -CONFIG_MENU=y
> # CONFIG_CONSOLE_ACTIVATE_FIRST is not set
> CONFIG_CONSOLE_ACTIVATE_ALL=y
> CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
> @@ -25,8 +24,6 @@ CONFIG_CMD_SAVEENV=y
> CONFIG_CMD_EXPORT=y
> CONFIG_CMD_PRINTENV=y
> CONFIG_CMD_READLINE=y
> -CONFIG_CMD_MENU=y
> -CONFIG_CMD_MENU_MANAGEMENT=y
> CONFIG_CMD_AUTOMOUNT=y
> CONFIG_CMD_ECHO_E=y
> CONFIG_CMD_LOADB=y
> @@ -51,8 +48,10 @@ CONFIG_CMD_GPIO=y
> CONFIG_CMD_UNCOMPRESS=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_LED=y
> +CONFIG_CMD_LED_TRIGGER=y
> CONFIG_NET=y
> CONFIG_NET_DHCP=y
> +CONFIG_NET_NFS=y
> CONFIG_NET_PING=y
> CONFIG_NET_TFTP=y
> CONFIG_NET_TFTP_PUSH=y
> @@ -64,9 +63,6 @@ CONFIG_I2C_IMX=y
> CONFIG_MTD=y
> CONFIG_MTD_RAW_DEVICE=y
> CONFIG_NAND=y
> -# CONFIG_NAND_ECC_SOFT is not set
> -# CONFIG_NAND_ECC_HW_SYNDROME is not set
> -# CONFIG_NAND_ECC_HW_NONE is not set
> CONFIG_NAND_IMX=y
> CONFIG_USB=y
> CONFIG_USB_EHCI=y
> @@ -80,6 +76,7 @@ CONFIG_MCI=y
> CONFIG_MCI_IMX_ESDHC=y
> CONFIG_LED=y
> CONFIG_LED_GPIO=y
> +CONFIG_LED_TRIGGERS=y
> CONFIG_FS_FAT=y
> CONFIG_FS_FAT_WRITE=y
> CONFIG_FS_FAT_LFN=y
> --
> 1.7.7.6
>
>
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the barebox
mailing list