From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:39:17 +0200 Subject: resolve merge conflict --- target/x86/sys-available/generic-pc | 5 ++--- target/x86/sys-available/ibm-x40 | 1 + target/x86/sys-available/qemu-i486 | 10 ---------- target/x86/sys-available/qemu-i686 | 10 ---------- target/x86/sys-available/qemu-x86 | 9 +++++++++ target/x86/sys-available/qemu-x86_64-32 | 11 ----------- target/x86/sys-available/toolchain-i686 | 10 ---------- target/x86/sys-available/toolchain-x86 | 9 +++++++++ 8 files changed, 21 insertions(+), 44 deletions(-) delete mode 100644 target/x86/sys-available/qemu-i486 delete mode 100644 target/x86/sys-available/qemu-i686 create mode 100644 target/x86/sys-available/qemu-x86 delete mode 100644 target/x86/sys-available/qemu-x86_64-32 delete mode 100644 target/x86/sys-available/toolchain-i686 create mode 100644 target/x86/sys-available/toolchain-x86 (limited to 'target/x86/sys-available') diff --git a/target/x86/sys-available/generic-pc b/target/x86/sys-available/generic-pc index 72ae99765..b5bbca9f2 100644 --- a/target/x86/sys-available/generic-pc +++ b/target/x86/sys-available/generic-pc @@ -1,10 +1,9 @@ config ADK_TARGET_SYSTEM_GENERIC_PC - bool "Generic PC (486)" + bool "Generic PC" select ADK_x86 select ADK_generic_pc - select ADK_CPU_I486 select ADK_TARGET_KERNEL_BZIMAGE select ADK_PACKAGE_GRUB help - Support for generic PC (i486). + Support for generic PC. diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40 index 9979295ae..4a2d99258 100644 --- a/target/x86/sys-available/ibm-x40 +++ b/target/x86/sys-available/ibm-x40 @@ -26,3 +26,4 @@ config ADK_TARGET_SYSTEM_IBM_X40 select ADK_PACKAGE_GRUB help System profile for IBM X40 laptop. + diff --git a/target/x86/sys-available/qemu-i486 b/target/x86/sys-available/qemu-i486 deleted file mode 100644 index dc0da52ca..000000000 --- a/target/x86/sys-available/qemu-i486 +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index b2951a1e2..000000000 --- a/target/x86/sys-available/qemu-i686 +++ /dev/null @@ -1,10 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_I686 - bool "Qemu Emulator (i686)" - select ADK_x86 - select ADK_qemu_i686 - select ADK_CPU_I686 - select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_BZIMAGE - help - Support for Qemu Emulator (i686). - diff --git a/target/x86/sys-available/qemu-x86 b/target/x86/sys-available/qemu-x86 new file mode 100644 index 000000000..48a71aa1d --- /dev/null +++ b/target/x86/sys-available/qemu-x86 @@ -0,0 +1,9 @@ +config ADK_TARGET_SYSTEM_QEMU_X86 + bool "Qemu Emulator" + select ADK_x86 + select ADK_qemu_x86 + select ADK_TARGET_QEMU + select ADK_TARGET_KERNEL_BZIMAGE + help + Support for Qemu Emulator X86 architecture. + diff --git a/target/x86/sys-available/qemu-x86_64-32 b/target/x86/sys-available/qemu-x86_64-32 deleted file mode 100644 index f96e6ea35..000000000 --- a/target/x86/sys-available/qemu-x86_64-32 +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_X86_64_32 - bool "Qemu Emulator (x86_64) with 32Bit userland" - select ADK_x86 - select ADK_qemu_x86_64_32 - select ADK_CPU_I686 - select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_BZIMAGE - select ADK_TARGET_KERNEL_64 - help - Support for Qemu Emulator (x86_64) with 32 Bit userland. - diff --git a/target/x86/sys-available/toolchain-i686 b/target/x86/sys-available/toolchain-i686 deleted file mode 100644 index b7c3be238..000000000 --- a/target/x86/sys-available/toolchain-i686 +++ /dev/null @@ -1,10 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 - bool "Toolchain only" - select ADK_x86 - select ADK_toolchain_x86 - select ADK_CPU_I686 - select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - Build a x86 toolchain (i686 optimized). - diff --git a/target/x86/sys-available/toolchain-x86 b/target/x86/sys-available/toolchain-x86 new file mode 100644 index 000000000..1216284bb --- /dev/null +++ b/target/x86/sys-available/toolchain-x86 @@ -0,0 +1,9 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 + bool "Toolchain only" + select ADK_x86 + select ADK_toolchain_x86 + select ADK_TARGET_TOOLCHAIN + select ADK_TARGET_PACKAGE_TXZ + help + X86 toolchain. + -- cgit v1.2.3