Sfoglia il codice sorgente

image function fix

Tekkaman Ninja 2 anni fa
parent
commit
260175887c

+ 1 - 0
scripts/staging/boards/visionfive_v1/Kconfig

@@ -12,3 +12,4 @@ source "scripts/staging/boards/visionfive_v1/Kconfig.linux"
 
 source "scripts/staging/boards/visionfive_v1/Kconfig.fit"
 
+source "scripts/staging/boards/visionfive_v1/Kconfig.image"

+ 35 - 0
scripts/staging/boards/visionfive_v1/Kconfig.image

@@ -0,0 +1,35 @@
+menu "SD/flash Image build configuration"
+
+config VISIONFIVE_V1_UENV_PATH
+	string "Pre-build uEnv.txt file path"
+	default "../../prebuild/image_visionfive_v1/uEnv.txt"
+
+config VISIONFIVE_V1_ROOTFS_IMAGE_PATH
+	string "Pre-build rootfs image(ext) path"
+	default "../../prebuild/image_visionfive_v1/test.ext4"
+
+config VISIONFIVE_V1_BOOT_START
+	int "boot partition(vfat) start sector( 512 B/sector ) number."
+	default 4096
+
+config VISIONFIVE_V1_BOOT_SECTORS
+	int "boot partition(vfat) size(in sectors)."
+	default 466943
+
+config VISIONFIVE_V1_BOOTLOADER_START
+	int "bootloader partition(raw) start sector( 512 B/sector ) number."
+	default 471040
+
+config VISIONFIVE_V1_BOOTLOADER_SECTORS
+	int "bootloader partition(raw) size(in sectors)."
+	default 2047
+
+config VISIONFIVE_V1_ROOTFS_START
+	int "rootfs partition(ext4) start sector( 512 B/sector ) number."
+	default 475136
+
+config VISIONFIVE_V1_ROOTFS_SECTORS
+	int "rootfs partition(ext4) size(in sectors)."
+	default 466943
+
+endmenu

+ 11 - 11
scripts/staging/boards/visionfive_v1/image.mk

@@ -11,23 +11,23 @@
 #make DISK=/dev/sdX format-nvdla-rootfs && sync
 
 #TF 卡分区信息:
-VISIONFIVE_V1_BOOT_TYPE		= EBD0A0A2-B9E5-4433-87C0-68B6B72699C7
+VISIONFIVE_V1_BOOT_TYPE			= EBD0A0A2-B9E5-4433-87C0-68B6B72699C7
 VISIONFIVE_V1_ROOTFS_TYPE		= 0FC63DAF-8483-4772-8E79-3D69D8477DE4
 VISIONFIVE_V1_BOOTLOADER_TYPE		= 5B193300-FC78-40CD-8002-E86C45580B47
 
 
 #for debug
-VISIONFIVE_V1_UENV_PATH=$(SDK_PREBUILD_DIR)/image$(CONFIG_BOARD_SUBFIX)/uEnv.txt
-CONFIG_VISIONFIVE_V1_ROOTFS_IMAGE=$(SDK_PREBUILD_DIR)/image$(CONFIG_BOARD_SUBFIX)/test.ext4
+#CONFIG_VISIONFIVE_V1_UENV_PATH=$(SDK_PREBUILD_DIR)/image$(CONFIG_BOARD_SUBFIX)/uEnv.txt
+#CONFIG_VISIONFIVE_V1_ROOTFS_IMAGE_PATH=$(SDK_PREBUILD_DIR)/image$(CONFIG_BOARD_SUBFIX)/test.ext4
 
-CONFIG_VISIONFIVE_V1_BOOT_START=4096
-CONFIG_VISIONFIVE_V1_BOOT_SECTORS=466943
+#CONFIG_VISIONFIVE_V1_BOOT_START=4096
+#CONFIG_VISIONFIVE_V1_BOOT_SECTORS=466943
 
-CONFIG_VISIONFIVE_V1_BOOTLOADER_START=471040
-CONFIG_VISIONFIVE_V1_BOOTLOADER_SECTORS=2047
+#CONFIG_VISIONFIVE_V1_BOOTLOADER_START=471040
+#CONFIG_VISIONFIVE_V1_BOOTLOADER_SECTORS=2047
 
-CONFIG_VISIONFIVE_V1_ROOTFS_START=475136
-CONFIG_VISIONFIVE_V1_ROOTFS_SECTORS=409600
+#CONFIG_VISIONFIVE_V1_ROOTFS_START=475136
+#CONFIG_VISIONFIVE_V1_ROOTFS_SECTORS=409600
 #for debug
 
 VISIONFIVE_V1_BOOT_END=$(shell expr \
@@ -90,13 +90,13 @@ visionfive_v1_make_image:
 	mkdir -p mnt/boot;\
 	sudo mount /dev/mapper/$${BOOT_LOOP_DEV} mnt/boot; sleep 3; \
 	sudo cp -rf $(SDK_OUTPUT_DIR)/$(CONFIG_CONFIG_FILE).fit \
-	$(VISIONFIVE_V1_UENV_PATH) mnt/boot/ ;\
+	$(CONFIG_VISIONFIVE_V1_UENV_PATH) mnt/boot/ ;\
 	tree -h --timefmt "%Y/%m/%d %H:%M:%S" mnt/boot/; \
 	sync; sleep 3; sudo umount mnt/boot; \
 	rm -rf mnt; \
 	sudo dd if=$(join $(UBOOT_INSTALL_DIR), $(CONFIG_BOARD_SUBFIX))/u-boot.bin \
 	of=/dev/mapper/$${BL_LOOP_DEV} bs=4K; sync; \
-	sudo dd if=$(CONFIG_VISIONFIVE_V1_ROOTFS_IMAGE) \
+	sudo dd if=$(CONFIG_VISIONFIVE_V1_ROOTFS_IMAGE_PATH) \
 	of=/dev/mapper/$${ROOT_LOOP_DEV} bs=4K; sync; \
 	sudo resize2fs /dev/mapper/$${ROOT_LOOP_DEV}; \
 	sudo fsck.ext4 /dev/mapper/$${ROOT_LOOP_DEV}; \