Merge branch 'master' of git+ssh://openadk.org/git/openadk

13 files changed, 56 insertions, 9 deletions

diff --git a/target/x86/Makefile b/target/x86/Makefile
index 15d980d7c..27920819f 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,10 +36,14 @@ 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:"
+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:"
diff --git a/target/x86/kernel/generic-pc b/target/x86/kernel/generic-pc
new file mode 100644
index 000000000..8b26b4d30
--- /dev/null
+++ b/target/x86/kernel/generic-pc
@@ -0,0 +1,23 @@
+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_NATSEMI=y
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NE2K_PCI=y
+CONFIG_PCNET32=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_RTL8139CP=y
+CONFIG_8139TOO=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=y
+CONFIG_E1000=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_ATA=y
+CONFIG_ATA_SFF=y
+CONFIG_ATA_BMDMA=y
+CONFIG_ATA_PIIX=y
diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-x86
index 7eb708745..7eb708745 100644
--- a/target/x86/kernel/qemu-i686
+++ b/target/x86/kernel/qemu-x86
diff --git a/target/x86/sys-available/generic-pc b/target/x86/sys-available/generic-pc
new file mode 100644
index 000000000..76d228936
--- /dev/null
+++ b/target/x86/sys-available/generic-pc
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_GENERIC_PC
+	bool "Generic PC (486)"
+	select ADK_x86
+	select ADK_generic_pc
+	select ADK_CPU_I486
+	select ADK_TARGET_KERNEL_BZIMAGE
+	help
+	 Support for generic PC (i486).
+
diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40
index ac94bb1ec..80c5bf531 100644
--- a/target/x86/sys-available/ibm-x40
+++ b/target/x86/sys-available/ibm-x40
@@ -13,13 +13,14 @@ config ADK_TARGET_SYSTEM_IBM_X40
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_ACPI
 	# with docking station 
 	select ADK_TARGET_WITH_PP
+	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_TARGET_KERNEL_BZIMAGE
+	select ADK_PACKAGE_GRUB_BIN
 	help
          System profile for IBM X40 laptop.
diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c
index 902c004a1..484439328 100644
--- a/target/x86/sys-available/pcengines-alix1c
+++ b/target/x86/sys-available/pcengines-alix1c
@@ -14,7 +14,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_USB_BOOT
 	select ADK_TARGET_KERNEL_BZIMAGE
diff --git a/target/x86/sys-available/pcengines-alix2d13 b/target/x86/sys-available/pcengines-alix2d13
index c92c0d36e..33e939348 100644
--- a/target/x86/sys-available/pcengines-alix2d13
+++ b/target/x86/sys-available/pcengines-alix2d13
@@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_KERNEL_BZIMAGE
 	depends on ADK_BROKEN
 	help
diff --git a/target/x86/sys-available/pcengines-alix2d2 b/target/x86/sys-available/pcengines-alix2d2
index fd83a700a..a48bec2cc 100644
--- a/target/x86/sys-available/pcengines-alix2d2
+++ b/target/x86/sys-available/pcengines-alix2d2
@@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_KERNEL_BZIMAGE
 	depends on ADK_BROKEN
 	help
diff --git a/target/x86/sys-available/pcengines-wrap b/target/x86/sys-available/pcengines-wrap
index 2fa4e13c4..50db08ccf 100644
--- a/target/x86/sys-available/pcengines-wrap
+++ b/target/x86/sys-available/pcengines-wrap
@@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	select ADK_pcengines_wrap
 	select ADK_CPU_I486
 	select ADK_KERNEL_I486
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_KERNEL_BZIMAGE
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
diff --git a/target/x86/sys-available/toolchain-i686 b/target/x86/sys-available/toolchain-i686
index bec515fca..b7c3be238 100644
--- a/target/x86/sys-available/toolchain-i686
+++ b/target/x86/sys-available/toolchain-i686
@@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86
 	select ADK_toolchain_x86
 	select ADK_CPU_I686
 	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TGZ
+	select ADK_TARGET_PACKAGE_TXZ
 	help
 	  Build a x86 toolchain (i686 optimized).
 
diff --git a/target/x86/target.mk b/target/x86/target.mk
index 30e558283..ecb811221 100644
--- a/target/x86/target.mk
+++ b/target/x86/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			x86
 CPU_ARCH:=		$(strip $(subst ",, $(ADK_TARGET_CPU_ARCH)))
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=	$(ADK_TARGET_CFLAGS)