diff options
-rw-r--r-- | conf/distro/micro-uclibc.conf | 30 | ||||
-rw-r--r-- | conf/distro/minimal-uclibc.conf | 20 |
2 files changed, 6 insertions, 44 deletions
diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf index f793d4a3c1..9cce7d18d0 100644 --- a/conf/distro/micro-uclibc.conf +++ b/conf/distro/micro-uclibc.conf @@ -7,42 +7,20 @@ #@COMMENT: based on uclibc. ############################################################################# -# Based on the Micro Linux distribution -require conf/distro/micro.conf - # Use overrides for micro as well OVERRIDES .= ":micro" ############################################################################# # DISTRO CONFIGURATION ############################################################################# -DISTRO_NAME = "micro-uclibc" -############################################################################# -# TARGET OS -############################################################################# -# Use linux uclibc -TARGET_OS = "linux-uclibc" -TARGET_OS_armeb = "linux-uclibcgnueabi" +DISTRO_NAME = "micro-uclibc" ############################################################################# # TOOLCHAIN ############################################################################# -LIBC = "uclibc" - -############################################################################# -# PREFERRED PROVIDERS -############################################################################# -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl" -PREFERRED_PROVIDER_virtual/libiconv = "libiconv" -############################################################################# -# PREFERRED VERSIONS -############################################################################# -PREFERRED_VERSION_uclibc = "0.9.30.1" -PREFERRED_VERSION_uclibc-initial = "0.9.30.1" +LIBC = "uclibc" +# Based on the Micro Linux distribution +require conf/distro/micro.conf diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index f246bffa69..9594622bed 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -1,7 +1,7 @@ #----------------------------------------------------------------------------- #@TYPE: Distribution -#@NAME: Minimal uClibC -#@DESCRIPTION: uClibC Embedded Linux Distribution Configuration (minimal) +#@NAME: Minimal uClibc +#@DESCRIPTION: uClibc based Embedded Linux Distribution Configuration (minimal) # #@COMMENT: This distribution configuration serves as a starting point for #@COMMENT: the integration of new target platforms, machines, or distributions. @@ -13,25 +13,9 @@ # DISTRO_NAME = "minimal-uclibc" -# -# Target OS & FPU system -# -TARGET_OS = "linux-uclibc" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -# Override the default virtual/libintl LIBC = "uclibc" -PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl" - -USE_NLS ?= "no" -USE_NLS_glib-2.0 = "yes" -USE_NLS_glib-2.0-native = "yes" -USE_NLS_gcc-cross = "no" - -PREFERRED_VERSION_uclibc ?= "0.9.30.1" -PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1" require conf/distro/minimal.conf |