diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/x86_64 | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/x86_64')
| -rw-r--r-- | target/x86_64/sys-available/qemu-x86_64 | 5 | ||||
| -rw-r--r-- | target/x86_64/sys-available/qemu-x86_64_x32 | 12 | ||||
| -rw-r--r-- | target/x86_64/sys-available/toolchain-x86_64 | 5 | ||||
| -rw-r--r-- | target/x86_64/sys-available/toolchain-x86_64_x32 | 12 |
4 files changed, 4 insertions, 30 deletions
diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index 5067a8ecf..11e5c92cb 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -2,11 +2,10 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 bool "Qemu Emulator" select ADK_x86_64 select ADK_qemu_x86_64 - select ADK_64 select ADK_CPU_X86_64 select ADK_LINUX_64 - select ADK_HARDWARE_QEMU + select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_BZIMAGE help - Support for Qemu Emulator. + Support for Qemu Emulator X86_64 architecture. diff --git a/target/x86_64/sys-available/qemu-x86_64_x32 b/target/x86_64/sys-available/qemu-x86_64_x32 deleted file mode 100644 index 9108c7951..000000000 --- a/target/x86_64/sys-available/qemu-x86_64_x32 +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_X86_64_X32 - bool "Qemu Emulator (x86_64 with X32 ABI)" - select ADK_x86_64 - select ADK_qemu_x86_64 - select ADK_x32 - select ADK_CPU_X86_64 - select ADK_LINUX_64 - select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_BZIMAGE - help - Support for Qemu Emulator. - diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64 index b93b479a1..ab4bfa86e 100644 --- a/target/x86_64/sys-available/toolchain-x86_64 +++ b/target/x86_64/sys-available/toolchain-x86_64 @@ -1,12 +1,11 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64 bool "Toolchain only" select ADK_x86_64 - select ADK_64 select ADK_toolchain_x86_64 select ADK_CPU_X86_64 select ADK_LINUX_64 - select ADK_TOOLCHAIN + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help - Build a x86_64 toolchain. + X86_64 toolchain. diff --git a/target/x86_64/sys-available/toolchain-x86_64_x32 b/target/x86_64/sys-available/toolchain-x86_64_x32 deleted file mode 100644 index 22d94171f..000000000 --- a/target/x86_64/sys-available/toolchain-x86_64_x32 +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_X32 - bool "Toolchain only (x32 ABI)" - select ADK_x86_64 - select ADK_x32 - select ADK_toolchain_x86_64 - select ADK_CPU_X86_64 - select ADK_LINUX_64 - select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - Build a x86_64 toolchain. - |