add user data partition

4 files changed, 14 insertions, 8 deletions

diff --git a/contrib/uboot-setenv-mtcdt.minicom b/contrib/uboot-setenv-mtcdt.minicom
index c7685b7..5ab6c6c 100644
--- a/contrib/uboot-setenv-mtcdt.minicom
+++ b/contrib/uboot-setenv-mtcdt.minicom
@@ -12,7 +12,7 @@ send setenv stdout                serial
 send setenv stderr                serial
 send setenv ethact                macb0
 send setenv mtdids                nand0=nand0
-send setenv mtdparts              mtdparts=nand0:256k(bootstrap),512k(u-boot),640k(u-boot-env1),640k(u-boot-env2),6M(kernel),8M(config),8M(oem),-(rootfs)
+send setenv mtdparts              mtdparts=nand0:256k(bootstrap),512k(u-boot),640k(u-boot-env1),640k(u-boot-env2),6M(kernel),8M(config),8M(oem),128M(rootfs),-(user)
 send setenv bootstrap_file        oe_bootstrap_pmecc_padded.bin
 send setenv uboot_file            oe_u-boot.bin
 send setenv uboot_env1_file       oe_uboot_env1.bin
@@ -44,6 +44,7 @@ send setenv erase_kernel          \'nand erase.part kernel\'
 send setenv erase_config          \'nand erase.part config\'
 send setenv erase_oem             \'nand erase.part oem\'
 send setenv erase_rootfs          \'nand erase.part rootfs\'
+send setenv erase_user_data       \'nand erase.part user\'
 send setenv tftp_bootstrap        \'tftpb ${tftpaddr} ${bootstrap_file} && run erase_bootstrap && nand write.jffs2 ${fileaddr} bootstrap ${filesize}\'
 send setenv tftp_uboot            \'tftpb ${tftpaddr} ${uboot_file} && run erase_uboot && nand write.jffs2 ${fileaddr} u-boot ${filesize}\'
 send setenv tftp_uboot_env1       \'tftpb ${tftpaddr} ${uboot_env1_file} && run erase_uboot_env1 && nand write.jffs2 ${fileaddr} u-boot-env1 ${filesize}\'
@@ -51,7 +52,7 @@ send setenv tftp_uboot_env2       \'tftpb ${tftpaddr} ${uboot_env2_file} && run
 send setenv tftp_kernel           \'tftpb ${tftpaddr} ${kernel_file} && run erase_kernel && nand write.jffs2 ${fileaddr} kernel ${filesize}\'
 send setenv tftp_config           \'tftpb ${tftpaddr} ${config_file} && run erase_config && nand write.jffs2 ${fileaddr} config ${filesize}\'
 send setenv tftp_oem              \'tftpb ${tftpaddr} ${oem_file} && run erase_oem && nand write.jffs2 ${fileaddr} oem ${filesize}\'
-send setenv tftp_rootfs           \'tftpb ${tftpaddr} ${rootfs_file} && run erase_rootfs && nand write.jffs2 ${fileaddr} rootfs ${filesize}\'
+send setenv tftp_rootfs           \'tftpb ${tftpaddr} ${rootfs_file} && run erase_rootfs && run erase_user_data && nand write.jffs2 ${fileaddr} rootfs ${filesize}\'
 send setenv krb                   \'run tftp_kernel && run tftp_rootfs && boot\'
 send setenv rb                    \'run tftp_rootfs && boot\'
 print saving...
diff --git a/contrib/uboot-setenv-mtcdt.ttl b/contrib/uboot-setenv-mtcdt.ttl
index d67f635..2b5dc54 100644
--- a/contrib/uboot-setenv-mtcdt.ttl
+++ b/contrib/uboot-setenv-mtcdt.ttl
@@ -14,6 +14,7 @@ EKERN = 'nand erase.part kernel'
 ECONF = 'nand erase.part config'

 EOEM = 'nand erase.part oem'

 EROOT = 'nand erase.part rootfs'

+EUSER = 'nand erase.part user'

 TBOOT = 'tftpb ${tftpaddr} ${bootstrap_file} && run erase_bootstrap && nand write.jffs2 ${fileaddr} bootstrap ${filesize}'

 TUBOOT = 'tftpb ${tftpaddr} ${uboot_file} && run erase_uboot && nand write.jffs2 ${fileaddr} u-boot ${filesize}'

 TUBOOTE1 = 'tftpb ${tftpaddr} ${uboot_env1_file} && run erase_uboot_env1 && nand write.jffs2 ${fileaddr} u-boot-env1 ${filesize}'

@@ -21,7 +22,7 @@ TUBOOTE2 = 'tftpb ${tftpaddr} ${uboot_env2_file} && run erase_uboot_env2 && nand
 TKERN = 'tftpb ${tftpaddr} ${kernel_file} && run erase_kernel && nand write.jffs2 ${fileaddr} kernel ${filesize}'

 TCONF = 'tftpb ${tftpaddr} ${config_file} && run erase_config && nand write.jffs2 ${fileaddr} config ${filesize}'

 TOEM = 'tftpb ${tftpaddr} ${oem_file} && run erase_oem && nand write.jffs2 ${fileaddr} oem ${filesize}'

-TROOT = 'tftpb ${tftpaddr} ${rootfs_file} && run erase_rootfs && nand write.jffs2 ${fileaddr} rootfs ${filesize}'

+TROOT = 'tftpb ${tftpaddr} ${rootfs_file} && run erase_rootfs && run erase_user_data && nand write.jffs2 ${fileaddr} rootfs ${filesize}'

 KRB = 'run tftp_kernel && run tftp_rootfs && boot'

 RB = 'run tftp_rootfs && boot'

 

@@ -51,7 +52,7 @@ sendln 'setenv ethact                macb0'
 wait P

 sendln 'setenv mtdids                nand0=nand0'

 wait P

-sendln 'setenv mtdparts              mtdparts=nand0:256k(bootstrap),512k(u-boot),640k(u-boot-env1),640k(u-boot-env2),6M(kernel),8M(config),8M(oem),-(rootfs)'

+sendln 'setenv mtdparts              mtdparts=nand0:256k(bootstrap),512k(u-boot),640k(u-boot-env1),640k(u-boot-env2),6M(kernel),8M(config),8M(oem),128M(rootfs),-(user)'

 wait P

 sendln 'setenv bootstrap_file        oe_bootstrap_pmecc_padded.bin'

 wait P

@@ -117,6 +118,8 @@ sendln 'setenv erase_oem             ' 39 EOEM 39
 wait P

 sendln 'setenv erase_rootfs          ' 39 EROOT 39

 wait P

+sendln 'setenv erase_user_data       ' 39 EUSER 39

+wait P

 sendln 'setenv tftp_bootstrap        ' 39 TBOOT 39

 wait P

 sendln 'setenv tftp_uboot            ' 39 TUBOOT 39

diff --git a/contrib/uboot-setenv-mtr.minicom b/contrib/uboot-setenv-mtr.minicom
index bc53396..340e4f0 100644
--- a/contrib/uboot-setenv-mtr.minicom
+++ b/contrib/uboot-setenv-mtr.minicom
@@ -12,7 +12,7 @@ send setenv stderr                serial
 send setenv ethact                macb0
 send setenv ethaddr               00:08:00:87:00:02
 send setenv mtdids                nand0=nand0
-send setenv mtdparts              mtdparts=nand0:256k(bootstrap),512k(u-boot),640k(u-boot-env1),640k(u-boot-env2),6M(kernel),8M(config),8M(oem),-(rootfs)
+send setenv mtdparts              mtdparts=nand0:256k(bootstrap),512k(u-boot),640k(u-boot-env1),640k(u-boot-env2),6M(kernel),8M(config),8M(oem),128M(rootfs),-(user)
 send setenv bootstrap_file        oe_bootstrap_pmecc_padded.bin
 send setenv uboot_file            oe_u-boot.bin
 send setenv uboot_env1_file       oe_uboot_env1.bin
@@ -44,6 +44,7 @@ send setenv erase_kernel          \'nand erase.part kernel\'
 send setenv erase_config          \'nand erase.part config\'
 send setenv erase_oem             \'nand erase.part oem\'
 send setenv erase_rootfs          \'nand erase.part rootfs\'
+send setenv erase_user_data       \'nand erase.part user\'
 send setenv tftp_bootstrap        \'tftpboot ${loadaddr} ${bootstrap_file} && run erase_bootstrap && nand write.jffs2 ${fileaddr} bootstrap ${filesize}\'
 send setenv tftp_uboot            \'tftpboot ${loadaddr} ${uboot_file} && run erase_uboot && nand write.jffs2 ${fileaddr} u-boot ${filesize}\'
 send setenv tftp_uboot_env1       \'tftpboot ${loadaddr} ${uboot_env1_file} && run erase_uboot_env1 && nand write.jffs2 ${fileaddr} u-boot-env1 ${filesize}\'
@@ -51,7 +52,7 @@ send setenv tftp_uboot_env2       \'tftpboot ${loadaddr} ${uboot_env2_file} && r
 send setenv tftp_kernel           \'tftpboot ${loadaddr} ${kernel_file} && run erase_kernel && nand write.jffs2 ${fileaddr} kernel ${filesize}\'
 send setenv tftp_config           \'tftpboot ${loadaddr} ${config_file} && run erase_config && nand write.jffs2 ${fileaddr} config ${filesize}\'
 send setenv tftp_oem              \'tftpboot ${loadaddr} ${oem_file} && run erase_oem && nand write.jffs2 ${fileaddr} oem ${filesize}\'
-send setenv tftp_rootfs           \'tftpboot ${loadaddr} ${rootfs_file} && run erase_rootfs && nand write.jffs2 ${fileaddr} rootfs ${filesize}\'
+send setenv tftp_rootfs           \'tftpboot ${loadaddr} ${rootfs_file} && run erase_rootfs && run erase_user_data && nand write.jffs2 ${fileaddr} rootfs ${filesize}\'
 send setenv krb                   \'run tftp_kernel && run tftp_rootfs && boot\'
 send setenv rb                    \'run tftp_rootfs && boot\'
 print saving...
diff --git a/contrib/uboot-setenv-mtrv1.minicom b/contrib/uboot-setenv-mtrv1.minicom
index bc53396..340e4f0 100644
--- a/contrib/uboot-setenv-mtrv1.minicom
+++ b/contrib/uboot-setenv-mtrv1.minicom
@@ -12,7 +12,7 @@ send setenv stderr                serial
 send setenv ethact                macb0
 send setenv ethaddr               00:08:00:87:00:02
 send setenv mtdids                nand0=nand0
-send setenv mtdparts              mtdparts=nand0:256k(bootstrap),512k(u-boot),640k(u-boot-env1),640k(u-boot-env2),6M(kernel),8M(config),8M(oem),-(rootfs)
+send setenv mtdparts              mtdparts=nand0:256k(bootstrap),512k(u-boot),640k(u-boot-env1),640k(u-boot-env2),6M(kernel),8M(config),8M(oem),128M(rootfs),-(user)
 send setenv bootstrap_file        oe_bootstrap_pmecc_padded.bin
 send setenv uboot_file            oe_u-boot.bin
 send setenv uboot_env1_file       oe_uboot_env1.bin
@@ -44,6 +44,7 @@ send setenv erase_kernel          \'nand erase.part kernel\'
 send setenv erase_config          \'nand erase.part config\'
 send setenv erase_oem             \'nand erase.part oem\'
 send setenv erase_rootfs          \'nand erase.part rootfs\'
+send setenv erase_user_data       \'nand erase.part user\'
 send setenv tftp_bootstrap        \'tftpboot ${loadaddr} ${bootstrap_file} && run erase_bootstrap && nand write.jffs2 ${fileaddr} bootstrap ${filesize}\'
 send setenv tftp_uboot            \'tftpboot ${loadaddr} ${uboot_file} && run erase_uboot && nand write.jffs2 ${fileaddr} u-boot ${filesize}\'
 send setenv tftp_uboot_env1       \'tftpboot ${loadaddr} ${uboot_env1_file} && run erase_uboot_env1 && nand write.jffs2 ${fileaddr} u-boot-env1 ${filesize}\'
@@ -51,7 +52,7 @@ send setenv tftp_uboot_env2       \'tftpboot ${loadaddr} ${uboot_env2_file} && r
 send setenv tftp_kernel           \'tftpboot ${loadaddr} ${kernel_file} && run erase_kernel && nand write.jffs2 ${fileaddr} kernel ${filesize}\'
 send setenv tftp_config           \'tftpboot ${loadaddr} ${config_file} && run erase_config && nand write.jffs2 ${fileaddr} config ${filesize}\'
 send setenv tftp_oem              \'tftpboot ${loadaddr} ${oem_file} && run erase_oem && nand write.jffs2 ${fileaddr} oem ${filesize}\'
-send setenv tftp_rootfs           \'tftpboot ${loadaddr} ${rootfs_file} && run erase_rootfs && nand write.jffs2 ${fileaddr} rootfs ${filesize}\'
+send setenv tftp_rootfs           \'tftpboot ${loadaddr} ${rootfs_file} && run erase_rootfs && run erase_user_data && nand write.jffs2 ${fileaddr} rootfs ${filesize}\'
 send setenv krb                   \'run tftp_kernel && run tftp_rootfs && boot\'
 send setenv rb                    \'run tftp_rootfs && boot\'
 print saving...