diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
| commit | 88107f6e121a3a1835aa261a39a0a284e06457ce (patch) | |
| tree | b8f7a1618c29215aa3bfa0c24fe99bdffb4da650 /arch/arm/mach-imx | |
| parent | ae982001331215adb009cc93701401623b2a94d7 (diff) | |
| parent | 0d98114eb218aa80379b82192499e4c91d64123c (diff) | |
| download | barebox-88107f6e121a3a1835aa261a39a0a284e06457ce.tar.gz barebox-88107f6e121a3a1835aa261a39a0a284e06457ce.tar.xz | |
Merge branch 'for-next/randconfig'
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 8 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/external-nand-boot.c (renamed from arch/arm/mach-imx/internal-nand-boot.c) | 0 |
3 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 5b7724561a..9afd6150d9 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -6,7 +6,6 @@ config ARCH_TEXT_BASE default 0xa0000000 if MACH_EUKREA_CPUIMX27 default 0x87f00000 if MACH_EUKREA_CPUIMX35 default 0x97f00000 if MACH_EUKREA_CPUIMX51SD - default 0x08f00000 if MACH_MX1ADS default 0xc0000000 if MACH_IMX21ADS default 0xa0000000 if MACH_IMX27ADS default 0x83f00000 if MACH_FREESCALE_MX25_3STACK && FREESCALE_MX25_3STACK_SDRAM_64MB_DDR2 @@ -110,6 +109,7 @@ config NAND_IMX_BOOT config ARCH_IMX_EXTERNAL_BOOT_NAND bool + depends on !ARCH_IMX1 prompt "Support Starting barebox from NAND" depends on ARCH_IMX_EXTERNAL_BOOT @@ -186,12 +186,6 @@ choice prompt "i.MX1 Board Type" -config MACH_MX1ADS - bool "mx1ads" - select HAS_CS8900 - help - Say Y here if you are using the Motorola MX1ADS board - config MACH_SCB9328 bool "Synertronixx scb9328" select HAS_DM9000 diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 03e24218c1..89a89466ba 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_ARCH_IMX6) += speed-imx6.o imx6.o iomux-v3.o obj-$(CONFIG_IMX_CLKO) += clko.o obj-$(CONFIG_IMX_IIM) += iim.o obj-$(CONFIG_NAND_IMX) += nand.o -obj-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += internal-nand-boot.o +obj-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o obj-y += speed.o obj-y += devices.o obj-y += boot.o diff --git a/arch/arm/mach-imx/internal-nand-boot.c b/arch/arm/mach-imx/external-nand-boot.c index e72a94457b..e72a94457b 100644 --- a/arch/arm/mach-imx/internal-nand-boot.c +++ b/arch/arm/mach-imx/external-nand-boot.c |