From 6cc607e0c8a4746f44c77c06147d84d7ead15c35 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Sat, 6 Apr 2019 11:20:50 +0800 Subject: [PATCH] Make aarch64 and mipsel use img instead of qcow Signed-off-by: Harry Chen --- kernel/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index ec9f892..ec23b36 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -51,11 +51,16 @@ user_dir := ../user ### export environments ### + +ifeq ($(arch), $(filter $(arch), aarch64 mipsel)) +#link user img, so use original image +export SFSIMG = $(user_dir)/build/$(arch).img +else export SFSIMG = $(user_dir)/build/$(arch).qcow2 +endif ifeq ($(arch), aarch64) board := raspi3 -export SFSIMG = $(user_dir)/build/$(arch).img endif # currently only mipsel architecture needs DTB linked to the kernel @@ -294,7 +299,6 @@ else ifeq ($(arch), aarch64) @$(objcopy) $(bootloader) --strip-all -O binary $@ else ifeq ($(arch), mipsel) # qemu-system-mipsel accepts ELF file only, so don't use objcopy - @cp $(kernel) $(kernel)_orig @$(strip) $(kernel) -o $@ endif