diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-28 20:25:12 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-28 20:25:12 +0100 |
commit | 10f2e320f18b3738010128799dc095994d45cc38 (patch) | |
tree | 89b93f412ec03392e739ae1cc3c1b3d084ce3517 /target | |
parent | e94873e62decc77342e99b9c2712a84cbbc431e8 (diff) | |
parent | 0fffaa4447d5eef09390b4b8931308f736aa3807 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r-- | target/config/Config.in | 3 | ||||
-rw-r--r-- | target/tarch.lst | 1 | ||||
-rw-r--r-- | target/x86_64/sys-available/qemu-x86_64_32 | 12 |
3 files changed, 2 insertions, 14 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 794cc934f..9429b5072 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -662,7 +662,8 @@ config ADK_TARGET_LIB_UCLIBC !ADK_LINUX_MICROBLAZE && \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ - !ADK_TARGET_ABI_X32 + !ADK_x32 && \ + !ADK_32 help http://uclibc.org diff --git a/target/tarch.lst b/target/tarch.lst index 2d868c1b5..60e064398 100644 --- a/target/tarch.lst +++ b/target/tarch.lst @@ -19,5 +19,4 @@ sparc sparc64 x86 x86_64 -x86_64_32 x86_64_x32 diff --git a/target/x86_64/sys-available/qemu-x86_64_32 b/target/x86_64/sys-available/qemu-x86_64_32 deleted file mode 100644 index 56ccc9a36..000000000 --- a/target/x86_64/sys-available/qemu-x86_64_32 +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_X86_64_32 - bool "Qemu Emulator (x86_64 with 32 ABI)" - select ADK_x86_64 - select ADK_qemu_x86_64 - select ADK_32 - select ADK_CPU_X86_64 - select ADK_LINUX_64 - select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_BZIMAGE - help - Support for Qemu Emulator. - |