diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-14 14:40:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-14 14:40:31 +0200 |
| commit | f7bb2f756421b8e2a9e0bb8a010713b48c44969d (patch) | |
| tree | 5e4efdea9a5212248ed5be164fb985ec4e1145db /target/x86_64/Makefile | |
| parent | 64d6047788b6201a9b026a6841dd25f8d0a0d00b (diff) | |
| parent | 7209a2a3b092d9964a8c8aa48d2b8d1d42d41738 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/x86_64/Makefile')
| -rw-r--r-- | target/x86_64/Makefile | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index c94c3a1a6..63785c12a 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -8,6 +8,15 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage +ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) +ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y) +CREATE:=./scripts/create.sh -g -t +else +CREATE:=./scripts/create.sh -g +endif +else +CREATE:=./scripts/create.sh +endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @@ -15,11 +24,15 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "$(CREATE) qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" +ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) + @echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img' +else @echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif +endif ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) |