Kaynağa Gözat

Fix for make visionfive_v1_all

Andy Hu 2 yıl önce
ebeveyn
işleme
172cee9ffb
3 değiştirilmiş dosya ile 20 ekleme ve 12 silme
  1. 3 3
      .gitmodules
  2. 16 8
      scripts/distro_buildroot.mk
  3. 1 1
      scripts/staging/components/fit.mk

+ 3 - 3
.gitmodules

@@ -1,15 +1,15 @@
 [submodule "buildroot"]
 	path = src/distros/buildroot
 	url = git@github.com:starfive-tech/sft-riscv-buildroot.git
-	branch = starlight_multimedia
+	branch = starlight_multimedia_new_sdk
 [submodule "u-boot"]
 	path = src/firmware/u-boot
 	url = git@github.com:starfive-tech/u-boot.git
-	branch = JH7100_Multimedia_V0.1.0
+	branch = JH7100_upstream
 [submodule "linux"]
 	path = src/kernel/linux
 	url = git@github.com:starfive-tech/linux.git
-	branch = beaglev-5.13.y_multimedia
+	branch = visionfive-5.15.y-devel
 [submodule "opensbi"]
 	path = src/firmware/opensbi
 	url = git@github.com:starfive-tech/opensbi.git

+ 16 - 8
scripts/distro_buildroot.mk

@@ -49,18 +49,26 @@ vpudriver-build:
 	$(MAKE) -C $(buildroot_initramfs_wrkdir) O=$(buildroot_initramfs_wrkdir) wave511driver
 	$(MAKE) -C $(buildroot_initramfs_wrkdir) O=$(buildroot_initramfs_wrkdir) wave521driver
 
-.PHONY: initrd
+.PHONY: initrd buildroot_initramfs
 initrd: $(initramfs)
 
+buildroot_initramfs: $(initramfs).d
+
 $(initramfs).d: $(buildroot_initramfs_sysroot) $(buildroot_initramfs_tar)
-	$(linux_srcdir)/usr/gen_initramfs_list.sh -l $(confdir)/initramfs.txt $(buildroot_initramfs_sysroot) > $@
+	touch $@
 
-$(initramfs): $(buildroot_initramfs_sysroot) $(vmlinux) $(buildroot_initramfs_tar)
-	cd $(linux_wrkdir) && \
-		$(linux_srcdir)/usr/gen_initramfs_list.sh \
-		-o $@ -u $(shell id -u) -g $(shell id -g) \
+initramfs_cpio := $(wrkdir)/initramfs.cpio
+# Generate initramfs.cpio.gz after buildroot and kernel had been compiled
+$(initramfs): $(initramfs).d
+	pushd $(_BOARD_LINUX_SRC_DIR); \
+		$(linux_srcdir)/usr/gen_initramfs.sh \
+		-l $(initramfs).d \
+		-o $(initramfs_cpio) -u $(shell id -u) -g $(shell id -g) \
 		$(confdir)/initramfs.txt \
-		$(buildroot_initramfs_sysroot)
+		$(buildroot_initramfs_sysroot); \
+	(cat $(initramfs_cpio) | gzip -n -9 -f - > $@) || (rm -f $@; echo "Error: Fail to compress $(initramfs_cpio)"; exit 1); \
+	rm -f $(initramfs_cpio); \
+	popd
 
 # use buildroot_initramfs toolchain
 # TODO: fix path and conf/buildroot_rootfs_config
@@ -75,7 +83,7 @@ $(buildroot_rootfs_ext): $(buildroot_srcdir) $(buildroot_rootfs_wrkdir)/.config
 
 .PHONY: buildroot_rootfs
 buildroot_rootfs: $(buildroot_rootfs_ext)
-	cp $< $@
+#	cp $< $@
 
 $(rootfs): $(buildroot_rootfs_ext)
 	cp $< $@

+ 1 - 1
scripts/staging/components/fit.mk

@@ -11,7 +11,7 @@ _board_fit_its:
 			     $(FIT_ITS_FILE))
 
 #_board_uboot_build_tools
-_board_fit: _board_fit_its
+_board_fit: initrd _board_fit_its
 	$(_BOARD_UBOOT_SRC_DIR)/tools/mkimage \
 		-f $(FIT_ITS_FILE) \
 		-A riscv \