summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2010-10-03 04:54:26 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-10-04 08:35:49 +0200
commit656f0370c1a572996fd8c7e284f7052aae89ccb1 (patch)
tree0a8daaf89ab50d21208e58c499804e8aecaa1a17
parent43c1881110b28f42c58d45465a6b8cad06540ad0 (diff)
downloadbarebox-656f0370c1a572996fd8c7e284f7052aae89ccb1.tar.gz
barebox-656f0370c1a572996fd8c7e284f7052aae89ccb1.tar.xz
imx: fix Internal boot source default choice
via default ARCH_IMX_INTERNAL_BOOT_NAND and not default y on ARCH_IMX_INTERNAL_BOOT_NAND Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 8a4e1ee268..4f95393e00 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -43,6 +43,7 @@ config ARCH_IMX_INTERNAL_BOOT
choice
depends on ARCH_IMX_INTERNAL_BOOT
prompt "Internal boot source"
+ default ARCH_IMX_INTERNAL_BOOT_NAND
help
Determines the location of the header information for internal boot.
0x100 for OneNAND
@@ -50,7 +51,6 @@ choice
0x1000 for NOR
config ARCH_IMX_INTERNAL_BOOT_NAND
- default y
bool "NAND, SD/MMC, Serial ROM"
select NAND_IMX_BOOT