From 2d7388bc334ddb383ae275958d746c0622e515a3 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Wed, 8 Mar 2017 05:33:33 +0100
Subject: Implement UBIFS rootfs support

This implements UBIFS rootfs, enables it for mips targets and adds the
necessary settings for rb532.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 target/config/Config.in.rootfs      |  9 +++++++++
 target/linux/config/Config.in.flash | 23 ++++++++++++++++++++++-
 target/mips/Makefile                |  8 ++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

(limited to 'target')

diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs
index c24535f01..335a4547f 100644
--- a/target/config/Config.in.rootfs
+++ b/target/config/Config.in.rootfs
@@ -87,6 +87,15 @@ config ADK_TARGET_ROOTFS_YAFFS
 	help
 	  Root filesystem on NAND flash with YAFFS2.
 
+config ADK_TARGET_ROOTFS_UBIFS
+	bool "UBIFS root filesystem (NAND)"
+	select ADK_KERNEL_UBIFS_FS
+	select ADK_HOST_NEED_MTD_UTILS
+	select ADK_HOST_NEED_KERNEL2MINOR
+	depends on ADK_TARGET_WITH_NAND
+	help
+	  Root filesystem on NAND flash with UBI.
+
 config ADK_TARGET_ROOTFS_NFSROOT
 	bool "NFS root"
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index 3cf3a15ff..159e4aa45 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -163,9 +163,30 @@ config ADK_TARGET_MTD_SIZE
 	int
 	depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
 		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
-		|| ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
+		|| ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \
+		|| ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default "16777216" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
 	default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
+	default "134217728" if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default "0"
 
+config ADK_TARGET_FLASH_PEB_SIZE
+	int
+	default 131072 if ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	help
+	  Physical Erase Block size.
+
+config ADK_TARGET_FLASH_PAGE_SIZE
+	int
+	default 2048 if ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	help
+	  Minimum input/output size.
+
+config ADK_TARGET_FLASH_SUBPAGE_SIZE
+	int
+	default 512 if ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	default ADK_TARGET_FLASH_PAGE_SIZE
+	help
+	  Size of NAND sub-pages (if supported).
+
 endmenu
diff --git a/target/mips/Makefile b/target/mips/Makefile
index bb30049f1..6f0bd728c 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -87,6 +87,11 @@ else
 	@echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k'
 endif
 endif
+ifeq ($(ADK_TARGET_FS),ubifs)
+targethelp:
+	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
+	@echo 'The UBI image is: ${FW_DIR}/${ROOTFSUBIFS}'
+endif
 
 # image creation and kernel install
 kernel-strip:
@@ -121,3 +126,6 @@ endif
 ifeq ($(ADK_TARGET_FS),yaffs)
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp
 endif
+ifeq ($(ADK_TARGET_FS),ubifs)
+imageinstall: $(FW_DIR)/$(ROOTFSUBIFS) targethelp
+endif
-- 
cgit v1.2.3