20190710_jeffrey - silenceuncrio/diary GitHub Wiki

diff --git a/manufacturing_tool/nandflash/mfgtools/Profiles/Linux/OS Firmware/ucl2.xml b/manufacturing_tool/nandflash/mfgtools/Profiles/Linux/OS Firmware/ucl2.xml
index 520ff3d..24cdacc 100644
--- a/manufacturing_tool/nandflash/mfgtools/Profiles/Linux/OS Firmware/ucl2.xml
+++ b/manufacturing_tool/nandflash/mfgtools/Profiles/Linux/OS Firmware/ucl2.xml
@@ -109,29 +109,20 @@
   <CMD state="Updater" type="push"
     body="$ ubimkvol /dev/ubi3 -N config_b -m"/>

-  <!-- burn the rootfs_a -->
-  <CMD state="Updater" type="push"
-    body="$ mkdir -p /mnt/rootfs_a"/>
   <CMD state="Updater" type="push"
-    body="$ mount -t ubifs ubi0:rootfs_a /mnt/rootfs_a"/>
-  <CMD state="Updater" type="push"
-    body="pipe tar -jxv -C /mnt/rootfs_a" file="files/rootfs.tar.bz2">Sending and writting rootfs_a</CMD>
+    body="send" file="files/ubifs.img">Sending a UBIFS file system image</CMD>
+
+  <!-- burn the rootfs_a -->
   <CMD state="Updater" type="push"
-    body="frf">Finishing rootfs write</CMD>
+    body="$ ubiupdatevol /dev/ubi0_0 -t"/>
   <CMD state="Updater" type="push"
-    body="$ umount /mnt/rootfs_a">Unmounting rootfs_a partition</CMD>
+    body="$ ubiupdatevol /dev/ubi0_0 $FILE">Write to UBI volume /dev/ubi0_0 - rootfs_a</CMD>

   <!-- burn the rootfs_b -->
   <CMD state="Updater" type="push"
-    body="$ mkdir -p /mnt/rootfs_b"/>
-  <CMD state="Updater" type="push"
-    body="$ mount -t ubifs ubi2:rootfs_b /mnt/rootfs_b"/>
-  <CMD state="Updater" type="push"
-    body="pipe tar -jxv -C /mnt/rootfs_b" file="files/rootfs.tar.bz2">Sending and writting rootfs_b</CMD>
-  <CMD state="Updater" type="push"
-    body="frf">Finishing rootfs write</CMD>
+    body="$ ubiupdatevol /dev/ubi2_0 -t"/>
   <CMD state="Updater" type="push"
-    body="$ umount /mnt/rootfs_b">Unmounting rootfs_a partition</CMD>
+    body="$ ubiupdatevol /dev/ubi2_0 $FILE">Write to UBI volume /dev/ubi2_0 - rootfs_b</CMD>

   <CMD state="Updater" type="push"
     body="$ echo Update Complete!">Done</CMD>
diff --git a/meta-proscend/classes/image_types_proscend.bbclass b/meta-proscend/classes/image_types_proscend.bbclass
index 78c8b59..f308fcd 100644
--- a/meta-proscend/classes/image_types_proscend.bbclass
+++ b/meta-proscend/classes/image_types_proscend.bbclass
@@ -202,7 +202,10 @@ IMAGE_CMD_nandflash_mfgtools () {
         done
     fi

-    cp ${NANDFLASH_ROOTFS} ${MFGTOOLS_DIR}/nandflash/mfgtools/Profiles/Linux/OS\ Firmware/files/${NANDFLASH_ROOTFS_NAME}
+    # cp ${NANDFLASH_ROOTFS} ${MFGTOOLS_DIR}/nandflash/mfgtools/Profiles/Linux/OS\ Firmware/files/${NANDFLASH_ROOTFS_NAME}
+
+    # use UBIFS file system image
+    cp ubifs.img ${MFGTOOLS_DIR}/nandflash/mfgtools/Profiles/Linux/OS\ Firmware/files/ubifs.img

     filename=$(date "+${MACHINE}_%Y%m%d%H%M%S_mfgtools.zip")
     cd ${MFGTOOLS_DIR}/nandflash

diff --git a/build.sh b/build.sh
index aabad9b..03636f8 100755
--- a/build.sh
+++ b/build.sh
@@ -379,7 +379,8 @@ fi

 if [ $CLEAN -eq 1 ]; then
     # Clean whole build directory
-    rm -rf ./build_small
+    # rm -rf ./build_small
+    echo "no rm -rf ./build_small"
 fi

 _BUILD_SUCCESS="success"

diff --git a/meta-proscend/classes/image_types_proscend.bbclass b/meta-proscend/classes/image_types_proscend.bbclass
index 78c8b59..9f6f4cf 100644
--- a/meta-proscend/classes/image_types_proscend.bbclass
+++ b/meta-proscend/classes/image_types_proscend.bbclass
@@ -39,6 +39,9 @@ NANDFLASH_UBI = "${MACHINE}.ubi.img"
 NANDFLASH_GENERATION_COMMAND_mx6ul = "generate_imx_nandflash"

 generate_imx_nandflash () {
+
+    echo "[j] generate_imx_nandflash - $(date)"
+
     # clean up
     rm -rf ${FIRMWARE_DIR}
     rm -f `readlink ${DEPLOY_DIR_IMAGE}/${NANDFLASH}` `readlink ${DEPLOY_DIR_IMAGE}/${NANDFLASH_UBI}`
@@ -140,6 +143,8 @@ generate_imx_nandflash () {
     echo "mkfs.ubifs -r ./rootfs.x -m 2048 -e 126976 -c 766 -o ubifs.img ..."
     mkfs.ubifs -r ./rootfs.x -m 2048 -e 126976 -c 766 -o ubifs.img

+    echo "[j] generate_imx_nandflash - $(date) - $(ls -al ubifs.img)"
+
     echo "Encrypt ubifs.img to ubifs.enc ..."
     aes_key=`echo 2wsx#EDC | md5sum | cut -b 1-32`
     aes_ivv=`echo 70746615 | md5sum | cut -b 1-32`
@@ -158,6 +163,8 @@ generate_imx_nandflash () {
     tar -cf ${filename} firmware
     ln -s ${filename} ${NANDFLASH_UBI}
     cd -
+
+    echo "[j] generate_imx_nandflash - $(date) - return"
 }

 IMAGE_CMD_nandflash () {
@@ -182,6 +189,8 @@ NANDFLASH_MFGTOOLS= "${MACHINE}_mfgtools.zip"

 IMAGE_CMD_nandflash_mfgtools () {

+    echo "[j] IMAGE_CMD_nandflash_mfgtools - $(date)"
+
     # clean up
     rm -f `readlink ${DEPLOY_DIR_IMAGE}/${NANDFLASH_MFGTOOLS}`
     rm -f ${DEPLOY_DIR_IMAGE}/${NANDFLASH_MFGTOOLS}
@@ -202,7 +211,12 @@ IMAGE_CMD_nandflash_mfgtools () {
         done
     fi

-    cp ${NANDFLASH_ROOTFS} ${MFGTOOLS_DIR}/nandflash/mfgtools/Profiles/Linux/OS\ Firmware/files/${NANDFLASH_ROOTFS_NAME}
+    # cp ${NANDFLASH_ROOTFS} ${MFGTOOLS_DIR}/nandflash/mfgtools/Profiles/Linux/OS\ Firmware/files/${NANDFLASH_ROOTFS_NAME}
+
+    echo "[j] IMAGE_CMD_nandflash_mfgtools - $(date) - $(ls -al ubifs.img)"
+
+    # use UBIFS file system image
+    cp ubifs.img ${MFGTOOLS_DIR}/nandflash/mfgtools/Profiles/Linux/OS\ Firmware/files/ubifs.img

     filename=$(date "+${MACHINE}_%Y%m%d%H%M%S_mfgtools.zip")
     cd ${MFGTOOLS_DIR}/nandflash
@@ -213,6 +227,8 @@ IMAGE_CMD_nandflash_mfgtools () {
     cd ${DEPLOY_DIR_IMAGE}
     ln -s ${filename} ${NANDFLASH_MFGTOOLS}
     cd -
+
+    echo "[j] IMAGE_CMD_nandflash_mfgtools - $(date) - return"
 }

 # The nandflash_mfgtools requires the rootfs filesystem to be built before using

diff --git a/meta-proscend/classes/image_types_proscend.bbclass b/meta-proscend/classes/image_types_proscend.bbclass
index 78c8b59..ff5c2cc 100644
--- a/meta-proscend/classes/image_types_proscend.bbclass
+++ b/meta-proscend/classes/image_types_proscend.bbclass
@@ -39,10 +39,13 @@ NANDFLASH_UBI = "${MACHINE}.ubi.img"
 NANDFLASH_GENERATION_COMMAND_mx6ul = "generate_imx_nandflash"

 generate_imx_nandflash () {
+
+    echo "[j] generate_imx_nandflash - $(date)"
+
     # clean up
     rm -rf ${FIRMWARE_DIR}
-    rm -f `readlink ${DEPLOY_DIR_IMAGE}/${NANDFLASH}` `readlink ${DEPLOY_DIR_IMAGE}/${NANDFLASH_UBI}`
-    rm -f ${DEPLOY_DIR_IMAGE}/${NANDFLASH} ${DEPLOY_DIR_IMAGE}/${NANDFLASH_UBI}
+    rm -f `readlink ${DEPLOY_DIR_IMAGE}/${NANDFLASH}`
+    rm -f ${DEPLOY_DIR_IMAGE}/${NANDFLASH}

     mkdir -p ${FIRMWARE_DIR}
     case "${IMAGE_BOOTLOADER}" in
@@ -129,7 +132,43 @@ generate_imx_nandflash () {
     ln -s ${filename} ${NANDFLASH}
     cd -

+    echo "[j] generate_imx_nandflash - $(date) - return"
+}
+
+IMAGE_CMD_nandflash () {
+    if [ -z "${NANDFLASH_ROOTFS}" ]; then
+        bberror "NANDFLASH_ROOTFS is undefined. To use nandflash image from Proscend it needs to be defined."
+        exit 1
+    fi
+
+    ${NANDFLASH_GENERATION_COMMAND}
+}
+
+# The sdcard requires the rootfs filesystem to be built before using
+# it so we must make this dependency explicit.
+IMAGE_TYPEDEP_nandflash = "${@d.getVar('SDCARD_ROOTFS', 1).split('.')[-1]}"
+
+
+
+
+
+
+NANDFLASH_MFGTOOLS= "${MACHINE}_mfgtools.zip"
+
+IMAGE_CMD_nandflash_mfgtools () {
+
+    echo "[j] IMAGE_CMD_nandflash_mfgtools - $(date)"
+
+    # clean up
+    rm -f `readlink ${DEPLOY_DIR_IMAGE}/${NANDFLASH_UBI}`
+    rm -f ${DEPLOY_DIR_IMAGE}/${NANDFLASH_UBI}
+    rm -f `readlink ${DEPLOY_DIR_IMAGE}/${NANDFLASH_MFGTOOLS}`
+    rm -f ${DEPLOY_DIR_IMAGE}/${NANDFLASH_MFGTOOLS}
+
+
+
     echo "===Build Ubi Image File==="
+    filename_base=$(date "+${MACHINE}_%Y%m%d%H%M%S")
     filename=$filename_base".ubi.img"

     echo "Build ubifs.img ..."
@@ -150,7 +189,7 @@ generate_imx_nandflash () {
     rm -f firmware.md5
     md5sum * > firmware.md5
     echo "Gen dummy rootfs.tar.bz2.enc ( so old FirmwareUpgrade.sh will get upgrade error)"
-       cp -f mcsv.enc ${NANDFLASH_ROOTFS_NAME}.enc
+    cp -f mcsv.enc ${NANDFLASH_ROOTFS_NAME}.enc
     cd -

     echo "Build Upgrade Ubi Image"
@@ -158,34 +197,9 @@ generate_imx_nandflash () {
     tar -cf ${filename} firmware
     ln -s ${filename} ${NANDFLASH_UBI}
     cd -
-}
-
-IMAGE_CMD_nandflash () {
-    if [ -z "${NANDFLASH_ROOTFS}" ]; then
-        bberror "NANDFLASH_ROOTFS is undefined. To use nandflash image from Proscend it needs to be defined."
-        exit 1
-    fi
-
-    ${NANDFLASH_GENERATION_COMMAND}
-}
-
-# The sdcard requires the rootfs filesystem to be built before using
-# it so we must make this dependency explicit.
-IMAGE_TYPEDEP_nandflash = "${@d.getVar('SDCARD_ROOTFS', 1).split('.')[-1]}"
-



-
-
-NANDFLASH_MFGTOOLS= "${MACHINE}_mfgtools.zip"
-
-IMAGE_CMD_nandflash_mfgtools () {
-
-    # clean up
-    rm -f `readlink ${DEPLOY_DIR_IMAGE}/${NANDFLASH_MFGTOOLS}`
-    rm -f ${DEPLOY_DIR_IMAGE}/${NANDFLASH_MFGTOOLS}
-
     cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_NANDFLASH} ${MFGTOOLS_DIR}/nandflash/mfgtools/Profiles/Linux/OS\ Firmware/files

     cp "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" ${MFGTOOLS_DIR}/nandflash/mfgtools/Profiles/Linux/OS\ Firmware/files/zImage
@@ -202,7 +216,8 @@ IMAGE_CMD_nandflash_mfgtools () {
         done
     fi

-    cp ${NANDFLASH_ROOTFS} ${MFGTOOLS_DIR}/nandflash/mfgtools/Profiles/Linux/OS\ Firmware/files/${NANDFLASH_ROOTFS_NAME}
+    # use UBIFS file system image
+    cp ubifs.img ${MFGTOOLS_DIR}/nandflash/mfgtools/Profiles/Linux/OS\ Firmware/files/ubifs.img

     filename=$(date "+${MACHINE}_%Y%m%d%H%M%S_mfgtools.zip")
     cd ${MFGTOOLS_DIR}/nandflash
@@ -213,6 +228,8 @@ IMAGE_CMD_nandflash_mfgtools () {
     cd ${DEPLOY_DIR_IMAGE}
     ln -s ${filename} ${NANDFLASH_MFGTOOLS}
     cd -
+
+    echo "[j] IMAGE_CMD_nandflash_mfgtools - $(date) - return"
 }

 # The nandflash_mfgtools requires the rootfs filesystem to be built before using