From 3491bf306b439d2acc9dcde8eb23e82482c59c4d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 5 Apr 2014 05:43:57 +0200
Subject: add qemu-i486

---
 target/x86/sys-available/qemu-i486 | 10 ++++++++++
 target/x86/sys-available/qemu-i686 |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 target/x86/sys-available/qemu-i486

(limited to 'target/x86')

diff --git a/target/x86/sys-available/qemu-i486 b/target/x86/sys-available/qemu-i486
new file mode 100644
index 000000000..dc0da52ca
--- /dev/null
+++ b/target/x86/sys-available/qemu-i486
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_QEMU_I486
+	bool "Qemu Emulator (i486)"
+	select ADK_x86
+	select ADK_qemu_i486
+	select ADK_CPU_I486
+	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_BZIMAGE
+	help
+	 Support for Qemu Emulator (i486).
+
diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686
index b047bc482..b2951a1e2 100644
--- a/target/x86/sys-available/qemu-i686
+++ b/target/x86/sys-available/qemu-i686
@@ -1,5 +1,5 @@
 config ADK_TARGET_SYSTEM_QEMU_I686
-	bool "Qemu Emulator"
+	bool "Qemu Emulator (i686)"
 	select ADK_x86
 	select ADK_qemu_i686
 	select ADK_CPU_I686
-- 
cgit v1.2.3


From aa9a46d40ae76b926880ff36b1bb7d27f52b55ac Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 6 Apr 2014 20:52:49 +0200
Subject: use one kernel config

---
 target/x86/kernel/qemu-i686 | 11 -----------
 target/x86/kernel/qemu-x86  | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 target/x86/kernel/qemu-i686
 create mode 100644 target/x86/kernel/qemu-x86

(limited to 'target/x86')

diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-i686
deleted file mode 100644
index 7eb708745..000000000
--- a/target/x86/kernel/qemu-i686
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG_X86=y
-CONFIG_X86_32=y
-CONFIG_PCI=y
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E1000=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/x86/kernel/qemu-x86 b/target/x86/kernel/qemu-x86
new file mode 100644
index 000000000..7eb708745
--- /dev/null
+++ b/target/x86/kernel/qemu-x86
@@ -0,0 +1,11 @@
+CONFIG_X86=y
+CONFIG_X86_32=y
+CONFIG_PCI=y
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E1000=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
-- 
cgit v1.2.3


From 65d58a1827c68aac8079ab98050f35b17d14b821 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 08:21:57 +0200
Subject: add submenu for qemu configuration

---
 target/x86/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'target/x86')

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
-- 
cgit v1.2.3