conf/distro/include: Remove old prebuilt OE toolchain support (replaced by sstate) and oabi config (obsolete)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

8 files changed, 1 insertions, 137 deletions

diff --git a/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc b/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc
deleted file mode 100644
index 2b49670467..0000000000
--- a/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Poky configuration to use CSL 2005q3-2 derived toolchain (ARM EABI)
-#
-
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}-intermediate"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
-
-PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3-2"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3-2"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-2005q3-2"
-PREFERRED_VERSION_gcc-cross-sdk ?= "3.4.4+csl-arm-2005q3-2"
-PREFERRED_VERSION_binutils ?= "2.16+csl-arm-2005q3-2"
-PREFERRED_VERSION_binutils-cross ?= "2.16+csl-arm-2005q3-2"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.16+csl-arm-2005q3-2"
-PREFERRED_VERSION_glibc ?= "2.3.6+csl-arm-2005q3-2"
-PREFERRED_VERSION_glibc-intermediate ?= "2.3.6+csl-arm-2005q3-2"
-PREFERRED_VERSION_elfutils ?= "0.108"
-
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.12rc3+csl-arm-2005q3-2"
diff --git a/meta/conf/distro/include/poky-external-csl2006q3.inc b/meta/conf/distro/include/poky-external-csl2006q3.inc
deleted file mode 100644
index 0f7304dff9..0000000000
--- a/meta/conf/distro/include/poky-external-csl2006q3.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Poky configuration to use external CSL 2006q3-27 toolchain (ARM EABI)
-#
-
-TARGET_VENDOR = "-none"
-
-EXTERNAL_TOOLCHAIN = "/usr/local/csl/arm-2006q3"
-
-PATH =. ":${EXTERNAL_TOOLCHAIN}/bin:"
-
-PREFERRED_PROVIDER_linux-libc-headers = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-initial = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-binutils = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/libc = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/libintl = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/libiconv = "external-csl-toolchain"
-PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain"
-
-PREFERRED_VERSION_external-csl-toolchain = "2006q3-27"
-
-TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
-TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "
-
-TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"
diff --git a/meta/conf/distro/include/poky-external-csl2007q3.inc b/meta/conf/distro/include/poky-external-csl2007q3.inc
deleted file mode 100644
index 26062fbe8d..0000000000
--- a/meta/conf/distro/include/poky-external-csl2007q3.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Poky configuration to use external CSL 2007q3-51 toolchain (ARM EABI)
-#
-
-TARGET_VENDOR = "-none"
-
-EXTERNAL_TOOLCHAIN = "/usr/local/csl/arm-2007q3"
-
-PATH =. "${EXTERNAL_TOOLCHAIN}/bin:"
-
-PREFERRED_PROVIDER_linux-libc-headers = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-initial = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-binutils = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/libc = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/libintl = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/libiconv = "external-csl-toolchain"
-PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain"
-
-PREFERRED_VERSION_external-csl-toolchain = "2007q3-51"
-
-TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
-TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "
-
-TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"
diff --git a/meta/conf/distro/include/poky-external-default.inc b/meta/conf/distro/include/poky-external-default.inc
deleted file mode 100644
index 9f1f7a38c7..0000000000
--- a/meta/conf/distro/include/poky-external-default.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-POKYMODE="default"
-require conf/distro/include/poky-external.inc
\ No newline at end of file
diff --git a/meta/conf/distro/include/poky-external-oabi.inc b/meta/conf/distro/include/poky-external-oabi.inc
deleted file mode 100644
index b4afaa30ab..0000000000
--- a/meta/conf/distro/include/poky-external-oabi.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-POKYMODE="oabi"
-require conf/distro/include/poky-external.inc
\ No newline at end of file
diff --git a/meta/conf/distro/include/poky-external.inc b/meta/conf/distro/include/poky-external.inc
deleted file mode 100644
index e3212c712d..0000000000
--- a/meta/conf/distro/include/poky-external.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Configuration to use a toolchain built by meta-toolchain.bb
-#
-
-TARGET_VENDOR = "-poky"
-
-EXTERNAL_TOOLCHAIN = "${SDKPATH}"
-
-PATH =. "${EXTERNAL_TOOLCHAIN}/bin:"
-
-PREFERRED_PROVIDER_linux-libc-headers = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc-initial = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/arm-poky-linux-binutils = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/arm-poky-linux-libc-for-gcc = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/i586-poky-linux-gcc = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/i586-poky-linux-gcc-initial = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/i586-poky-linux-binutils = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/i586-poky-linux-libc-for-gcc = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/libc = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/libintl = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/libiconv = "external-poky-toolchain"
-PREFERRED_PROVIDER_glibc-thread-db = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-poky-toolchain"
-
-#TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
-#TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/usr/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/usr/lib "
-
-TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"
diff --git a/meta/conf/distro/include/poky-oabi.inc b/meta/conf/distro/include/poky-oabi.inc
deleted file mode 100644
index 9192bf6fb8..0000000000
--- a/meta/conf/distro/include/poky-oabi.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Poky configuration to use its Original (Old) Softfloat ABI
-#
-TARGET_VENDOR = "-poky"
-
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
-
-PREFERRED_VERSION_binutils ?= "2.16"
-PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.15.94.0.1"
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk ?= "3.4.4"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1"
-PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
-PREFERRED_VERSION_elfutils ?= "0.89"
-
-GLIBCTARGETOS = "linux"
-UCLIBCTARGETOS = "linux-uclibc"
-
-# gcc 3.x needs a different arm926ejs option
-TARGET_CC_ARCH_qemuarm = "-march=armv5te -mtune=arm926ejs"
diff --git a/meta/conf/distro/include/poky-external-csl2008q3.inc b/meta/conf/distro/include/tcmode-external-csl2008q3.inc
index 124b1eab10..93615b970a 100644
--- a/meta/conf/distro/include/poky-external-csl2008q3.inc
+++ b/meta/conf/distro/include/tcmode-external-csl2008q3.inc
@@ -1,5 +1,5 @@
 #
-# Poky configuration to use external CSL 2008q3-72 toolchain (ARM EABI)
+# Configuration to use external CSL 2008q3-72 toolchain (ARM EABI)
 #
 
 TARGET_VENDOR = "-none"