summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-07 08:21:57 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-07 08:21:57 +0200
commit65d58a1827c68aac8079ab98050f35b17d14b821 (patch)
tree59d7bb3e9eac3b20caf81fdf85bed33bf99e6ef7
parent3900e73d3d21fe263cb4b26d69b701813f47055b (diff)
add submenu for qemu configuration
-rw-r--r--target/config/Config.in17
-rw-r--r--target/x86/Makefile7
2 files changed, 23 insertions, 1 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index 80e37b9cf..78d15a97e 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -216,6 +216,22 @@ config ADK_QEMU_ARGS
string
default "-nographic" if ADK_TARGET_QEMU_WITHOUT_GRAPHIC
+menu "Qemu configuration"
+depends on ADK_HARDWARE_QEMU
+
+choice
+prompt "Use a Bootloader"
+depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_LINUX_X86
+
+config ADK_TARGET_QEMU_WITHOUT_BOOTLOADER
+ boolean "do not use bootloader"
+
+config ADK_TARGET_QEMU_WITH_BOOTLOADER
+ boolean "use bootloader"
+ select ADK_PACKAGE_GRUB if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_LINUX_X86
+
+endchoice
+
choice
prompt "Qemu MICROBLAZE Emulation"
depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
@@ -321,6 +337,7 @@ config ADK_TARGET_QEMU_WITH_VIRTIO
endchoice
+endmenu
choice
prompt "Use ARM thumb mode"
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