From 3af3b09b1936619e6290a4f318d81aa21bff56fc Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Tue, 2 Nov 2021 13:48:51 +0100 Subject: [PATCH] hifiveu: fix uboot inclusion into sdcard image Signed-off-by: Zoltan HERPAI --- target/linux/hifiveu/image/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/hifiveu/image/Makefile b/target/linux/hifiveu/image/Makefile index df3bd6199d..c254281ba8 100644 --- a/target/linux/hifiveu/image/Makefile +++ b/target/linux/hifiveu/image/Makefile @@ -18,7 +18,7 @@ define Build/riscv-sdcard # mcopy -i $@.boot $(STAGING_DIR_IMAGE)/uenv-riscv64-boot.scr ::boot.scr mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)-boot.scr ::boot.scr - mcopy -i $@.boot $(DTS_DIR)/sifive/hifive-unleashed-a00.dtb ::dtb + mcopy -i $@.boot $(DTS_DIR)/$(DEVICE_DTS).dtb ::dtb mcopy -i $@.boot $(IMAGE_KERNEL) ::uImage ./gen_riscv64_sdcard_img.sh \ @@ -27,15 +27,15 @@ define Build/riscv-sdcard $(IMAGE_ROOTFS) \ $(CONFIG_HIFIVEU_SD_BOOT_PARTSIZE) \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) \ - $(STAGING_DIR_IMAGE)/sifive_fu540-u-boot.itb \ - $(STAGING_DIR_IMAGE)/sifive_fu540-u-boot.itb-spl + $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)-u-boot.itb \ + $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)-u-boot.itb-spl # gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-sdcard-vfat-$(1).img endef define Device/Default PROFILES := Default KERNEL_NAME := Image - KERNEL := kernel-bin | uImage gzip -a 0xa4000000 + KERNEL := kernel-bin | uImage gzip -a $(KERNEL_LOADADDR) IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := riscv-sdcard | append-metadata | gzip endef @@ -68,9 +68,9 @@ define Device/sifive_hifive_unmatched_fu740 UBOOT := sifive_hifive_unmatched_fu740 endef -define Image/Build - $(call Image/Build/$(1),$(1)) -endef +#define Image/Build +# $(call Image/Build/$(1),$(1)) +#endef TARGET_DEVICES += sifive_fu540 sifive_hifive_unmatched_fu740 -- 2.30.2