summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-08-16 14:48:22 +0200
committerHans de Goede <hdegoede@redhat.com>2015-08-31 08:43:42 +0200
commite5268616878690037474ff36cb6efb350b5e1061 (patch)
treeeb18770a99f74016e4d986911bee20ab254595cd
parent24a06c964fd457238f16531d8ed1b660c4341676 (diff)
sunxi_nand_spl: Rename SPL_NAND_SUNXI to NAND_SUNXI
We eventually want to add full nand support, since it makes no sense to build SPL with nand support and u-boot without, or the other way around, a single option will suffice. Renaming the Kconfig option now makes things easier when we add full nand support in the future. The "obj-$(CONFIG_NAND_SUNXI) += sunxi_nand_spl.o" is moved to an "ifdef CONFIG_SPL_BUILD" block in the Makefile. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
-rw-r--r--board/sunxi/board.c2
-rw-r--r--drivers/mtd/nand/Kconfig18
-rw-r--r--drivers/mtd/nand/Makefile2
-rw-r--r--include/configs/sunxi-common.h2
4 files changed, 12 insertions, 12 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index d411e96c76..9c855f604d 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -108,7 +108,7 @@ int dram_init(void)
return 0;
}
-#if defined(CONFIG_SPL_NAND_SUNXI) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_NAND_SUNXI) && defined(CONFIG_SPL_BUILD)
static void nand_pinmux_setup(void)
{
unsigned int pin;
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 09c9668e10..1d08d28d0e 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -63,6 +63,14 @@ config NAND_PXA3XX
This enables the driver for the NAND flash device found on
PXA3xx processors (NFCv1) and also on Armada 370/XP (NFCv2).
+config NAND_SUNXI
+ bool "Support for NAND on Allwinner SoCs in SPL"
+ depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
+ select SYS_NAND_SELF_INIT
+ ---help---
+ Enable support for NAND. This option allows SPL to read from
+ sunxi NAND using DMA transfers.
+
comment "Generic NAND options"
# Enhance depends when converting drivers to Kconfig which use this config
@@ -92,18 +100,10 @@ config SPL_NAND_DENALI
This is a small implementation of the Denali NAND controller
for use on SPL.
-config SPL_NAND_SUNXI
- bool "Support for NAND on Allwinner SoCs in SPL"
- depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
- select SYS_NAND_SELF_INIT
- ---help---
- Enable support for NAND. This option allows SPL to read from
- sunxi NAND using DMA transfers.
-
config NAND_SUNXI_SPL_SYNDROME_PARTITIONS_END
hex "Size of syndrome partitions in sunxi NAND"
default 0x400000
- depends on SPL_NAND_SUNXI
+ depends on NAND_SUNXI
---help---
End address for boot partitions on NAND. Those partitions have a
different random seed that has to match the sunxi BROM setting.
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 64d1675d0a..71c1a519e9 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -12,7 +12,6 @@ NORMAL_DRIVERS=y
endif
obj-$(CONFIG_SPL_NAND_AM33XX_BCH) += am335x_spl_bch.o
-obj-$(CONFIG_SPL_NAND_SUNXI) += sunxi_nand_spl.o
obj-$(CONFIG_SPL_NAND_DENALI) += denali_spl.o
obj-$(CONFIG_SPL_NAND_DOCG4) += docg4_spl.o
obj-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o
@@ -77,5 +76,6 @@ obj-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_spl.o
obj-$(CONFIG_NAND_FSL_IFC) += fsl_ifc_spl.o
obj-$(CONFIG_NAND_MXC) += mxc_nand_spl.o
obj-$(CONFIG_NAND_MXS) += mxs_nand_spl.o mxs_nand.o
+obj-$(CONFIG_NAND_SUNXI) += sunxi_nand_spl.o
endif # drivers
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 3735afbafc..519c99cdaa 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -137,7 +137,7 @@
#define CONFIG_INITRD_TAG
#define CONFIG_SERIAL_TAG
-#if defined(CONFIG_SPL_NAND_SUNXI)
+#ifdef CONFIG_NAND_SUNXI
#define CONFIG_SPL_NAND_SUPPORT 1
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x008000
#endif