Merge pull request #244 from bhundven/remove_blackfin

blackfin: Remove blackfin support

21 files changed, 3 insertions, 322 deletions

diff --git a/.travis.yml b/.travis.yml
index d5ed517..26d730f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,6 @@ env:
     - CT_SAMPLE=arm-unknown-linux-gnueabi
     - CT_SAMPLE=armeb-unknown-linux-gnueabi
     - CT_SAMPLE=arm-unknown-linux-musleabi
-    - CT_SAMPLE=bfin-unknown-linux-uclibc
 
 # Building the standard samples
 script:
diff --git a/config/arch/blackfin.in b/config/arch/blackfin.in
deleted file mode 100644
index 2e48742..0000000
--- a/config/arch/blackfin.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# Blackfin specific configuration file
-
-## select ARCH_SUPPORTS_32
-## select ARCH_DEFAULT_32
-## select ARCH_DEFAULT_LE
-## select ARCH_SUPPORTS_WITH_ARCH
-## select ARCH_SUPPORTS_WITH_CPU
-## select ARCH_SUPPORTS_WITH_TUNE
-## select ARCH_SUPPORTS_WITH_FPU
-##
-## help The Blackfin architecture
diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2
index 8a21a4f..6660c43 100644
--- a/config/libc/uClibc.in.2
+++ b/config/libc/uClibc.in.2
@@ -22,7 +22,7 @@ config LIBC_UCLIBC_LNXTHRD_NEW
     help
       From the uClibc config option help:
         The new version has not been tested much, and lacks ports for arches
-        which glibc does not support (like bfin/frv/etc...), but is based on
+        which glibc does not support (like frv, etc...), but is based on
         the latest code from glibc, so it may be the only choice for the
         newer ports (like alpha/amd64/64bit arches and hppa).
 
diff --git a/patches/uClibc/0.9.30.2/290-blackfin-nommu-fork-stub.patch b/patches/uClibc/0.9.30.2/290-blackfin-nommu-fork-stub.patch
deleted file mode 100644
index 7dc0439..0000000
--- a/patches/uClibc/0.9.30.2/290-blackfin-nommu-fork-stub.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Jie Zhang <jie.zhang@analog.com>
-Date: Mon, 1 Jun 2009 07:25:42 +0000 (+0000)
-Subject: Backport UCLIBC_HAS_STUBS config option from the upstream. This option makes uClibc... 
-X-Git-Url: http://blackfin.uclinux.org/git/?p=readonly-mirrors%2Ftoolchain.git;a=commitdiff_plain;h=cacea6b12bae6f6cfd08e2bbec536e9b23b342f5
-
-Backport UCLIBC_HAS_STUBS config option from the upstream. This option makes uClibc provide fork() stub on NOMMU targets. It's default off.
-
-
-git-svn-id: svn://localhost/svn/toolchain/trunk@3417 2adf4935-75e9-4407-93b2-34b21a1880a4
----
-
-Index: uClibc-0.9.30.2/libc/unistd/daemon.c
-===================================================================
---- uClibc-0.9.30.2.orig/libc/unistd/daemon.c	2010-01-13 22:22:31.000000000 +0100
-+++ uClibc-0.9.30.2/libc/unistd/daemon.c	2010-04-06 22:04:11.000000000 +0200
-@@ -55,7 +55,6 @@
- libc_hidden_proto(dup2)
- libc_hidden_proto(setsid)
- libc_hidden_proto(chdir)
--libc_hidden_proto(fork)
- 
- #ifndef __ARCH_USE_MMU__
- #include <sys/syscall.h>
-@@ -85,6 +84,8 @@
- 	return ret;
- }
- #else
-+libc_hidden_proto(fork)
-+
- static inline pid_t fork_parent(void)
- {
- 	switch (fork()) {
diff --git a/samples/arm-cortexa5-linux-uclibcgnueabihf/uClibc-0.9.33.2.config b/samples/arm-cortexa5-linux-uclibcgnueabihf/uClibc-0.9.33.2.config
index 51fbabb..1f281e1 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/uClibc-0.9.33.2.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/uClibc-0.9.33.2.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 TARGET_arm=y
 
-# TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
diff --git a/samples/arm-unknown-linux-uclibcgnueabi/uClibc-0.9.33.2.config b/samples/arm-unknown-linux-uclibcgnueabi/uClibc-0.9.33.2.config
index ce72558..9f2ed53 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/uClibc-0.9.33.2.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/uClibc-0.9.33.2.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 TARGET_arm=y
 
-# TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
diff --git a/samples/arm-unknown-linux-uclibcgnueabihf/uClibc-0.9.33.2.config b/samples/arm-unknown-linux-uclibcgnueabihf/uClibc-0.9.33.2.config
index 7eb2b08..a39720c 100644
--- a/samples/arm-unknown-linux-uclibcgnueabihf/uClibc-0.9.33.2.config
+++ b/samples/arm-unknown-linux-uclibcgnueabihf/uClibc-0.9.33.2.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 TARGET_arm=y
 
-# TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
diff --git a/samples/armeb-unknown-linux-uclibcgnueabi/uClibc-0.9.33.2.config b/samples/armeb-unknown-linux-uclibcgnueabi/uClibc-0.9.33.2.config
index c4c3272..e304c34 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/uClibc-0.9.33.2.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/uClibc-0.9.33.2.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 TARGET_arm=y
 
-# TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
diff --git a/samples/bfin-unknown-linux-uclibc/crosstool.config b/samples/bfin-unknown-linux-uclibc/crosstool.config
deleted file mode 100644
index 6f58558..0000000
--- a/samples/bfin-unknown-linux-uclibc/crosstool.config
+++ /dev/null
@@ -1,20 +0,0 @@
-CT_LOCAL_TARBALLS_DIR="${HOME}/src"
-CT_SAVE_TARBALLS=y
-CT_LOG_EXTRA=y
-CT_ARCH_blackfin=y
-CT_KERNEL_linux=y
-CT_ARCH_BINFMT_FDPIC=y
-CT_BINUTILS_V_2_22=y
-CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
-CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
-CT_THREADS_LT=y
-CT_CC_GCC_V_4_5_4=y
-# CT_CC_GCC_USE_GRAPHITE is not set
-# CT_CC_GCC_USE_LTO is not set
-CT_GMP_V_4_3_2=y
-CT_MPFR_V_2_4_2=y
-CT_COMP_TOOLS=y
-CT_COMP_TOOLS_autoconf=y
-CT_COMP_TOOLS_automake=y
-CT_COMP_TOOLS_libtool=y
diff --git a/samples/bfin-unknown-linux-uclibc/reported.by b/samples/bfin-unknown-linux-uclibc/reported.by
deleted file mode 100644
index a554d33..0000000
--- a/samples/bfin-unknown-linux-uclibc/reported.by
+++ /dev/null
@@ -1,3 +0,0 @@
-reporter_name="Thomas Petazzoni"
-reporter_url="http://www.free-electrons.com/"
-reporter_comment="Very basic testing only"
diff --git a/samples/bfin-unknown-linux-uclibc/uClibc-0.9.33.2.config b/samples/bfin-unknown-linux-uclibc/uClibc-0.9.33.2.config
deleted file mode 100644
index 851d26a..0000000
--- a/samples/bfin-unknown-linux-uclibc/uClibc-0.9.33.2.config
+++ /dev/null
@@ -1,225 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.30.2
-# Tue Apr  6 16:47:32 2010
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-
-TARGET_bfin=y
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="bfin"
-FORCE_OPTIONS_FOR_ARCH=y
-TARGET_SUBARCH=""
-# UCLIBC_FORMAT_ELF is not set
-UCLIBC_FORMAT_FDPIC_ELF=y
-# UCLIBC_FORMAT_FLAT is not set
-# UCLIBC_FORMAT_FLAT_SEP_DATA is not set
-# UCLIBC_FORMAT_SHARED_FLAT is not set
-ARCH_LITTLE_ENDIAN=y
-
-#
-# Using Little Endian
-#
-ARCH_HAS_NO_MMU=y
-
-#
-# Target CPU lacks a memory management unit (MMU)
-#
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-KERNEL_HEADERS="/usr/include"
-UCLIBC_UCLINUX_BROKEN_MUNMAP=y
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# ARCH_HAS_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-FORCE_SHAREABLE_TEXT_SEGMENTS=y
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-UCLIBC_STATIC_LDCONFIG=y
-# LDSO_RUNPATH is not set
-UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-MALLOC=y
-# MALLOC_SIMPLE is not set
-# MALLOC_STANDARD is not set
-# MALLOC_GLIBC_COMPAT is not set
-UCLIBC_DYNAMIC_ATEXIT=y
-# COMPAT_ATEXIT is not set
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_STUBS is not set
-# UCLIBC_HAS_SHADOW is not set
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-# UCLIBC_HAS_GETPT is not set
-UCLIBC_HAS_TM_EXTENSIONS=y
-# UCLIBC_HAS_TZ_CACHING is not set
-# UCLIBC_HAS_TZ_FILE is not set
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Support various families of functions
-#
-# UCLIBC_LINUX_MODULE_24 is not set
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-# UCLIBC_NTP_LEGACY is not set
-UCLIBC_SV4_DEPRECATED=y
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-UCLIBC_HAS_XATTR=y
-UCLIBC_HAS_PROFILING=y
-UCLIBC_HAS_CRYPT_IMPL=y
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-# UCLIBC_USE_NETLINK is not set
-UCLIBC_HAS_BSD_RES_CLOSE=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-UCLIBC_HAS_CTYPE_UNSAFE=y
-# UCLIBC_HAS_CTYPE_CHECKED is not set
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-# UCLIBC_HAS_WCHAR is not set
-# UCLIBC_HAS_LOCALE is not set
-# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
-# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
-# USE_OLD_VFPRINTF is not set
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
-# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
-# UCLIBC_HAS_PRINTF_M_SPEC is not set
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-# UCLIBC_HAS_WORDEXP is not set
-# UCLIBC_HAS_FTW is not set
-UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr"
-
-#
-# Security options
-#
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
-# UCLIBC_BUILD_NOEXECSTACK is not set
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX="bfin-elf-"
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-# DOSTRIP is not set
-# DOASSERTS is not set
-SUPPORT_LD_DEBUG=y
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/samples/i586-geode-linux-uclibc/uClibc-0.9.33.2.config b/samples/i586-geode-linux-uclibc/uClibc-0.9.33.2.config
index 4227168..aaabf2f 100644
--- a/samples/i586-geode-linux-uclibc/uClibc-0.9.33.2.config
+++ b/samples/i586-geode-linux-uclibc/uClibc-0.9.33.2.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 # TARGET_arm is not set
 
-# TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
diff --git a/samples/m68k-unknown-uclinux-uclibc/uClibc-0.9.33.2.config b/samples/m68k-unknown-uclinux-uclibc/uClibc-0.9.33.2.config
index 680ce53..6db98ae 100644
--- a/samples/m68k-unknown-uclinux-uclibc/uClibc-0.9.33.2.config
+++ b/samples/m68k-unknown-uclinux-uclibc/uClibc-0.9.33.2.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 # TARGET_arm is not set
 
-# TARGET_bfin is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
 # TARGET_frv is not set
diff --git a/samples/mips-unknown-linux-uclibc/uClibc-0.9.33.2.config b/samples/mips-unknown-linux-uclibc/uClibc-0.9.33.2.config
index 966eddb..6e7039f 100644
--- a/samples/mips-unknown-linux-uclibc/uClibc-0.9.33.2.config
+++ b/samples/mips-unknown-linux-uclibc/uClibc-0.9.33.2.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 # TARGET_arm is not set
 
-# TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
diff --git a/samples/mips64el-n32-linux-uclibc/uClibc-0.9.33.2.config b/samples/mips64el-n32-linux-uclibc/uClibc-0.9.33.2.config
index ad6a1da..d62dc15 100644
--- a/samples/mips64el-n32-linux-uclibc/uClibc-0.9.33.2.config
+++ b/samples/mips64el-n32-linux-uclibc/uClibc-0.9.33.2.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 # TARGET_arm is not set
 
-# TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
diff --git a/samples/mips64el-n64-linux-uclibc/uClibc-0.9.33.2.config b/samples/mips64el-n64-linux-uclibc/uClibc-0.9.33.2.config
index 5cbc4bc..aee8bd7 100644
--- a/samples/mips64el-n64-linux-uclibc/uClibc-0.9.33.2.config
+++ b/samples/mips64el-n64-linux-uclibc/uClibc-0.9.33.2.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 # TARGET_arm is not set
 
-# TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
diff --git a/samples/powerpc-unknown-linux-uclibc/uClibc-0.9.30.1.config b/samples/powerpc-unknown-linux-uclibc/uClibc-0.9.30.1.config
index eb8f793..6126e4a 100644
--- a/samples/powerpc-unknown-linux-uclibc/uClibc-0.9.30.1.config
+++ b/samples/powerpc-unknown-linux-uclibc/uClibc-0.9.30.1.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 # TARGET_arm is not set
 
-# TARGET_bfin is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
 # TARGET_frv is not set
diff --git a/samples/x86_64-unknown-linux-uclibc/uClibc-0.9.33.2.config b/samples/x86_64-unknown-linux-uclibc/uClibc-0.9.33.2.config
index 308690d..1073465 100644
--- a/samples/x86_64-unknown-linux-uclibc/uClibc-0.9.33.2.config
+++ b/samples/x86_64-unknown-linux-uclibc/uClibc-0.9.33.2.config
@@ -6,7 +6,6 @@
 # TARGET_alpha is not set
 # TARGET_arm is not set
 
-# TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
diff --git a/scripts/build/arch/blackfin.sh b/scripts/build/arch/blackfin.sh
deleted file mode 100644
index 768b07a..0000000
--- a/scripts/build/arch/blackfin.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Compute Blackfin-specific values
-
-CT_DoArchTupleValues() {
-    # The architecture part of the tuple:
-    CT_TARGET_ARCH="bfin${CT_ARCH_SUFFIX}"
-
-    # gcc ./configure flags
-    CT_ARCH_WITH_ARCH=
-    CT_ARCH_WITH_ABI=
-    CT_ARCH_WITH_CPU=
-    CT_ARCH_WITH_TUNE=
-    CT_ARCH_WITH_FPU=
-    CT_ARCH_WITH_FLOAT=
-}
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index 2ebb03c..923b12b 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -7,10 +7,9 @@ CT_DoKernelTupleValues() {
         CT_TARGET_KERNEL="linux"
     else
         # Some no-mmu linux targets requires a -uclinux tuple (like m68k/cf),
-        # while others must have a -linux tuple (like bfin).  Other targets
+        # while others must have a -linux tuple.  Other targets
         # should be added here when someone starts to care about them.
         case "${CT_ARCH}" in
-            blackfin)   CT_TARGET_KERNEL="linux" ;;
             m68k)       CT_TARGET_KERNEL="uclinux" ;;
             *)          CT_Abort "Unsupported no-mmu arch '${CT_ARCH}'"
         esac
@@ -35,7 +34,7 @@ do_kernel_get() {
         case "${CT_KERNEL_VERSION}" in
             2.6.*.*|3.*.*|4.*.*)
                 # 4-part versions (for 2.6 stables and long-terms), and
-                # 3-part versions (for 3.x.y and 4.x.y stables and long-terms),
+                # 3-part versions (for 3.x.y and 4.x.y stables and long-terms)
                 # we need to trash the last digit
                 k_ver="${CT_KERNEL_VERSION%.*}"
                 ;;
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index e6974b3..eac32da 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -253,7 +253,6 @@ mungeuClibcConfig() {
         x86:64)      arch=x86_64;;
         sh:32)       arch="sh";;
         sh:64)       arch="sh64";;
-        blackfin:32) arch="bfin";;
         *)           arch="${CT_ARCH}";;
     esac
     # Also remove stripping: its the responsibility of the