summaryrefslogtreecommitdiff
path: root/target/x86/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-07 11:04:38 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-07 11:04:38 +0200
commitf4a140e55739c8437b1b139d915b957b416840d8 (patch)
tree92e2500706278e95f892219231dcc5c6854f1e70 /target/x86/Makefile
parent3c2b8c14ba47341b7af24dc4d5cae3d32c72302e (diff)
parent5c408039aa7f26d60691b585286a6a3ba90a0bb1 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/x86/Makefile')
-rw-r--r--target/x86/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/target/x86/Makefile b/target/x86/Makefile
index 15d980d7c..e72087ea9 100644
--- a/target/x86/Makefile
+++ b/target/x86/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),genext2fs)
imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
@@ -31,7 +36,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
ifeq ($(ADK_HARDWARE_QEMU),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:"
@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
endif