Browse Source

jh8100: starfive-jh8100: Update machine config and wks

Added u-boot.itb and uboot env to boot partition. Update wks image generation to include scp_raw.img in gpt raw partition.

Signed-off-by: yang.lee <yang.lee@starfivetech.com>
yang.lee 5 months ago
parent
commit
08962150ad
2 changed files with 5 additions and 1 deletions
  1. 2 0
      conf/machine/starfive-jh8100.conf
  2. 3 1
      wic/starfive-jh8100.wks

+ 2 - 0
conf/machine/starfive-jh8100.conf

@@ -69,5 +69,7 @@ WKS_FILE_DEPENDS ?= " \
 IMAGE_BOOT_FILES ?= " \
         jh8100-fpga.dtb \
 	Image \
+	uboot.env \
+	u-boot.itb \
 "
 WKS_FILE ?= "starfive-jh8100.wks"

+ 3 - 1
wic/starfive-jh8100.wks

@@ -1,10 +1,12 @@
 #short-description: Create SD card image for Starfive Duhbe
 # long-description: Creates a partitioned SD card image for Starfive Dubhe.
 
+part spl --source rawcopy  --sourceparams="file=scp_raw.img" --part-name spl --offset 2M --size 5M --part-type 2E54B353-1271-4842-806F-E436D6AF6985
+
 #boot partition
 part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 1024 --size=200M --use-uuid
 
 #root partition
 part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 1024 --size=2G --use-uuid
 
-bootloader --append "rootwait console=ttyS0,115200"
+bootloader --append "rootwait console=ttyS0,115200" --ptable gpt