block: sunxi_nand: merge sun[45]i_nand

backported from 3.4 branch
linux-sunxi · Aug 27, 2012 · a639ebe · a639ebe
1 parent 33f5b32
commit a639ebe
Show file tree

Hide file tree

Showing 90 changed files with 57 additions and 19,966 deletions.
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
@@ -539,18 +539,13 @@ config SUN3I_NANDFLASH_TEST
 	---help---
 	  Nand flash test driver for SUN3I
 
-config SUN4I_NANDFLASH
-        depends on BLOCK && ARCH_SUN4I
-        tristate "SUN4I Nandflash Driver"
-        ---help---
-          Nand flash driver for SUN4I
-
-config SUN5I_NANDFLASH
-	depends on BLOCK && ARCH_SUN5I
-	tristate "Nandflash Driver for A12/A13"
-	---help---
-	  Nand flash driver for A12/A13
-
-
+config SUNXI_NAND
+        depends on BLOCK
+	depends on ARCH_SUN4I || ARCH_SUN5I
+        tristate "SUNXI Nandflash Driver"
+
+config SUNXI_NAND_TEST
+	depends on SUNXI_NAND
+	tristate "SUNXI Nandflash Test Driver "
 
 endif # BLK_DEV
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
@@ -40,8 +40,7 @@ obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= xen-blkback/
 obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/
 obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o
 obj-$(CONFIG_SUN3I_NANDFLASH) += sun3i_nand/
-obj-$(CONFIG_SUN4I_NANDFLASH) += sun4i_nand/
-obj-$(CONFIG_SUN5I_NANDFLASH) += sun5i_nand/
+obj-$(CONFIG_SUNXI_NANDFLASH) += sunxi_nand/
 
 
 swim_mod-y	:= swim.o swim_asm.o
diff --git a/drivers/block/sun4i_nand/Makefile b/drivers/block/sun4i_nand/Makefile
diff --git a/drivers/block/sun4i_nand/include/sunii.h b/drivers/block/sun4i_nand/include/sunii.h
diff --git a/drivers/block/sun4i_nand/nandtest/Makefile b/drivers/block/sun4i_nand/nandtest/Makefile