From 4a34832bfddd4ab5bb49354dd7ebf11efdb0b295 Mon Sep 17 00:00:00 2001
From: "vicent.chi" <vicent.chi@rock-chips.com>
Date: Tue, 20 Aug 2019 03:50:06 +0000
Subject: [PATCH] rv1108: add root parttions board config

Change-Id: I4504f61d67cc371bd42d0c53b02af6cd5356fa50
Signed-off-by: vicent.chi <vicent.chi@rock-chips.com>
---
 rv1108/BoardConfig-lock-evb-sl-v10.mk | 4 +++-
 rv1108/BoardConfig-lock-evb-sl-v11.mk | 4 +++-
 rv1108/BoardConfig-lock-evb-v10.mk    | 6 ++++--
 rv1108/BoardConfig-lock-evb-v11.mk    | 4 +++-
 rv1108/BoardConfig-minievb-v10.mk     | 6 ++++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/rv1108/BoardConfig-lock-evb-sl-v10.mk b/rv1108/BoardConfig-lock-evb-sl-v10.mk
index 8f73948..5ab6b8d 100644
--- a/rv1108/BoardConfig-lock-evb-sl-v10.mk
+++ b/rv1108/BoardConfig-lock-evb-sl-v10.mk
@@ -27,7 +27,9 @@ export RK_STORAGE_TYPE=emmc
 # Set userdata config
 export RK_USERDATA_FILESYSTEM_TYPE=ext4
 export RK_USERDATA_FILESYSTEM_SIZE=32M
-export RK_USERDATA_DIR=common/userdata
+# Set root data config
+export RK_ROOT_FILESYSTEM_TYPE=ext4
+export RK_ROOT_FILESYSTEM_SIZE=32M
 # Set loader config
 export RK_LOADER_POWER_HOLD_GPIO_GROUP=3
 export RK_LOADER_POWER_HOLD_GPIO_INDEX=14
diff --git a/rv1108/BoardConfig-lock-evb-sl-v11.mk b/rv1108/BoardConfig-lock-evb-sl-v11.mk
index 876eb46..14f12f9 100644
--- a/rv1108/BoardConfig-lock-evb-sl-v11.mk
+++ b/rv1108/BoardConfig-lock-evb-sl-v11.mk
@@ -27,7 +27,9 @@ export RK_STORAGE_TYPE=emmc
 # Set userdata config
 export RK_USERDATA_FILESYSTEM_TYPE=ext4
 export RK_USERDATA_FILESYSTEM_SIZE=32M
-export RK_USERDATA_DIR=common/userdata
+# Set root data config
+export RK_ROOT_FILESYSTEM_TYPE=ext4
+export RK_ROOT_FILESYSTEM_SIZE=32M
 # Set loader config
 export RK_LOADER_POWER_HOLD_GPIO_GROUP=3
 export RK_LOADER_POWER_HOLD_GPIO_INDEX=14
diff --git a/rv1108/BoardConfig-lock-evb-v10.mk b/rv1108/BoardConfig-lock-evb-v10.mk
index 12515b1..ba59a84 100644
--- a/rv1108/BoardConfig-lock-evb-v10.mk
+++ b/rv1108/BoardConfig-lock-evb-v10.mk
@@ -15,7 +15,7 @@ export RK_KERNEL_DTS=rv1108-${RK_TARGET_BOARD_VERSION}
 # kernel image path
 export RK_KERNEL_IMG=kernel/arch/arm/boot/Image
 # setting.ini for firmware
-export RK_SETTING_INI=setting-emmc.ini
+export RK_SETTING_INI=setting-emmc-root.ini
 # Build jobs
 export RK_JOBS=12
 # Set rootfs type, including ext2 ext4 squashfs
@@ -27,7 +27,9 @@ export RK_STORAGE_TYPE=emmc
 # Set userdata config
 export RK_USERDATA_FILESYSTEM_TYPE=ext4
 export RK_USERDATA_FILESYSTEM_SIZE=32M
-export RK_USERDATA_DIR=common/userdata
+# Set root data config
+export RK_ROOT_FILESYSTEM_TYPE=ext4
+export RK_ROOT_FILESYSTEM_SIZE=32M
 # Set loader config
 export RK_LOADER_POWER_HOLD_GPIO_GROUP=3
 export RK_LOADER_POWER_HOLD_GPIO_INDEX=12
diff --git a/rv1108/BoardConfig-lock-evb-v11.mk b/rv1108/BoardConfig-lock-evb-v11.mk
index 5e1e2bb..413cd5f 100644
--- a/rv1108/BoardConfig-lock-evb-v11.mk
+++ b/rv1108/BoardConfig-lock-evb-v11.mk
@@ -27,7 +27,9 @@ export RK_STORAGE_TYPE=emmc
 # Set userdata config
 export RK_USERDATA_FILESYSTEM_TYPE=ext4
 export RK_USERDATA_FILESYSTEM_SIZE=32M
-export RK_USERDATA_DIR=common/userdata
+# Set root data config
+export RK_ROOT_FILESYSTEM_TYPE=ext4
+export RK_ROOT_FILESYSTEM_SIZE=32M
 # Set loader config
 export RK_LOADER_POWER_HOLD_GPIO_GROUP=3
 export RK_LOADER_POWER_HOLD_GPIO_INDEX=12
diff --git a/rv1108/BoardConfig-minievb-v10.mk b/rv1108/BoardConfig-minievb-v10.mk
index 68a054c..893d379 100644
--- a/rv1108/BoardConfig-minievb-v10.mk
+++ b/rv1108/BoardConfig-minievb-v10.mk
@@ -26,8 +26,10 @@ export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
 export RK_STORAGE_TYPE=nor
 # Set userdata config
 export RK_USERDATA_FILESYSTEM_TYPE=jffs2
-export RK_USERDATA_FILESYSTEM_SIZE=6
-export RK_USERDATA_DIR=common/userdata
+export RK_USERDATA_FILESYSTEM_SIZE=6M
+# Set root data config
+export RK_ROOT_FILESYSTEM_TYPE=jffs2
+export RK_ROOT_FILESYSTEM_SIZE=6M
 # Set loader config
 export RK_LOADER_POWER_HOLD_GPIO_GROUP=none
 export RK_LOADER_POWER_HOLD_GPIO_INDEX=none