On Fri, Jul 08, 2016 at 09:35:48AM +0200, Uwe Kleine-König wrote:
> The first is important for imx systems with NAND. The second is a useful
> debug aid that doesn't change behaviour without being explicitly enabled
> at runtime. So both should be safe.
>
> The other changes result from MFD_MC13XXX and SPI_IMX being selected by
> MACH_PCM038 since 4bd07a103982 ("arm: imx: select MFD_MC13XXX for all
> boards that need it") and a move of a few Kconfig definitions in
> 7839011f61c0 ("bootm: Move bootm options to common/Kconfig").
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
> arch/arm/configs/imx_defconfig | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/configs/imx_defconfig b/arch/arm/configs/imx_defconfig
> index 886bcefd9b68..69ab021e25ae 100644
> --- a/arch/arm/configs/imx_defconfig
> +++ b/arch/arm/configs/imx_defconfig
> @@ -19,6 +19,10 @@ CONFIG_HUSH_FANCY_PROMPT=y
> CONFIG_CMDLINE_EDITING=y
> CONFIG_AUTO_COMPLETE=y
> CONFIG_MENU=y
> +CONFIG_BOOTM_SHOW_TYPE=y
> +CONFIG_BOOTM_VERBOSE=y
> +CONFIG_BOOTM_INITRD=y
> +CONFIG_BOOTM_OFTREE=y
> CONFIG_BLSPEC=y
> CONFIG_CONSOLE_ACTIVATE_NONE=y
> CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
> @@ -26,10 +30,6 @@ CONFIG_RESET_SOURCE=y
> CONFIG_LONGHELP=y
> CONFIG_CMD_IOMEM=y
> CONFIG_CMD_MEMINFO=y
> -CONFIG_BOOTM_SHOW_TYPE=y
> -CONFIG_BOOTM_VERBOSE=y
> -CONFIG_BOOTM_INITRD=y
> -CONFIG_BOOTM_OFTREE=y
> # CONFIG_CMD_BOOTU is not set
> CONFIG_CMD_GO=y
> CONFIG_CMD_RESET=y
> @@ -79,7 +79,6 @@ CONFIG_OF_BAREBOX_DRIVERS=y
> CONFIG_DRIVER_NET_FEC_IMX=y
> CONFIG_NET_USB=y
> CONFIG_NET_USB_ASIX=y
> -CONFIG_DRIVER_SPI_IMX=y
> CONFIG_I2C=y
> CONFIG_I2C_IMX=y
> CONFIG_MTD=y
> @@ -89,7 +88,9 @@ CONFIG_CFI_BUFFER_WRITE=y
> CONFIG_NAND=y
> # CONFIG_NAND_ECC_SOFT is not set
> # CONFIG_NAND_ECC_HW_SYNDROME is not set
> +CONFIG_NAND_ALLOW_ERASE_BAD=y
> CONFIG_NAND_IMX=y
> +CONFIG_NAND_IMX_BBM=y
> CONFIG_MTD_UBI=y
> CONFIG_MTD_UBI_FASTMAP=y
> CONFIG_USB_HOST=y
> @@ -97,7 +98,6 @@ CONFIG_USB_EHCI=y
> CONFIG_USB_ULPI=y
> CONFIG_MCI=y
> CONFIG_MCI_IMX=y
> -CONFIG_MFD_MC13XXX=y
> CONFIG_LED=y
> CONFIG_LED_GPIO=y
> CONFIG_LED_GPIO_OF=y
> --
> 2.8.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> 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 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
