From 51131c29643b1f2be84ae9dac73931abaa44432c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 18 Feb 2015 23:38:27 -0600 Subject: add support for uClibc-ng git master Add new configs for uClibc-ng master. New symbol UCLIBC_HAS_LINUXTHREADS added. LT.new is removed in master, only LT.old and NPTL exist. CLeanup MMU/NPTL/LT support symbols. Tested with toolchain building for all supported architectures. --- target/config/Config.in.cpu | 157 +++++++++++++++++++++++---------- target/config/Config.in.hardware | 4 + target/config/Config.in.libc.default | 22 ++--- target/config/Config.in.qemu | 20 ----- target/config/Config.in.xtensa | 5 ++ target/config/Config.in.xtensa.choice | 22 +++++ target/config/Config.in.xtensa.default | 3 + 7 files changed, 151 insertions(+), 82 deletions(-) create mode 100644 target/config/Config.in.xtensa create mode 100644 target/config/Config.in.xtensa.choice create mode 100644 target/config/Config.in.xtensa.default (limited to 'target/config') diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index f554bd664..c830dd267 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -2,143 +2,208 @@ # material, please see the LICENCE file in the top-level directory. config ADK_TARGET_CPU_WITH_FPU - boolean + bool config ADK_TARGET_CPU_WITH_VT - boolean + bool config ADK_TARGET_CPU_WITH_MTRR - boolean + bool config ADK_TARGET_CPU_WITH_MMX - boolean + bool config ADK_TARGET_CPU_WITH_MMXEXT - boolean + bool config ADK_TARGET_CPU_WITH_SSE - boolean + bool config ADK_TARGET_CPU_WITH_SSE2 - boolean + bool config ADK_TARGET_CPU_WITH_SSE3 - boolean + bool config ADK_TARGET_CPU_WITH_SSSE3 - boolean + bool config ADK_TARGET_CPU_WITH_IWMMXT - boolean + bool config ADK_TARGET_CPU_WITH_HT - boolean + bool config ADK_TARGET_CPU_WITH_3DNOW - boolean + bool config ADK_TARGET_CPU_WITH_3DNOWEXT - boolean + bool config ADK_CPU_ATHLON - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_ARC - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_TILE - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_C6X - boolean + bool + select ADK_TARGET_WITH_LT config ADK_CPU_CRIS_V10 - boolean + bool + select ADK_TARGET_WITH_LT config ADK_CPU_CRIS_V32 - boolean + bool + select ADK_TARGET_WITH_LT config ADK_CPU_SH4 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_SPARC_V8 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_SPARC_V9 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_X86 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_X86_64 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_GEODE - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_PPC - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_PPC_440 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_PPC64 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_PENTIUM_M - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_AMDFAM10 + bool select ADK_TARGET_CPU_WITH_VT - boolean + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_LOONGSON2F - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_XSCALE - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_M68K - boolean + bool + select ADK_TARGET_WITH_LT if ADK_LINUX_UCLINUX + select ADK_TARGET_WITH_MMU if !ADK_TARGET_WITH_MMU + select ADK_TARGET_WITH_NPTL config ADK_CPU_MIPS32 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_MIPS32R2 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_MIPS64 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_MICROBLAZE - boolean + bool + select ADK_TARGET_WITH_LT if ADK_TARGET_LIBC_UCLIBC_NG + select ADK_TARGET_WITH_MMU if !ADK_TARGET_WITH_MMU + select ADK_TARGET_WITH_NPTL config ADK_CPU_ARM926EJ_S - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_ARM1176JZF_S - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_CORTEX_M3 - boolean + bool + select ADK_TARGET_WITH_LT + +config ADK_CPU_CORTEX_M4 + bool + select ADK_TARGET_WITH_LT config ADK_CPU_CORTEX_A7 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_CORTEX_A9 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_ARMV8 - boolean + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU config ADK_CPU_CF_5208 - boolean + bool + select ADK_TARGET_WITH_LT config ADK_CPU_BFIN - boolean + bool + select ADK_TARGET_WITH_LT config ADK_CPU_AVR32 - boolean + bool + select ADK_TARGET_WITH_LT config ADK_TARGET_CPU_ARCH string diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware index fdb35d15e..0016fcf0b 100644 --- a/target/config/Config.in.hardware +++ b/target/config/Config.in.hardware @@ -97,3 +97,7 @@ config ADK_TARGET_WITH_USB_BOOT config ADK_TARGET_WITH_SMP bool + +config ADK_TARGET_WITH_MMU + bool + select ADK_KERNEL_MMU diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index 67ef70ecc..cf218f96c 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -13,6 +13,12 @@ config ADK_glibc config ADK_musl bool +config ADK_TARGET_WITH_LT + bool + +config ADK_TARGET_WITH_NPTL + bool + config ADK_TARGET_LIBC string default "uclibc-ng" if ADK_uclibc_ng @@ -32,22 +38,6 @@ config ADK_LIBC_VERSION ADK_TARGET_LIB_MUSL_GIT || \ ADK_TARGET_LIB_GLIBC_GIT -config ADK_TARGET_WITH_NPTL - bool - default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX - default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX - default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_AVR32 - default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_AVR32 - default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_CRIS - default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_CRIS - default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_M68K - default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_M68K - default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_C6X - default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_C6X - default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_MICROBLAZE - default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_MICROBLAZE - default y - config ADK_TARGET_SUFFIX string default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_arm && ADK_hard_float diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu index 7a6600386..4d13e14dd 100644 --- a/target/config/Config.in.qemu +++ b/target/config/Config.in.qemu @@ -28,26 +28,6 @@ config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 endchoice -choice -prompt "Qemu XTENSA Emulation" -depends on ADK_TARGET_SYSTEM_QEMU_XTENSA - -config ADK_TARGET_QEMU_XTENSA_DC233C - bool "dc233c" - select ADK_KERNEL_XTENSA_VARIANT_DC233C - select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX - -config ADK_TARGET_QEMU_XTENSA_DC232B - bool "dc232b" - select ADK_KERNEL_XTENSA_VARIANT_DC232B - -endchoice - -config ADK_TARGET_XTENSA - string - default "dc233c" if ADK_TARGET_QEMU_XTENSA_DC233C - default "dc232b" if ADK_TARGET_QEMU_XTENSA_DC232B - choice prompt "Qemu ARM Emulation" depends on ADK_TARGET_SYSTEM_QEMU_ARM diff --git a/target/config/Config.in.xtensa b/target/config/Config.in.xtensa new file mode 100644 index 000000000..f322fc7c8 --- /dev/null +++ b/target/config/Config.in.xtensa @@ -0,0 +1,5 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +source target/config/Config.in.xtensa.choice +source target/config/Config.in.xtensa.default diff --git a/target/config/Config.in.xtensa.choice b/target/config/Config.in.xtensa.choice new file mode 100644 index 000000000..bd707cd4b --- /dev/null +++ b/target/config/Config.in.xtensa.choice @@ -0,0 +1,22 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +choice ADK_TARGET_XTENSA_VARIANT +prompt "CPU variant" +depends on ADK_TARGET_ARCH_XTENSA + +config ADK_TARGET_XTENSA_DC233C + bool "dc233c" + select ADK_KERNEL_XTENSA_VARIANT_DC233C + select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX + +config ADK_TARGET_XTENSA_DC232B + bool "dc232b" + select ADK_KERNEL_XTENSA_VARIANT_DC232B + +endchoice + +config ADK_TARGET_XTENSA + string + default "dc233c" if ADK_TARGET_XTENSA_DC233C + default "dc232b" if ADK_TARGET_XTENSA_DC232B diff --git a/target/config/Config.in.xtensa.default b/target/config/Config.in.xtensa.default new file mode 100644 index 000000000..43df6220c --- /dev/null +++ b/target/config/Config.in.xtensa.default @@ -0,0 +1,3 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + -- cgit v1.2.3