diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:53:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:53:59 +0100 |
| commit | 86916569a811a07eb1b5a4044fc4f04aeb75383c (patch) | |
| tree | 18652b7fd46eb31c2887fae90a85fb793ec75569 /arch/arm/mach-imx/Kconfig | |
| parent | 1e5b933b5d2538ea0ffeb86537c3996348ef9c64 (diff) | |
| parent | d91a9642518806f9320e67f5b2c8be9347602c48 (diff) | |
| download | barebox-86916569a811a07eb1b5a4044fc4f04aeb75383c.tar.gz barebox-86916569a811a07eb1b5a4044fc4f04aeb75383c.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 53d91bc070..a931de921e 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -102,11 +102,13 @@ endchoice config ARCH_IMX_EXTERNAL_BOOT_NAND bool + depends on MTD depends on ARCH_IMX25 || ARCH_IMX27 || ARCH_IMX31 || ARCH_IMX35 prompt "Support Starting barebox from NAND in external bootmode" config BAREBOX_UPDATE_IMX_EXTERNAL_NAND bool + depends on MTD depends on ARCH_IMX_EXTERNAL_BOOT_NAND depends on BAREBOX_UPDATE depends on MTD @@ -115,6 +117,7 @@ config BAREBOX_UPDATE_IMX_EXTERNAL_NAND config BAREBOX_UPDATE_IMX6_NAND bool + depends on MTD depends on ARCH_IMX6 depends on BAREBOX_UPDATE depends on MTD @@ -174,6 +177,11 @@ config ARCH_IMX6 select CPU_V7 select PINCTRL_IMX_IOMUX_V3 +config ARCH_IMX6SX + bool + select ARCH_IMX6 + select COMMON_CLK_OF_PROVIDER + config IMX_MULTI_BOARDS bool "Allow multiple boards to be selected" select HAVE_DEFAULT_ENVIRONMENT_NEW @@ -293,6 +301,12 @@ config MACH_SABRESD bool "Freescale i.MX6 SabreSD" select ARCH_IMX6 +config MACH_FREESCALE_IMX6SX_SABRESDB + bool "Freescale i.MX6sx SabreSDB" + select ARCH_IMX6SX + select I2C + select I2C_IMX + config MACH_NITROGEN6X bool "BoundaryDevices Nitrogen6x" select ARCH_IMX6 |