Update submodule commit id for tag JH7110_VF2_6.12_v6.0.0

Author: atlasluo

Makefile

@@ -324,7 +324,7 @@ $(sbi_bin): $(uboot) $(vmlinux)
 	rm -rf $(sbi_wrkdir)
 	mkdir -p $(sbi_wrkdir)
 	cd $(sbi_wrkdir) && O=$(sbi_wrkdir) CFLAGS="-mabi=$(ABI) -march=$(ISA)" ${MAKE} -C $(sbi_srcdir) CROSS_COMPILE=$(CROSS_COMPILE) \
-		PLATFORM=generic FW_PAYLOAD_PATH=$(uboot) FW_FDT_PATH=$(uboot_dtb_file) FW_TEXT_START=0x40000000
+		PLATFORM=generic FW_PAYLOAD_PATH=$(uboot) FW_TEXT_START=0x40000000
 
 $(fit): $(sbi_bin) $(vmlinux_bin) $(uboot) $(its_file) ${initramfs}
 	$(uboot_wrkdir)/tools/mkimage -f $(its_file) -A riscv -O linux -T flat_dt $@

README.md

@@ -67,8 +67,13 @@ work/
     │       ├── jh7110-starfive-visionfive-2-ac108.dtb
     │       ├── jh7110-starfive-visionfive-2-v1.3b.dtb
     │       ├── jh7110-starfive-visionfive-2-wm8960.dtb
+    │       ├── jh7110s-starfive-visionfive-2-lite-ac108.dtb
+    │       ├── jh7110s-starfive-visionfive-2-lite-emmc.dtb
+    │       ├── jh7110s-starfive-visionfive-2-lite-wm8960.dtb
+    │       ├── jh7110s-starfive-visionfive-2-lite.dtb
     │       ├── vf2-overlay
-    │       │   └── vf2-overlay-uart3-i2c.dtbo
+    │       │   │── vf2-overlay-uart3-i2c.dtbo
+    │       │   └── vf2-overlay-can.dtbo
     └── Image.gz
 ```
 
@@ -205,7 +210,7 @@ tftpboot ${loadaddr} image.fit;
 Step3: load and execute:
 
 ```
-bootm start ${loadaddr};bootm loados ${loadaddr};run chipa_set_linux;run cpu_vol_set; booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r};
+run fdt_conf_set;bootm start ${loadaddr}#${fdt_conf};bootm loados ${loadaddr};run chipa_set_linux;run cpu_vol_set; booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r};
 ```
 
 When you see the `buildroot login:` message, then congratulations, the launch was successful

Version

@@ -1 +1 @@
-JH7110_VF2_6.12_v5.14.1
+JH7110_VF2_6.12_v6.0.0

buildroot

@@ -266,6 +266,7 @@ BR2_PACKAGE_V4L2_DEC_TEST=y
 BR2_PACKAGE_STARFIVE_FIRMWARE=y
 BR2_PACKAGE_STARFIVE_FIRMWARE_ECR6600U_USB_WIFI=y
 BR2_PACKAGE_STARFIVE_FIRMWARE_AIC8800_USB_WIFI=y
+BR2_PACKAGE_STARFIVE_FIRMWARE_AIC8800_SDIO_WIFI=y
 BR2_PACKAGE_HOST_GENEXT2FS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_GPTFDISK=y

conf/buildroot_initramfs_config_debug

@@ -292,6 +292,7 @@ BR2_PACKAGE_V4L2_DEC_TEST=y
 BR2_PACKAGE_STARFIVE_FIRMWARE=y
 BR2_PACKAGE_STARFIVE_FIRMWARE_ECR6600U_USB_WIFI=y
 BR2_PACKAGE_STARFIVE_FIRMWARE_AIC8800_USB_WIFI=y
+BR2_PACKAGE_STARFIVE_FIRMWARE_AIC8800_SDIO_WIFI=y
 BR2_PACKAGE_HIFI4_SOF=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y

conf/buildroot_rootfs_config

@@ -22,4 +22,4 @@ setupfdt2=fdt set /chosen bootargs "${bootargs}";
 
 bootwait=setenv _delay ${bootdelay}; echo ${_delay}; while test ${_delay} > 0; do sleep 1; setexpr _delay ${_delay} - 1; echo ${_delay}; done
 
-boot2=run bootargs_ext; fatload ${bootdev} ${devnum}:${bootpart} ${loadaddr} ${fitfile}; bootm start ${loadaddr}; run setupfdt1;run setupird;run setupfdt2; bootm loados ${loadaddr}; run chipa_set_linux; run cpu_vol_set; echo "Booting kernel in"; booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdtaddr}
+boot2=run bootargs_ext; fatload ${bootdev} ${devnum}:${bootpart} ${loadaddr} ${fitfile}; run fdt_conf_set; bootm start ${loadaddr}#${fdt_conf}; run setupfdt1;run setupird;run setupfdt2; bootm loados ${loadaddr}; run chipa_set_linux; run cpu_vol_set; echo "Booting kernel in"; booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdtaddr}

conf/vf2_uEnv.txt

@@ -32,21 +32,63 @@
                         arch = "riscv";
                         load = <0x0 0x46000000>;
                         compression = "none";
-                        hash-1 {
-                                algo = "sha256";
-                        };
+                };
+
+                fdt-cm {
+                        data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-cm.dtb");
+                        type = "flat_dt";
+                        arch = "riscv";
+                        load = <0x0 0x46000000>;
+                        compression = "none";
+                };
+
+                fdt-lite {
+                        data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite.dtb");
+                        type = "flat_dt";
+                        arch = "riscv";
+                        load = <0x0 0x46000000>;
+                        compression = "none";
+                };
+
+                fdt-lite-emmc {
+                        data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite-emmc.dtb");
+                        type = "flat_dt";
+                        arch = "riscv";
+                        load = <0x0 0x46000000>;
+                        compression = "none";
                 };
         };
 
         configurations {
-                default = "config-1";
+                default = "config-default";
 
-                config-1 {
+                config-default {
                         description = "visionfive2 with opensbi";
-						kernel = "vmlinux";
+                        kernel = "vmlinux";
                         fdt = "fdt";
                         loadables = "ramdisk";
                 };
+
+                config-cm {
+                        description = "visionfive2 with opensbi";
+                        kernel = "vmlinux";
+                        fdt = "fdt-cm";
+                        loadables = "ramdisk";
+                };
+
+                config-lite {
+                        description = "visionfive2 with opensbi";
+                        kernel = "vmlinux";
+                        fdt = "fdt-lite";
+                        loadables = "ramdisk";
+                };
+
+                config-lite-emmc {
+                        description = "visionfive2 with opensbi";
+                        kernel = "vmlinux";
+                        fdt = "fdt-lite-emmc";
+                        loadables = "ramdisk";
+                };
         };
 };
 

conf/visionfive2-fit-image.its

@@ -15,14 +15,37 @@
 			entry = <0x0 0x40000000>;
 			compression = "none";
 		};
+
+		fdt {
+			data = /incbin/("../work/u-boot/arch/riscv/dts/starfive_visionfive2.dtb");
+			type = "flat_dt";
+			arch = "riscv";
+			load = <0x40400000>;
+			compression = "none";
+		};
+
+		fdt-lite {
+			data = /incbin/("../work/u-boot/arch/riscv/dts/starfive_visionfive2_lite.dtb");
+			type = "flat_dt";
+			arch = "riscv";
+			load = <0x40400000>;
+			compression = "none";
+		};
 	};
 
 	configurations {
-		default = "config-1";
+		default = "config-default";
+
+		config-default {
+			description = "StarFive VisionFive V2";
+			firmware = "firmware";
+			fdt = "fdt";
+		};
 
-		config-1 {
-			description = "U-boot-spl FIT config for JH7110 VisionFive2";
+		config-lite {
+			description = "StarFive VisionFive V2 Lite";
 			firmware = "firmware";
+			fdt = "fdt-lite";
 		};
 	};
 };