summaryrefslogtreecommitdiff
path: root/target/x86_64/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-13 22:14:31 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-13 22:14:31 +0200
commit599982c916530310b29f609f44d10cd5a6b381a4 (patch)
tree1061ebf96d9e210c48471ffff70a545d137b06d3 /target/x86_64/Makefile
parent877be3fafdc3da53e53b5f426e81d9fff6a6e8f1 (diff)
add pregenerated core.img, there is no portable way to do it right now
Diffstat (limited to 'target/x86_64/Makefile')
-rw-r--r--target/x86_64/Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index c94c3a1a6..8d546a34b 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -8,6 +8,11 @@ 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)
+CREATE:=./scripts/create.sh -g
+else
+CREATE:=./scripts/create.sh
+endif
ifeq ($(ADK_TARGET_FS),archive)
imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
@@ -15,11 +20,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)