From d482a8dfba417c6554f054ca74281d8d32384ed7 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 27 Feb 2017 18:22:10 +0100
Subject: [PATCH] sunxi: Enable UBI and NAND support

Enable the NAND and UBI support in the configuration header so that we can
(finally) use it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Jagan Teki <jagan@openedev.com>
---
 cmd/Kconfig                    | 4 ++++
 include/configs/sunxi-common.h | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 661bee20c5..85fe728569 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -452,12 +452,14 @@ config CMD_MMC
 
 config CMD_NAND
 	bool "nand"
+	default y if ARCH_SUNXI
 	help
 	  NAND support.
 
 if CMD_NAND
 config CMD_NAND_TRIMFFS
 	bool "nand write.trimffs"
+	default y if ARCH_SUNXI
 	help
 	  Allows one to skip empty pages when flashing something on a NAND.
 
@@ -845,6 +847,7 @@ config CMD_UBI
 	tristate "Enable UBI - Unsorted block images commands"
 	select CRC32
 	select MTD_UBI
+	default y if ARCH_SUNXI
 	help
 	  UBI is a software layer above MTD layer which admits use of LVM-like
 	  logical volumes on top of MTD devices, hides some complexities of
@@ -858,6 +861,7 @@ config CMD_UBIFS
 	select CRC32
 	select RBTREE if ARCH_SUNXI
 	select LZO if ARCH_SUNXI
+	default y if ARCH_SUNXI
 	help
 	  UBIFS is a file system for flash devices which works on top of UBI.
 
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index bebbe94088..51815600d4 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -125,6 +125,9 @@
 #define CONFIG_SYS_NAND_MAX_ECCPOS 1664
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_MAX_NAND_DEVICE 8
+
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
 #endif
 
 #ifdef CONFIG_SPL_SPI_SUNXI
-- 
2.39.5