diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-10 20:27:51 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-10 20:27:51 +0200 |
| commit | 917fb6294ff9521dd457f4a791dec32e55c2b6fd (patch) | |
| tree | ed7f56cd603199f06bb35294164f5f8ccf078078 /target | |
| parent | a9de73c5927b87462dfb57b2ec372672902f6fed (diff) | |
| parent | f695493a012fb378dff455b2e2067075d3594ba1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/x86/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/target/x86/Makefile b/target/x86/Makefile index e72087ea9..27920819f 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -38,8 +38,12 @@ ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Use following command to create a QEMU Image:" @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-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img' +else @echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif +endif ifeq ($(ADK_HARDWARE_VBOX),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a VirtualBox Image:" |