diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 08:23:14 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 08:23:14 +0200 |
| commit | f9a94113d9ca3caf4c5a20b2db9d4b0af3846b2b (patch) | |
| tree | 1175eec0ec867f52834824f94ad4aeca9bcc79d0 /target/x86 | |
| parent | 456e12e8fbd7ecddf6c2aa1da4c2df2cf1a42499 (diff) | |
| parent | 97348d0f106a154f2ca5f1dd5298216ca120aa2d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/x86')
| -rw-r--r-- | target/x86/Makefile | 7 | ||||
| -rw-r--r-- | target/x86/kernel/qemu-x86 (renamed from target/x86/kernel/qemu-i686) | 0 | ||||
| -rw-r--r-- | target/x86/sys-available/qemu-i486 | 10 | ||||
| -rw-r--r-- | target/x86/sys-available/qemu-i686 | 2 |
4 files changed, 17 insertions, 2 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 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/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 |