20171127_jeffrey - silenceuncrio/diary GitHub Wiki

diff --git a/meta-proscend/conf/machine/m300e.conf b/meta-proscend/conf/machine/m300e.conf
index 7ecd33c..3f09ccf 100644
--- a/meta-proscend/conf/machine/m300e.conf
+++ b/meta-proscend/conf/machine/m300e.conf
@@ -12,6 +12,10 @@ NANDFLASH_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.bz2"

 NANDFLASH_ROOTFS_NAME = "rootfs.tar.bz2"

+EMMC_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.bz2"
+
+EMMC_ROOTFS_NAME = "rootfs.tar.bz2"
+
 IMAGE_CLASSES += "image_types_proscend"

 SOC_FAMILY = "mx6ul"

diff --git a/meta-proscend/conf/distro/include/image_emmc.inc b/meta-proscend/conf/distro/include/image_emmc.inc
index 344b579..098416b 100644
--- a/meta-proscend/conf/distro/include/image_emmc.inc
+++ b/meta-proscend/conf/distro/include/image_emmc.inc
@@ -1,3 +1,4 @@

+IMAGE_FSTYPES += "emmc"
 UBOOT_CONFIG = "sd"

diff --git a/meta-proscend/classes/image_types_proscend.bbclass b/meta-proscend/classes/image_types_proscend.bbcla
ss
index 4e5a788..2c9b846 100644
--- a/meta-proscend/classes/image_types_proscend.bbclass
+++ b/meta-proscend/classes/image_types_proscend.bbclass
@@ -140,3 +140,124 @@ IMAGE_CMD_nandflash () {
 # 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]}"
+
+
+
+
+
+
+EMMC= "${MACHINE}.img"
+
+EMMC_GENERATION_COMMAND_mx6ul = "generate_imx_emmc"
+
+
+
+generate_imx_emmc () {
+    # clean up
+    rm -rf ${FIRMWARE_DIR}
+    rm -f `readlink ${DEPLOY_DIR_IMAGE}/${EMMC}`
+    rm -f ${DEPLOY_DIR_IMAGE}/${EMMC}
+
+    mkdir -p ${FIRMWARE_DIR}
+    case "${IMAGE_BOOTLOADER}" in
+        imx-bootlets)
+            bberror "The imx-bootlets is not supported for i.MX based machines"
+            exit 1
+            ;;
+        u-boot)
+            cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} ${FIRMWARE_DIR}
+            ;;
+        barebox)
+            bberror "The imx-bootlets is not supported for i.MX based machines"
+            exit 1
+            ;;
+        "")
+            ;;
+        *)
+            bberror "Unknown IMAGE_BOOTLOADER value"
+            exit 1
+            ;;
+    esac
+
+    if [ -z "${EMMC_ROOTFS_NAME}" ]; then
+        bberror "EMMC_ROOTFS_NAME is not defined. To use emmc image from Proscend it needs to be defined."
+        exit 1
+    fi
+
+    # Encrypt rootfs using triple DES in CBC mode with password(2wsx#EDC)
+    echo "Encrypt rootfs using triple DES in CBC mode with password(2wsx#EDC)"
+    openssl des3 -salt -in ${EMMC_ROOTFS} -out ${FIRMWARE_DIR}/${EMMC_ROOTFS_NAME}.enc -k 2wsx#EDC
+    #cp ${NANDFLASH_ROOTFS} ${FIRMWARE_DIR}/${NANDFLASH_ROOTFS_NAME}
+    if [ $? != 0 ]; then
+        bberror "EMMC_ROOTFS is not found. To use emmc image from Proscend it needs to be generated."
+        exit 1
+    fi
+
+    # Copy device tree file
+    if test -n "${KERNEL_DEVICETREE}"; then
+        for DTS_FILE in ${KERNEL_DEVICETREE}; do
+            DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+            if [ -e "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then
+                cp "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ${FIRMWARE_DIR}
+            else
+                bbfatal "${DTS_FILE} does not exist."
+            fi
+        done
+    fi
+
+    if [ -e "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" ]; then
+        cp "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" ${FIRMWARE_DIR}/zImage
+    fi
+
+    # Encrypt proscend MCSV file using triple DES in CBC mode with password(2wsx#EDC)
+    if [ -e "${DEPLOY_DIR_IMAGE}/mcsv" ]
+    then
+        openssl des3 -salt -in ${DEPLOY_DIR_IMAGE}/mcsv -out ${DEPLOY_DIR_IMAGE}/mcsv.enc -k 2wsx#EDC
+        # Copy encryped MCSV - mcsv.enc
+        cp ${DEPLOY_DIR_IMAGE}/mcsv.enc ${FIRMWARE_DIR}
+    else
+        bberror "MCSV is not found. To use nandflash image from Proscend it needs to be generated."
+        exit 1
+    fi
+
+    # Print MD5 checksums for all images in the firmware folder into file `firmware.md5`
+    cd ${FIRMWARE_DIR}
+    md5sum * > firmware.md5
+    cd -
+
+    # Encrypt firmware_patch.sh file using triple DES in CBC mode with password(2wsx#EDC)
+    if [ -e "${DEPLOY_DIR_IMAGE}/firmware_patch.sh" ]
+    then
+        openssl des3 -salt -in ${DEPLOY_DIR_IMAGE}/firmware_patch.sh -out ${DEPLOY_DIR_IMAGE}/firmware_patch.enc -k 2wsx#EDC
+        # Copy encryped firmware_patch.sh - firmware_patch.enc
+        cp ${DEPLOY_DIR_IMAGE}/firmware_patch.enc ${FIRMWARE_DIR}
+    else
+        bberror "firmware_patch.sh is not found. To use emmc image from Proscend it needs to be generated."
+        exit 1
+    fi
+
+
+
+    filename=$(date "+${MACHINE}_%Y%m%d%H%M%S.img")
+    cd ${DEPLOY_DIR_IMAGE}
+    tar -cf ${filename} firmware
+    ln -s ${filename} ${EMMC}
+    cd -
+}
+
+
+
+IMAGE_CMD_emmc () {
+    if [ -z "${EMMC_ROOTFS}" ]; then
+        bberror "EMMC_ROOTFS is undefined. To use emmc image from Proscend it needs to be defined."
+        exit 1
+    fi
+
+    ${EMMC_GENERATION_COMMAND}
+}
+
+
+
+IMAGE_TYPEDEP_emmc = "${@d.getVar('SDCARD_ROOTFS', 1).split('.')[-1]}"
+
+

diff --git a/scripts/firmware_to_mfg_files.sh b/scripts/firmware_to_mfg_files.sh
index 29c3e79..0939b0a 100755
--- a/scripts/firmware_to_mfg_files.sh
+++ b/scripts/firmware_to_mfg_files.sh
@@ -55,7 +55,7 @@ function main {
   get_rootfs
   mkdir -p ./mfg_files
   cp /tmp/firmware/rootfs.tar.bz2 ./mfg_files
-  cp /tmp/firmware/u-boot-m300.imx-nand ./mfg_files
+  cp /tmp/firmware/u-boot-* ./mfg_files
   cp /tmp/firmware/zImage ./mfg_files
   cp /tmp/firmware/zImage-imx6ul-14x14-evk.dtb ./mfg_files
 }

diff --git a/manufacturing_tool/emmc/mfgtools/Profiles/Linux/OS Firmware/ucl2.xml b/manufacturing_tool/emmc/mfgtools/Profiles/Linux/OS Firmware/ucl2.xml
index ef6d9a7..12b41c9 100644
--- a/manufacturing_tool/emmc/mfgtools/Profiles/Linux/OS Firmware/ucl2.xml
+++ b/manufacturing_tool/emmc/mfgtools/Profiles/Linux/OS Firmware/ucl2.xml
@@ -64,7 +64,7 @@
     body="$ dd if=/dev/zero of=/dev/mmcblk%mmc% bs=1k seek=384 conv=fsync count=129">clear u-boot arg</CMD>
   <CMD state="Updater" type="push" body="$ echo 0 > /sys/block/mmcblk%mmc%boot0/force_ro">access boot partition 1</CMD>
   <CMD state="Updater" type="push"
-    body="send" file="files/u-boot-imx6ul%6uluboot%_sd.imx">Sending u-boot.bin</CMD>
+    body="send" file="files/u-boot-m300e.imx">Sending u-boot.bin</CMD>
   <CMD state="Updater" type="push"
     body="$ dd if=$FILE of=/dev/mmcblk1boot0 bs=512 seek=2">write U-Boot to sd card</CMD>
   <CMD state="Updater" type="push"
@@ -95,7 +95,7 @@

   <!-- burn dual dtb -->
   <CMD state="Updater" type="push"
-    body="send" file="files/imx6ul-%6uldtb%%ldo%.dtb">Sending Device Tree file</CMD>
+    body="send" file="files/zImage-imx6ul-14x14-evk.dtb">Sending Device Tree file</CMD>
   <CMD state="Updater" type="push"
     body="$ cp $FILE /mnt/mmcblk%mmc%p1/imx6ul-%6uldtb%_a.dtb">write device tree to partition - dtb_a</CMD>
   <CMD state="Updater" type="push"
@@ -122,12 +122,12 @@
     body="$ mount -t ext3 /dev/mmcblk%mmc%p3 /mnt/mmcblk%mmc%p3"/>

   <CMD state="Updater" type="push"
-    body="pipe tar -jxv -C /mnt/mmcblk%mmc%p2" file="files/rootfs_nogpu.tar.bz2">Sending and writting rootfs to partition 2</CMD>
+    body="pipe tar -jxv -C /mnt/mmcblk%mmc%p2" file="files/rootfs.tar.bz2">Sending and writting rootfs to partition 2</CMD>
   <CMD state="Updater" type="push"
     body="frf">Finishing rootfs write to partition 2</CMD>

   <CMD state="Updater" type="push"
-    body="pipe tar -jxv -C /mnt/mmcblk%mmc%p3" file="files/rootfs_nogpu.tar.bz2">Sending and writting rootfs to partition 3</CMD>
+    body="pipe tar -jxv -C /mnt/mmcblk%mmc%p3" file="files/rootfs.tar.bz2">Sending and writting rootfs to partition 3</CMD>
   <CMD state="Updater" type="push"
     body="frf">Finishing rootfs write to partition 3</CMD>