RV1126/RV1109: update spi nand BoardConfig

Change-Id: Ie2c3b2eb62cdf2db70492ac90e0ce524281513ca
2020-11-10 14:42:30 +08:00
parent 06d02e8d66
commit dac875e5e1
5 changed files with 90 additions and 24 deletions
--- a/rv1126_rv1109/BoardConfig-38x38-spi-nand.mk
+++ b/rv1126_rv1109/BoardConfig-38x38-spi-nand.mk
@ -6,6 +6,8 @@ export RK_CHIP=RV1126
 export RK_ARCH=arm
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=rv1126
+# Uboot update loader (spl)
+export RK_LOADER_UPDATE_SPL=true
 # Uboot image format type: fit(flattened image tree)
 export RK_UBOOT_FORMAT_TYPE=fit
 # Kernel defconfig
@ -39,13 +41,33 @@ export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
 # Set ramboot image type
 export RK_RAMBOOT_TYPE=
 # Set oem partition type, including ext2 squashfs
-export RK_OEM_FS_TYPE=
+export RK_OEM_FS_TYPE=ubi
 # Set userdata partition type, including ext2, fat
-export RK_USERDATA_FS_TYPE=
+export RK_USERDATA_FS_TYPE=ubi
 #OEM config
-export RK_OEM_DIR=
-#userdata config
+export RK_OEM_DIR=oem_ipc
+# OEM build on buildroot
+export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config, if not define this, system will format by RK_USERDATA_FS_TYPE
 export RK_USERDATA_DIR=
+#
+# RK_UBI_PAGE_SIZE and RK_UBI_BLOCK_SIZE MUST be defined if meet One of the following conditions:
+#
+# 1. define RK_OEM_DIR and undefine RK_OEM_BUILDIN_BUILDROOT
+# 2. define RK_USERDATA_DIR
+#
+# Set ubifs page size, 2048(2KB) or 4096(4KB)
+# export RK_UBI_PAGE_SIZE=2048
+#
+# Set ubifs block size, 0x20000(128KB) or 0x40000(256KB)
+# export RK_UBI_BLOCK_SIZE=0x20000
+#
+# Set userdata partition size (byte) if define RK_USERDATA_DIR
+# export RK_USERDATA_PARTITION_SIZE=0x02760000
+#
+# Set oem partition size (byte) if undefine RK_OEM_BUILDIN_BUILDROOT
+# export RK_OEM_PARTITION_SIZE=0x6400000
+#
 #misc image
 export RK_MISC=
 #choose enable distro module
--- a/rv1126_rv1109/BoardConfig-slc-nand-v12.mk
+++ b/rv1126_rv1109/BoardConfig-slc-nand-v12.mk
@ -36,26 +36,36 @@ export RK_JOBS=12
 export RK_TARGET_PRODUCT=rv1126_rv1109
 # Set rootfs type, including ext2 ext4 squashfs ubi
 export RK_ROOTFS_TYPE=ubi
-# Set ubifs page size, 2048(2KB) or 4096(4KB)
-export RK_UBI_PAGE_SIZE=2048
-# Set ubifs block size, 0x20000(128KB) or 0x40000(256KB)
-export RK_UBI_BLOCK_SIZE=0x20000
 # rootfs image path
 export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
 # Set ramboot image type
 export RK_RAMBOOT_TYPE=
 # Set oem partition type, including ext2 squashfs
 export RK_OEM_FS_TYPE=ubi
-# Set oem partition size (byte)
-# export RK_OEM_PARTITION_SIZE=0x6400000
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ubi
 #OEM config
 export RK_OEM_DIR=
-#userdata config
+#userdata config, if not define this, system will format by RK_USERDATA_FS_TYPE
 export RK_USERDATA_DIR=
-# Set userdata partition size (byte)
+#
+# RK_UBI_PAGE_SIZE and RK_UBI_BLOCK_SIZE MUST be defined if meet One of the following conditions:
+#
+# 1. define RK_OEM_DIR and undefine RK_OEM_BUILDIN_BUILDROOT
+# 2. define RK_USERDATA_DIR
+#
+# Set ubifs page size, 2048(2KB) or 4096(4KB)
+# export RK_UBI_PAGE_SIZE=2048
+#
+# Set ubifs block size, 0x20000(128KB) or 0x40000(256KB)
+# export RK_UBI_BLOCK_SIZE=0x20000
+#
+# Set userdata partition size (byte) if define RK_USERDATA_DIR
 # export RK_USERDATA_PARTITION_SIZE=0x02760000
+#
+# Set oem partition size (byte) if undefine RK_OEM_BUILDIN_BUILDROOT
+# export RK_OEM_PARTITION_SIZE=0x6400000
+#
 #misc image
 export RK_MISC=
 # Define pre-build script for this board
--- a/rv1126_rv1109/BoardConfig-spi-nand.mk
+++ b/rv1126_rv1109/BoardConfig-spi-nand.mk
@ -6,6 +6,8 @@ export RK_CHIP=RV1126
 export RK_ARCH=arm
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=rv1126
+# Uboot update loader (spl)
+export RK_LOADER_UPDATE_SPL=true
 # Uboot image format type: fit(flattened image tree)
 export RK_UBOOT_FORMAT_TYPE=fit
 # Kernel defconfig
@ -39,13 +41,33 @@ export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
 # Set ramboot image type
 export RK_RAMBOOT_TYPE=
 # Set oem partition type, including ext2 squashfs
-export RK_OEM_FS_TYPE=
+export RK_OEM_FS_TYPE=ubi
 # Set userdata partition type, including ext2, fat
-export RK_USERDATA_FS_TYPE=
+export RK_USERDATA_FS_TYPE=ubi
 #OEM config
-export RK_OEM_DIR=
-#userdata config
+export RK_OEM_DIR=oem_ipc
+# OEM build on buildroot
+export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config, if not define this, system will format by RK_USERDATA_FS_TYPE
 export RK_USERDATA_DIR=
+#
+# RK_UBI_PAGE_SIZE and RK_UBI_BLOCK_SIZE MUST be defined if meet One of the following conditions:
+#
+# 1. define RK_OEM_DIR and undefine RK_OEM_BUILDIN_BUILDROOT
+# 2. define RK_USERDATA_DIR
+#
+# Set ubifs page size, 2048(2KB) or 4096(4KB)
+# export RK_UBI_PAGE_SIZE=2048
+#
+# Set ubifs block size, 0x20000(128KB) or 0x40000(256KB)
+# export RK_UBI_BLOCK_SIZE=0x20000
+#
+# Set userdata partition size (byte) if define RK_USERDATA_DIR
+# export RK_USERDATA_PARTITION_SIZE=0x02760000
+#
+# Set oem partition size (byte) if undefine RK_OEM_BUILDIN_BUILDROOT
+# export RK_OEM_PARTITION_SIZE=0x6400000
+#
 #misc image
 export RK_MISC=
 #choose enable distro module
--- a/rv1126_rv1109/BoardConfig-uvcc-spi-nand.mk
+++ b/rv1126_rv1109/BoardConfig-uvcc-spi-nand.mk
@ -46,16 +46,28 @@ export RK_RAMBOOT_TYPE=
 export RK_OEM_FS_TYPE=
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ubi
-#RK_UBIFS_LEBSIZE = logical eraseblock size（逻辑擦除块大小）：flash block size - 2 * flash page 
-export RK_UBIFS_LEBSIZE=0x1f000
-#RK_UBIFS_MINIOSIZE = minimum I/O unit size（页大小）：flash page size
-export RK_UBIFS_MINIOSIZE=0x800
-#RK_UBIFS_MAXLEBCNT = partition size / flash block size
-export RK_UBIFS_MAXLEBCNT=2048
 #OEM config
 export RK_OEM_DIR=
-#userdata config
+#userdata config, if not define this, system will format by RK_USERDATA_FS_TYPE
 export RK_USERDATA_DIR=userdata_empty
+#
+# RK_UBI_PAGE_SIZE and RK_UBI_BLOCK_SIZE MUST be defined if meet One of the following conditions:
+#
+# 1. define RK_OEM_DIR and undefine RK_OEM_BUILDIN_BUILDROOT
+# 2. define RK_USERDATA_DIR
+#
+# Set ubifs page size, 2048(2KB) or 4096(4KB)
+export RK_UBI_PAGE_SIZE=2048
+#
+# Set ubifs block size, 0x20000(128KB) or 0x40000(256KB)
+export RK_UBI_BLOCK_SIZE=0x20000
+#
+# Set userdata partition size (byte) if define RK_USERDATA_DIR
+export RK_USERDATA_PARTITION_SIZE=0x680000
+#
+# Set oem partition size (byte) if undefine RK_OEM_BUILDIN_BUILDROOT
+# export RK_OEM_PARTITION_SIZE=0x6400000
+#
 #misc image
 export RK_MISC=
 #choose enable distro module
--- a/rv1126_rv1109/parameter-fit-nand-256M.txt
+++ b/rv1126_rv1109/parameter-fit-nand-256M.txt
@ -8,5 +8,5 @@ MACHINE: 0xffffffff
 CHECK_MASK: 0x80
 PWR_HLD: 0,0,A,0,1
 TYPE: GPT
-CMDLINE: mtdparts=rk29xxnand:0x00002000@0x00004000(uboot),0x00004000@0x00006000(boot),0x00064000@0x0000A000(rootfs),-@0x0006E000(userdata:grow)
+CMDLINE: mtdparts=rk29xxnand:0x00000800@0x00001800(vnvm),0x00002000@0x00002000(uboot),0x00004000@0x00004000(boot),0x00032000@0x00008000(rootfs),0x00032000@0x0003A000(oem),-@0x0006C000(userdata:grow)
 uuid:rootfs=614e0000-0000-4b53-8000-1d28000054a9