diff options
| author | Tian Fang <tfang@fb.com> | 2015-12-14 22:08:40 -0800 |
|---|---|---|
| committer | Tian Fang <tfang@fb.com> | 2015-12-15 09:49:21 -0800 |
| commit | e65a7944211c70f6b5cfb6cedd73cc31105319de (patch) | |
| tree | 067082251bc52bc6c09ca87feaa1352d0468a5ac /meta-aspeed/conf | |
| parent | 8a67fbdd0e251bb34d55992b0771edba1837d589 (diff) | |
| download | ast2050-yocto-openbmc-e65a7944211c70f6b5cfb6cedd73cc31105319de.zip ast2050-yocto-openbmc-e65a7944211c70f6b5cfb6cedd73cc31105319de.tar.gz | |
Sync to internal OpenBMC repo f926614
Diffstat (limited to 'meta-aspeed/conf')
| -rw-r--r-- | meta-aspeed/conf/distro/include/tclibc-eglibc.inc | 40 | ||||
| -rw-r--r-- | meta-aspeed/conf/machine/include/ast1250.inc | 4 |
2 files changed, 43 insertions, 1 deletions
diff --git a/meta-aspeed/conf/distro/include/tclibc-eglibc.inc b/meta-aspeed/conf/distro/include/tclibc-eglibc.inc new file mode 100644 index 0000000..15f5ee5 --- /dev/null +++ b/meta-aspeed/conf/distro/include/tclibc-eglibc.inc @@ -0,0 +1,40 @@ +# +# eglibc specific configuration +# + +LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}" + +# Add glibc overrides to the overrides for eglibc. +LIBCOVERRIDE = ":libc-glibc" +OVERRIDES .= "${LIBCOVERRIDE}" + +PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" +PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" +PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc" +PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" +PREFERRED_PROVIDER_virtual/libc ?= "eglibc" +PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-eglibc" +PREFERRED_PROVIDER_virtual/libc-locale ?= "eglibc-locale" + +CXXFLAGS += "-fvisibility-inlines-hidden" + +LIBC_DEPENDENCIES = "libsegfault \ + eglibc \ + eglibc-dbg \ + eglibc-dev \ + eglibc-utils \ + eglibc-thread-db \ + ${@get_libc_locales_dependencies(d)}" + +LIBC_LOCALE_DEPENDENCIES = "\ + eglibc-localedata-i18n \ + eglibc-gconv-ibm850 \ + eglibc-gconv-cp1252 \ + eglibc-gconv-iso8859-1 \ + eglibc-gconv-iso8859-15" + +def get_libc_locales_dependencies(d): + if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() : + return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or '' + else: + return '' diff --git a/meta-aspeed/conf/machine/include/ast1250.inc b/meta-aspeed/conf/machine/include/ast1250.inc index 099fdb0..210e3b5 100644 --- a/meta-aspeed/conf/machine/include/ast1250.inc +++ b/meta-aspeed/conf/machine/include/ast1250.inc @@ -11,12 +11,14 @@ EXTRA_IMAGEDEPENDS += "u-boot" # Uncomment the following line to enable the hard floating point abi. Note that # this breaks some binary libraries and 3D (neither of which ship with # meta-yocto). For maximum compatibility, leave this disabled. -DEFAULTTUNE ?= "arm926ejs" require conf/machine/include/tune-arm926ejs.inc PREFERRED_PROVIDER_virtual/kernel ?= "linux-aspeed" PREFERRED_VERSION_linux-aspeed ?= "2.6.28%" +PREFERRED_VERSION_u-boot ?= "v2013.07" +PREFERRED_VERSION_u-boot-fw-utils ?= "v2013.07" + KERNEL_IMAGETYPE ?= "uImage" KERNEL_EXTRA_ARGS ?= "UIMAGE_LOADADDR=0x40008000" |
