Quellcode durchsuchen

jh8100: u-boot: Update u-boot recipe

Update u-boot source revision and branch to fpga-starfive-v1.2-jh8100.

Signed-off-by: yang.lee <yang.lee@starfivetech.com>
yang.lee vor 3 Monaten
Ursprung
Commit
a3d97a783a
1 geänderte Dateien mit 17 neuen und 20 gelöschten Zeilen
  1. 17 20
      recipes-bsp/u-boot/u-boot-starfive.bb

+ 17 - 20
recipes-bsp/u-boot/u-boot-starfive.bb

@@ -18,8 +18,8 @@ BRANCH:starfive-visionfive2 = "JH7110_VisionFive2_devel"
 SRCREV:starfive-visionfive2 = "b6e2b0e85c774a18ae668223a6e5f7d335895243"
 
 FORK:starfive-jh8100 = "starfive-tech"
-BRANCH:starfive-jh8100 = "jh8100_fpga_dev_v2023.01-bmc-30Nov"
-SRCREV:starfive-jh8100 = "c1a4c841e01fbcd3f6d5e894e726e9f50abc6938"
+BRANCH:starfive-jh8100 = "jh8100_fpga_dev_v2023.01"
+SRCREV:starfive-jh8100 = "7f3f31a04b3a0e2bd7f3c78d290648e33abbb646"
 
 SRC_URI:starfive-dubhe = "\
 	git://github.com/${FORK}/u-boot.git;protocol=https;branch=${BRANCH} \
@@ -47,7 +47,7 @@ SRC_URI:starfive-jh8100 = "\
 
 DEPENDS:append:starfive-dubhe = " u-boot-tools-native bmap-tools-native opensbi"
 DEPENDS:append:starfive-visionfive2 = " u-boot-tools-native starfive-tool-native"
-DEPENDS:append:starfive-jh8100 = " u-boot-tools-native bmap-tools-native opensbi starfive-tool"
+DEPENDS:append:starfive-jh8100 = " u-boot-tools-native bmap-tools-native opensbi spltool-native"
 
 # Overwrite this for your server
 TFTP_SERVER_IP ?= "127.0.0.1"
@@ -64,14 +64,12 @@ do_configure:prepend:starfive-jh8100() {
         -d ${WORKDIR}/tftp-mmc-boot.txt ${WORKDIR}/${UBOOT_ENV_BINARY}
 }
 
-do_configure:prepend:starfive-dubhe() {
-    cp ${DEPLOY_DIR_IMAGE}/fw_dynamic.bin ${WORKDIR}/build/fw_dynamic.bin
-    export OPENSBI=${WORKDIR}/build/fw_dynamic.bin
+do_compile:prepend:starfive-dubhe() {
+    export OPENSBI=${DEPLOY_DIR_IMAGE}/fw_dynamic.bin
 }
 
-do_configure:prepend:starfive-jh8100() {
-    cp ${DEPLOY_DIR_IMAGE}/fw_dynamic.bin ${WORKDIR}/build/fw_dynamic.bin
-    export OPENSBI=${WORKDIR}/build/fw_dynamic.bin
+do_compile:prepend:starfive-jh8100() {
+    export OPENSBI=${DEPLOY_DIR_IMAGE}/fw_dynamic.bin
 }
 
 do_deploy:append:starfive-visionfive2() {
@@ -84,8 +82,7 @@ do_deploy:append:starfive-visionfive2() {
 }
 
 do_deploy:append:starfive-dubhe() {
-    install -m 644 ${WORKDIR}/build/u-boot.itb ${DEPLOYDIR}/u-boot.itb
-    rm ${WORKDIR}/build/fw_dynamic.bin
+    install -m 644 ${B}/u-boot.itb ${DEPLOYDIR}/u-boot.itb
     install -m 644 ${WORKDIR}/run_qemu_virt.dtb ${DEPLOYDIR}/run_qemu_virt.dtb
 }
 
@@ -93,20 +90,20 @@ do_deploy:append:starfive-jh8100() {
     install -m 644 ${WORKDIR}/uboot.env ${DEPLOYDIR}/uboot.env
     install -m 644 ${WORKDIR}/bootloader.bin.normal.out ${DEPLOYDIR}/bootloader.bin.normal.out
     install -m 644 ${WORKDIR}/firmware_merak.bin.normal.out ${DEPLOYDIR}/firmware_merak.bin.normal.out
-    install -m 644 ${WORKDIR}/build/u-boot.itb ${DEPLOYDIR}/u-boot.itb
-    rm ${WORKDIR}/build/fw_dynamic.bin
+    install -m 644 ${B}/u-boot.itb ${DEPLOYDIR}/u-boot.itb
     install -m 644 ${WORKDIR}/run_qemu_virt.dtb ${DEPLOYDIR}/run_qemu_virt.dtb
 
-    ${DEPLOY_DIR_IMAGE}/jh8100_cst/mkbif ${DEPLOYDIR}/${SPL_BINARYNAME}
+    mkbif ${DEPLOYDIR}/${SPL_BINARYNAME}
+
+    dd if=${WORKDIR}/bootloader.bin.normal.out of=${DEPLOYDIR}/scp_raw.img count=1 bs=512k conv=sync
+    dd if=${WORKDIR}/bootloader.bin.normal.out of=${DEPLOYDIR}/scp_raw.img seek=1 count=1 bs=512k conv=sync
 
-    dd if=${WORKDIR}/bootloader.bin.normal.out of=${DEPLOY_DIR_IMAGE}/scp_raw.img count=1 bs=512k conv=sync
-    dd if=${WORKDIR}/bootloader.bin.normal.out of=${DEPLOY_DIR_IMAGE}/scp_raw.img seek=1 count=1 bs=512k conv=sync
+    dd if=${WORKDIR}/firmware_merak.bin.normal.out of=${DEPLOYDIR}/scp_raw.img seek=2 count=1 bs=512k conv=sync
+    dd if=${WORKDIR}/firmware_merak.bin.normal.out of=${DEPLOYDIR}/scp_raw.img seek=3 count=1 bs=512k conv=sync
 
-    dd if=${WORKDIR}/firmware_merak.bin.normal.out of=${DEPLOY_DIR_IMAGE}/scp_raw.img seek=2 count=1 bs=512k conv=sync
-    dd if=${WORKDIR}/firmware_merak.bin.normal.out of=${DEPLOY_DIR_IMAGE}/scp_raw.img seek=3 count=1 bs=512k conv=sync
+    dd if=${DEPLOYDIR}/${SPL_BINARYNAME}.normal.out of=${DEPLOYDIR}/scp_raw.img seek=4 count=1 bs=512k conv=sync
+    dd if=${DEPLOYDIR}/${SPL_BINARYNAME}.normal.out of=${DEPLOYDIR}/scp_raw.img seek=5 count=1 bs=512k conv=sync
 
-    dd if=${DEPLOYDIR}/${SPL_BINARYNAME}.normal.out of=${DEPLOY_DIR_IMAGE}/scp_raw.img seek=4 count=1 bs=512k conv=sync
-    dd if=${DEPLOYDIR}/${SPL_BINARYNAME}.normal.out of=${DEPLOY_DIR_IMAGE}/scp_raw.img seek=5 count=1 bs=512k conv=sync
 }
 
 TOOLCHAIN = "gcc"