Explorar el Código

dubhe: images: Move dd function to IMAGE_CMD
To fix ubifs dd before opensbi:do_deploy (fw_payload.bin not found).
Remove insignificant comments from image recipes.
Remove unwanted IMAGE_FSTYPES from qspi-nfs-image recipe.

Signed-off-by: weiheng.cheng <weiheng.cheng@starfivetech.com>

weiheng.cheng hace 7 meses
padre
commit
fb2349c373

+ 0 - 2
recipes-core/images/dubhe-image-essential.inc

@@ -1,8 +1,6 @@
 # Image Root Filesystem Configuration
 
 IMAGE_FSTYPES += "ext4 wic wic.gz wic.bmap"
-#MKUBIFS_ARGS = "-m 4096 -e 262144 -c 4096"
-#UBINIZE_ARGS = "-p 278528 -m 4096 -s 4096"
 
 IMAGE_ROOTFS_SIZE ?= "8192"
 #IMAGE_ROOTFS_EXTRA_SPACE = "0"

+ 0 - 1
recipes-core/images/dubhe-image-initramfs.bb

@@ -14,7 +14,6 @@ IMAGE_FEATURES = ""
 
 export IMAGE_BASENAME = "dubhe-image-initramfs"
 IMAGE_NAME_SUFFIX ?= ""
-#IMAGE_LINGUAS = ""
 IMAGE_LINGUAS = "en-us"
 GLIBC_GENERATE_LOCALES = "en_US.UTF-8"
 

+ 10 - 23
recipes-core/images/dubhe-image-minimal_0.1.bb

@@ -8,32 +8,21 @@ DEPENDS += "opensbi deploy-bootfiles quilt quilt-native"
 
 LIC_FILES_CHKSUM = ""
 
-require dubhe-image-essential.inc
+IMAGE_FSTYPES += "qspi_ext4 qspi_sd"
 
-#DEPENDS = "opensbi deploy-bootfiles"
-#IMAGE_INSTALL += "tools-sdk dev-pkgs"
-#IMAGE_INSTALL += "packagegroup-common-essential"
-#IMAGE_INSTALL += "packagegroup-network-essential"
-#IMAGE_INSTALL += "packagegroup-core-ssh-openssh"
+require dubhe-image-essential.inc
 
-#export IMAGE_BASENAME = "${PN}"
 export IMAGE_BASENAME = "console-image-minimal"
 
-# NFS workaround
-#ROOTFS_POSTPROCESS_COMMAND += "nfs_rootfs ; lighttpd_rootfs ;"
-#nfs_rootfs(){
-#	cd ${IMAGE_ROOTFS}/lib/systemd/system/; sed -i '/Wants/a ConditionKernelCommandLine=!root=/dev/nfs' connman.service
-#}
+do_image_qspi_ext4[depends] += " \
+	deploy-bootfiles:do_deploy \
+	opensbi:do_deploy \
+	virtual/kernel:do_deploy \
+	"
 
-#lighttpd_rootfs(){
-#	rm ${IMAGE_ROOTFS}/var/log; mkdir -p ${IMAGE_ROOTFS}/var/log; touch ${IMAGE_ROOTFS}/var/log/lighttpd
-#}
+IMAGE_TYPEDEP:qspi_sd = "ext4 wic wic.gz wic.bmap"
 
-do_qspi[depends] += " deploy-bootfiles:do_deploy"
-do_qspi[depends] += " opensbi:do_deploy"
-do_qspi[depends] += " virtual/kernel:do_deploy"
-
-do_qspi (){
+IMAGE_CMD:qspi_ext4 (){
 	dd if=${DEPLOY_DIR_IMAGE}/bootcode_min.bin of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-90-qspi-ext4-image.bin bs=32 seek=0 count=128
         dd if=${DEPLOY_DIR_IMAGE}/bootjump.bin of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-90-qspi-ext4-image.bin bs=32 seek=128 count=1
         dd if=${DEPLOY_DIR_IMAGE}/dubhe90_fpga_ext4.dtb of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-90-qspi-ext4-image.bin bs=32 seek=129 count=255
@@ -43,9 +32,7 @@ do_qspi (){
         dd if=${DEPLOY_DIR_IMAGE}/dubhe80_fpga_ext4.dtb of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-80-qspi-ext4-image.bin bs=32 seek=129 count=255
 }
 
-do_sd (){
+IMAGE_CMD:qspi_sd (){
 	cd ${IMGDEPLOYDIR}
 	bmaptool copy console-image-minimal-starfive-dubhe.wic.gz ${DEPLOY_DIR_IMAGE}/SD-Image.img
 }
-
-IMAGE_POSTPROCESS_COMMAND += "do_qspi;do_sd;"

+ 1 - 3
recipes-core/images/qspi-nfs-essential.inc

@@ -1,8 +1,6 @@
 # Image Root Filesystem Configuration
 
-IMAGE_FSTYPES += "ext4 wic wic.gz wic.bmap"
-#MKUBIFS_ARGS = "-m 4096 -e 262144 -c 4096"
-#UBINIZE_ARGS = "-p 278528 -m 4096 -s 4096"
+#IMAGE_FSTYPES += "ext4 wic wic.gz wic.bmap"
 
 IMAGE_ROOTFS_SIZE ?= "8192"
 #IMAGE_ROOTFS_EXTRA_SPACE = "0"

+ 8 - 13
recipes-core/images/qspi-nfs-image_0.1.bb

@@ -8,15 +8,10 @@ DEPENDS += "opensbi deploy-bootfiles quilt quilt-native"
 
 LIC_FILES_CHKSUM = ""
 
-require qspi-nfs-essential.inc
+IMAGE_FSTYPTES += "qspi_nfs"
 
-#DEPENDS = "opensbi deploy-bootfiles"
-#IMAGE_INSTALL += "tools-sdk dev-pkgs"
-#IMAGE_INSTALL += "packagegroup-common-essential"
-#IMAGE_INSTALL += "packagegroup-network-essential"
-#IMAGE_INSTALL += "packagegroup-core-ssh-openssh"
+require qspi-nfs-essential.inc
 
-#export IMAGE_BASENAME = "${PN}"
 export IMAGE_BASENAME = "nfs-rootfs"
 
 # NFS workaround
@@ -29,11 +24,13 @@ export IMAGE_BASENAME = "nfs-rootfs"
 #	rm ${IMAGE_ROOTFS}/var/log; mkdir -p ${IMAGE_ROOTFS}/var/log; touch ${IMAGE_ROOTFS}/var/log/lighttpd
 #}
 
-do_qspi[depends] += " deploy-bootfiles:do_deploy"
-do_qspi[depends] += " opensbi:do_deploy"
-do_qspi[depends] += " virtual/kernel:do_deploy"
+do_image_qspi_nfs[depends] += " \
+	deploy-bootfiles:do_deploy \
+	opensbi:do_deploy \
+	virtual/kernel:do_deploy \
+	"
 
-do_qspi (){
+IMAGE_CMD:qspi_nfs (){
 	dd if=${DEPLOY_DIR_IMAGE}/bootcode_min.bin of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-90-qspi-nfs-image.bin bs=32 seek=0 count=128
         dd if=${DEPLOY_DIR_IMAGE}/bootjump.bin of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-90-qspi-nfs-image.bin bs=32 seek=128 count=1
         dd if=${DEPLOY_DIR_IMAGE}/dubhe90_fpga_nfs.dtb of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-90-qspi-nfs-image.bin bs=32 seek=129 count=255
@@ -42,5 +39,3 @@ do_qspi (){
 	cp ${DEPLOY_DIR_IMAGE}/starfive-dubhe-90-qspi-nfs-image.bin ${DEPLOY_DIR_IMAGE}/starfive-dubhe-80-qspi-nfs-image.bin
         dd if=${DEPLOY_DIR_IMAGE}/dubhe80_fpga_nfs.dtb of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-80-qspi-nfs-image.bin bs=32 seek=129 count=255
 }
-
-IMAGE_POSTPROCESS_COMMAND += "do_qspi;"

+ 9 - 6
recipes-core/images/qspi-ubifs-image_0.1.bb

@@ -8,7 +8,7 @@ DEPENDS += "opensbi deploy-bootfiles quilt quilt-native"
 
 LIC_FILES_CHKSUM = ""
 
-IMAGE_FSTYPES = "ubi ubifs"
+IMAGE_FSTYPES = "ubi ubifs qspi_ubifs"
 MKUBIFS_ARGS = "-m 1 -e 65408 -c 26876"
 UBINIZE_ARGS = " -p 64KiB -m 1"
 
@@ -22,11 +22,15 @@ IMAGE_INSTALL += "helloworld"
 IMAGE_FEATURES:remove = "dbg-pkgs"
 
 export IMAGE_BASENAME = "qspi-ubifs"
-do_qspi[depends] += " deploy-bootfiles:do_deploy"
-do_qspi[depends] += " opensbi:do_deploy"
-do_qspi[depends] += " virtual/kernel:do_deploy"
+do_image_qspi_ubifs[depends] += " \
+	deploy-bootfiles:do_deploy \
+	opensbi:do_deploy \
+	virtual/kernel:do_deploy \
+	"
 
-do_qspi () {
+IMAGE_TYPEDEP:qspi_ubifs = "ubi"
+
+IMAGE_CMD:qspi_ubifs () {
         dd if=${DEPLOY_DIR_IMAGE}/bootcode.bin of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-90-qspi-ubifs-image.bin bs=32 seek=0 count=128
         dd if=${DEPLOY_DIR_IMAGE}/bootjump.bin of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-90-qspi-ubifs-image.bin bs=32 seek=128 count=1
         dd if=${DEPLOY_DIR_IMAGE}/dubhe90_fpga_ubi.dtb of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-90-qspi-ubifs-image.bin bs=32 seek=129 count=255
@@ -37,4 +41,3 @@ do_qspi () {
         dd if=${DEPLOY_DIR_IMAGE}/dubhe80_fpga_ubi.dtb of=${DEPLOY_DIR_IMAGE}/starfive-dubhe-80-qspi-ubifs-image.bin bs=32 seek=129 count=255
 }
 
-IMAGE_POSTPROCESS_COMMAND += "do_qspi;"