Browse Source

Merge branch 'starfive-honister' into 'starfive-honister'

Starfive honister : Vector Multicore Update

See merge request starfive-tech/meta-starfive!21
tienhock.loh 1 year ago
parent
commit
90f44d3e78

+ 1 - 1
conf/machine/starfive-dubhe.conf

@@ -29,7 +29,7 @@ require conf/machine/include/riscv/tune-riscv.inc
 
 MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
 
-KERNEL_DEVICETREE ?= "starfive/dubhe_fpga.dtb"
+KERNEL_DEVICETREE ?= "starfive/dubhe_fpga.dtb starfive/dubhe_fpga_dual.dtb "
 KERNEL_IMAGETYPE = "Image"
 
 KEEPUIMAGE = "no"

+ 2 - 0
recipes-bsp/deploy-bootfiles/deploy-bootfiles_0.1.bb

@@ -5,6 +5,7 @@ LICENSE = "CLOSED"
 LIC_FILES_CHKSUM = ""
 
 SRC_URI = "file://bootcode.bin \
+           file://bootcode_dual.bin \
            file://bootjump.bin \
           "
           
@@ -13,6 +14,7 @@ S = "${WORKDIR}"
 inherit deploy
 do_deploy(){
 	install -m 755 ${WORKDIR}/bootcode.bin ${DEPLOYDIR}/
+	install -m 755 ${WORKDIR}/bootcode_dual.bin ${DEPLOYDIR}/
 	install -m 755 ${WORKDIR}/bootjump.bin ${DEPLOYDIR}/
 }
 

BIN
recipes-bsp/deploy-bootfiles/files/bootcode_dual.bin


+ 5 - 0
recipes-images/qspi-image/qspi-image_0.1.bb

@@ -20,4 +20,9 @@ IMAGE_CMD:qspi () {
 	dd if=${DEPLOY_DIR_IMAGE}/bootjump.bin of=${DEPLOY_DIR_IMAGE}/QSPI-Image.bin bs=32 seek=128 count=1
 	dd if=${DEPLOY_DIR_IMAGE}/dubhe_fpga.dtb of=${DEPLOY_DIR_IMAGE}/QSPI-Image.bin bs=32 seek=129 count=255
 	dd if=${DEPLOY_DIR_IMAGE}/fw_payload.bin of=${DEPLOY_DIR_IMAGE}/QSPI-Image.bin bs=32 seek=384
+	dd if=${DEPLOY_DIR_IMAGE}/bootcode_dual.bin of=${DEPLOY_DIR_IMAGE}/QSPI-Image-Dual.bin bs=32 seek=0 count=128
+	dd if=${DEPLOY_DIR_IMAGE}/bootjump.bin of=${DEPLOY_DIR_IMAGE}/QSPI-Image-Dual.bin bs=32 seek=128 count=1
+	dd if=${DEPLOY_DIR_IMAGE}/dubhe_fpga_dual.dtb of=${DEPLOY_DIR_IMAGE}/QSPI-Image-Dual.bin bs=32 seek=129 count=255
+	dd if=${DEPLOY_DIR_IMAGE}/fw_payload.bin of=${DEPLOY_DIR_IMAGE}/QSPI-Image-Dual.bin bs=32 seek=384
+
 }

+ 1 - 1
recipes-kernel/linux/linux-starfive-dev.bbappend

@@ -1,6 +1,6 @@
 FORK = "starfive-tech"
 BRANCH = "starfive-5.15-dubhe"
-SRCREV = "cbb31a27ff5e0fa07b106691a9ad9851435a5a07"
+SRCREV = "86f3ed476b1034914fe49f2fc83d60ff75003ccc"
 
 LINUX_VERSION = "5.15.0"
 LINUX_VERSION_EXTENSION:append = "-starlight"