summaryrefslogtreecommitdiff
path: root/target/x86
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-07 07:49:04 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-07 07:49:04 +0200
commit8867d876ad1bf8ef09fb1f21f5dd868d938f752c (patch)
tree9fab23d56b193529a5cb35f0efc5812af021dc68 /target/x86
parentf66ee677a516991a44be19c869239f99b2d64285 (diff)
parentfb7e42d7be891a6600be639a6ded4a32c9b06020 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/x86')
-rw-r--r--target/x86/kernel/qemu-x86 (renamed from target/x86/kernel/qemu-i686)0
-rw-r--r--target/x86/sys-available/qemu-i48610
-rw-r--r--target/x86/sys-available/qemu-i6862
3 files changed, 11 insertions, 1 deletions
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