summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2016-06-06 10:16:57 +0200
committerScott Wood <oss@buserror.net>2016-06-19 19:11:48 -0500
commit494e108651a3c55b85d060202e941e4d8d68ce5e (patch)
tree108717efbc7a03f07c18677db981c5d5df0b13a4
parentc4adf9db5d382be6d13a19585f28de6f3e4e3d61 (diff)
downloadu-boot-imx-494e108651a3c55b85d060202e941e4d8d68ce5e.zip
u-boot-imx-494e108651a3c55b85d060202e941e4d8d68ce5e.tar.gz
u-boot-imx-494e108651a3c55b85d060202e941e4d8d68ce5e.tar.bz2
spl: nand: rework SYS_NAND_U_BOOT_OFFS Kconfig option dependency
The SYS_NAND_U_BOOT_OFFS is quite generic, but the Kconfig entry is forced to explicitly depend on platforms that are not already defining it in their include/configs/<board>.h header. Add the SYS_NAND_U_BOOT_LOCATIONS option, make the SYS_NAND_U_BOOT_OFFS depends on it, remove the dependency on NAND_SUNXI and make it dependent on SPL selection. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--drivers/mtd/nand/Kconfig15
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 2fc73ef..5fe169f 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -99,17 +99,24 @@ config SYS_NAND_BUSWIDTH_16BIT
not available while configuring controller. So a static CONFIG_NAND_xx
is needed to know the device's bus-width in advance.
-# Enhance depends when converting drivers to Kconfig which use this config
+if SPL
+
+config SYS_NAND_U_BOOT_LOCATIONS
+ bool "Define U-boot binaries locations in NAND"
+ help
+ Enable CONFIG_SYS_NAND_U_BOOT_OFFS though Kconfig.
+ This option should not be enabled when compiling U-boot for boards
+ defining CONFIG_SYS_NAND_U_BOOT_OFFS in their include/configs/<board>.h
+ file.
+
config SYS_NAND_U_BOOT_OFFS
hex "Location in NAND to read U-Boot from"
default 0x8000 if NAND_SUNXI
- depends on NAND_SUNXI
+ depends on SYS_NAND_U_BOOT_LOCATIONS
help
Set the offset from the start of the nand where u-boot should be
loaded from.
-if SPL
-
config SPL_NAND_DENALI
bool "Support Denali NAND controller for SPL"
help