diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
| commit | 4f64f833872a6c83dd95149a553b9ed5258b4efe (patch) | |
| tree | 1d653351e49b62def18e74af5b18d6cb2a848a79 /target | |
| parent | ee418b2a37c2e45bd35625157dbc1b59fcacf8c7 (diff) | |
| parent | c20e67a4a06a377a277544a498338fa6a09e9e3f (diff) | |
resolve conflict
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 6 | ||||
| -rw-r--r-- | target/x86/kernel.config | 6 | ||||
| -rw-r--r-- | target/x86_64/sys-available/qemu-x86_64 | 2 | ||||
| -rw-r--r-- | target/x86_64/uclibc.config | 2 |
5 files changed, 16 insertions, 4 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index d5cdcdb70..5c38228b6 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -227,6 +227,9 @@ config ADK_CPU_I586 config ADK_CPU_I686 boolean +config ADK_CPU_X86_64 + boolean + config ADK_CPU_GEODE boolean @@ -248,6 +251,7 @@ config ADK_CPU_ARMV5 config ADK_TARGET_CPU_ARCH string + default "x86_64" if ADK_CPU_X86_64 default "i486" if ADK_CPU_I486 default "i586" if ADK_CPU_I586 default "i686" if ADK_CPU_I686 diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 6bcb090df..0400d8db6 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -49,6 +49,12 @@ config ADK_KERNEL_RD_LZO config ADK_KERNEL_KERNEL_LZO boolean +config ADK_KERNEL_RD_XZ + boolean + +config ADK_KERNEL_KERNEL_XZ + boolean + config ADK_KERNEL_INITRAMFS_SOURCE string default "" diff --git a/target/x86/kernel.config b/target/x86/kernel.config index 639656f5b..aa6d60735 100644 --- a/target/x86/kernel.config +++ b/target/x86/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86 2.6.39 Kernel Configuration -# Sun Aug 7 16:01:05 2011 +# Thu Aug 4 19:45:52 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -67,8 +67,8 @@ CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set # CONFIG_KERNEL_BZIP2 is not set -CONFIG_KERNEL_LZMA=y -# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZMA is not set +CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index e7dd37fa8..d0427ea29 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -2,6 +2,8 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 bool "Qemu Emulator" select ADK_x86_64 select ADK_qemu_x86_64 + select ADK_CPU_X86_64 + select ADK_LINUX_64 select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/x86_64/uclibc.config b/target/x86_64/uclibc.config index 301220414..7492fdcfc 100644 --- a/target/x86_64/uclibc.config +++ b/target/x86_64/uclibc.config @@ -81,7 +81,7 @@ UCLIBC_CTOR_DTOR=y UCLIBC_HAS_THREADS_NATIVE=y UCLIBC_HAS_THREADS=y UCLIBC_HAS_TLS=y -# PTHREADS_DEBUG_SUPPORT is not set +PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set |