276 files changed, 37 insertions, 63 deletions

diff --git a/aclocal/bsp-alias.m4 b/aclocal/bsp-alias.m4
index 9aafbccee0..77d8205aba 100644
--- a/aclocal/bsp-alias.m4
+++ b/aclocal/bsp-alias.m4
@@ -1,11 +1,13 @@
 dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl Internal subroutine to RTEMS_BSP_ALIAS
-AC_DEFUN([_RTEMS_BSP_ALIAS],
-[# account for "aliased" bsps which share source code
-      for bsp_cfgs in `ls "$srcdir"/"$RTEMS_TOPdir"/c/src/lib/libbsp/"$RTEMS_CPU"/*/"make/custom/$1.cfg" 2>/dev/null`; do
+AC_DEFUN([_RTEMS_BSP_ALIAS],[
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+# account for "aliased" bsps which share source code
+      for bsp_cfgs in `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/"config/$1.cfg" 2>/dev/null`; do
         $2=`echo "$bsp_cfgs" | sed \
-          -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
-          -e "s,/make/custom/.*\.cfg$,,"`
+          -e "s,^${RTEMS_SOURCE_ROOT}/bsps/$RTEMS_CPU/,," \
+          -e "s,/config/.*\.cfg$,,"`
         break
       done
 ])
diff --git a/aclocal/check-bsps.m4 b/aclocal/check-bsps.m4
index 381b2e3197..610ae40f16 100644
--- a/aclocal/check-bsps.m4
+++ b/aclocal/check-bsps.m4
@@ -4,17 +4,17 @@ dnl RTEMS_CHECK_BSPS(bsp_list)
 AC_DEFUN([RTEMS_CHECK_BSPS],
 [
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
-AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
+AC_REQUIRE([RTEMS_SOURCE_TOP])dnl sets RTEMS_SOURCE_ROOT
 
 AC_MSG_CHECKING([for available BSPs])
   $1=
-  for bsp_make in `echo "$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU"/*/make 2>/dev/null`; do
+  for bsp_make in `echo "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/config 2>/dev/null`; do
     bsp_family=`echo "$bsp_make" | sed \
-      -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
-      -e "s,/make$,,"`
-    for bsp_cfgs in `ls "$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$bsp_family/make/custom/"*.cfg 2>/dev/null`; do
+      -e "s,^${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/,," \
+      -e "s,/config$,,"`
+    for bsp_cfgs in `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/$bsp_family/config/"*.cfg 2>/dev/null`; do
       bsp_cfg=`echo "$bsp_cfgs" | sed \
-        -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$bsp_family/make/custom/,," \
+        -e "s,^${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/$bsp_family/config/,," \
         -e "s,\.cfg$,,"`
       $1="[$]$1 $bsp_cfg"
     done
diff --git a/aclocal/check-custom-bsp.m4 b/aclocal/check-custom-bsp.m4
index 43b379c095..11c2f1f7d2 100644
--- a/aclocal/check-custom-bsp.m4
+++ b/aclocal/check-custom-bsp.m4
@@ -1,9 +1,9 @@
 AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
-AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
+AC_REQUIRE([RTEMS_SOURCE_TOP])dnl sets RTEMS_SOURCE_ROOT
   $2=
   for i in \
-    `ls "${srcdir}/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}"/*/make/custom/$1 2>/dev/null`;
+    `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/config/$1 2>/dev/null`;
   do
     AS_IF([test -r $i],[
       $2="$i"
@@ -13,5 +13,8 @@ AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
 ])
 
 AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[
-  _RTEMS_CHECK_CUSTOM_BSP([[$]$1],[BSP_FOUND])
+  _RTEMS_CHECK_CUSTOM_BSP([[$]$1.cfg],[BSP_FOUND])
+  AS_IF([test -z "$BSP_FOUND"],[
+    AC_MSG_ERROR([missing [$]$1.cfg])
+  ])
 ])
diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4
index a6406c315b..fcec39825d 100644
--- a/aclocal/enable-rtemsbsp.m4
+++ b/aclocal/enable-rtemsbsp.m4
@@ -23,9 +23,9 @@ AC_ARG_ENABLE(rtemsbsp,
        AC_MSG_ERROR([Cannot find the top of source tree, please report to devel@rtems.org])
      fi
      target_arch=$(echo ${target_alias} | sed -e "s/\-.*//g")
-     libbsp=${srctop}/c/src/lib/libbsp
+     libbsp=${srctop}/bsps
      libbsp_e=$(echo ${libbsp} | sed -e 's/\//\\\//g')
-     cfg_list=$(LANG=C LC_COLLATE=C find ${libbsp} -mindepth 5 -name \*.cfg)
+     cfg_list=$(LANG=C LC_COLLATE=C find ${libbsp} -mindepth 1 -name \*.cfg)
      for bsp in ${enable_rtemsbsp};
      do
        found=no
diff --git a/bootstrap b/bootstrap
index a0c6eda1f2..3115ee0678 100755
--- a/bootstrap
+++ b/bootstrap
@@ -36,36 +36,6 @@ usage()
   exit 1
 }
 
-generate_bspdir_acinclude()
-{
-cat << EOF > acinclude.m4~
-# RTEMS_CHECK_BSPDIR(RTEMS_BSP_FAMILY)
-AC_DEFUN([RTEMS_CHECK_BSPDIR],
-[
-  case "\$1" in
-EOF
-
-for i in `echo */make | tr " " "\n" | LANG=C LC_COLLATE=C sort`; do
-  d=`dirname $i`
-cat << EOF >> acinclude.m4~
-  $d )
-    AC_CONFIG_SUBDIRS([$d]);;
-EOF
-done
-cat << EOF >> acinclude.m4~
-  *)
-    AC_MSG_ERROR([Invalid BSP]);;
-  esac
-])
-EOF
-if cmp -s acinclude.m4 acinclude.m4~ 2>/dev/null; then
-  echo "acinclude.m4 is unchanged"
-else
-  cp acinclude.m4~ acinclude.m4
-fi
-rm -f acinclude.m4~
-}
-
 if test ! -f $top_srcdir/aclocal/version.m4; then
   echo "${progname}:"
   echo "	Installation problem: Can't find file aclocal/version.m4"
@@ -209,8 +179,6 @@ generate)
   configure=`basename $i`
   ( test "$quiet" = "true" || echo "$dir"
     cd $dir
-    test -n "`grep RTEMS_CHECK_BSPDIR ${configure}`" && \
-      generate_bspdir_acinclude
     pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g"
     aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \
       sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat `
@@ -241,8 +209,6 @@ autoreconf)
   configure=`basename $i`
   ( test "$quiet" = "true" || echo "$dir"
     cd $dir
-    test -n "`grep RTEMS_CHECK_BSPDIR ${configure}`" && \
-      generate_bspdir_acinclude
     ${AUTORECONF} -i --no-recursive $verbose
     test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
       && echo timestamp > stamp-h.in
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/make/custom/altcycv.inc b/bsps/arm/altera-cyclone-v/config/altcycv.inc
index f3e7f1ae61..f3e7f1ae61 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/make/custom/altcycv.inc
+++ b/bsps/arm/altera-cyclone-v/config/altcycv.inc
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/make/custom/altcycv_devkit.cfg b/bsps/arm/altera-cyclone-v/config/altcycv_devkit.cfg
index ed54edfedd..ed54edfedd 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/make/custom/altcycv_devkit.cfg
+++ b/bsps/arm/altera-cyclone-v/config/altcycv_devkit.cfg
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/make/custom/altcycv_devkit_smp.cfg b/bsps/arm/altera-cyclone-v/config/altcycv_devkit_smp.cfg
index ed54edfedd..ed54edfedd 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/make/custom/altcycv_devkit_smp.cfg
+++ b/bsps/arm/altera-cyclone-v/config/altcycv_devkit_smp.cfg
diff --git a/c/src/lib/libbsp/arm/atsam/make/custom/atsamv-testsuite.tcfg b/bsps/arm/atsam/config/atsamv-testsuite.tcfg
index 5e2247f20a..5e2247f20a 100644
--- a/c/src/lib/libbsp/arm/atsam/make/custom/atsamv-testsuite.tcfg
+++ b/bsps/arm/atsam/config/atsamv-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/atsam/make/custom/atsamv.cfg b/bsps/arm/atsam/config/atsamv.cfg
index 0a2437fa12..0a2437fa12 100644
--- a/c/src/lib/libbsp/arm/atsam/make/custom/atsamv.cfg
+++ b/bsps/arm/atsam/config/atsamv.cfg
diff --git a/c/src/lib/libbsp/arm/beagle/make/custom/beagle.inc b/bsps/arm/beagle/config/beagle.inc
index 45d1408ec0..45d1408ec0 100644
--- a/c/src/lib/libbsp/arm/beagle/make/custom/beagle.inc
+++ b/bsps/arm/beagle/config/beagle.inc
diff --git a/c/src/lib/libbsp/arm/beagle/make/custom/beagleboardorig.cfg b/bsps/arm/beagle/config/beagleboardorig.cfg
index 447a51e9f6..447a51e9f6 100644
--- a/c/src/lib/libbsp/arm/beagle/make/custom/beagleboardorig.cfg
+++ b/bsps/arm/beagle/config/beagleboardorig.cfg
diff --git a/c/src/lib/libbsp/arm/beagle/make/custom/beagleboardxm.cfg b/bsps/arm/beagle/config/beagleboardxm.cfg
index ec0d2d2bd8..ec0d2d2bd8 100644
--- a/c/src/lib/libbsp/arm/beagle/make/custom/beagleboardxm.cfg
+++ b/bsps/arm/beagle/config/beagleboardxm.cfg
diff --git a/c/src/lib/libbsp/arm/beagle/make/custom/beagleboneblack.cfg b/bsps/arm/beagle/config/beagleboneblack.cfg
index f947dcef29..f947dcef29 100644
--- a/c/src/lib/libbsp/arm/beagle/make/custom/beagleboneblack.cfg
+++ b/bsps/arm/beagle/config/beagleboneblack.cfg
diff --git a/c/src/lib/libbsp/arm/beagle/make/custom/beaglebonewhite.cfg b/bsps/arm/beagle/config/beaglebonewhite.cfg
index 4b035c031e..4b035c031e 100644
--- a/c/src/lib/libbsp/arm/beagle/make/custom/beaglebonewhite.cfg
+++ b/bsps/arm/beagle/config/beaglebonewhite.cfg
diff --git a/c/src/lib/libbsp/arm/csb336/make/custom/csb336.cfg b/bsps/arm/csb336/config/csb336.cfg
index d38e2e10b8..d38e2e10b8 100644
--- a/c/src/lib/libbsp/arm/csb336/make/custom/csb336.cfg
+++ b/bsps/arm/csb336/config/csb336.cfg
diff --git a/c/src/lib/libbsp/arm/csb337/make/custom/csb337.cfg b/bsps/arm/csb337/config/csb337.cfg
index 97d9685c3d..97d9685c3d 100644
--- a/c/src/lib/libbsp/arm/csb337/make/custom/csb337.cfg
+++ b/bsps/arm/csb337/config/csb337.cfg
diff --git a/c/src/lib/libbsp/arm/csb337/make/custom/csb637.cfg b/bsps/arm/csb337/config/csb637.cfg
index 3f0832ba8a..3f0832ba8a 100644
--- a/c/src/lib/libbsp/arm/csb337/make/custom/csb637.cfg
+++ b/bsps/arm/csb337/config/csb637.cfg
diff --git a/c/src/lib/libbsp/arm/csb337/make/custom/kit637_v6.cfg b/bsps/arm/csb337/config/kit637_v6.cfg
index ac12a62906..ac12a62906 100644
--- a/c/src/lib/libbsp/arm/csb337/make/custom/kit637_v6.cfg
+++ b/bsps/arm/csb337/config/kit637_v6.cfg
diff --git a/c/src/lib/libbsp/arm/edb7312/make/custom/edb7312.cfg b/bsps/arm/edb7312/config/edb7312.cfg
index 32dd537872..32dd537872 100644
--- a/c/src/lib/libbsp/arm/edb7312/make/custom/edb7312.cfg
+++ b/bsps/arm/edb7312/config/edb7312.cfg
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136jfs-testsuite.tcfg b/bsps/arm/gdbarmsim/config/arm1136jfs-testsuite.tcfg
index 70a1a311a8..70a1a311a8 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136jfs-testsuite.tcfg
+++ b/bsps/arm/gdbarmsim/config/arm1136jfs-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136jfs.cfg b/bsps/arm/gdbarmsim/config/arm1136jfs.cfg
index be4d5a6484..be4d5a6484 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136jfs.cfg
+++ b/bsps/arm/gdbarmsim/config/arm1136jfs.cfg
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136js-testsuite.tcfg b/bsps/arm/gdbarmsim/config/arm1136js-testsuite.tcfg
index 70a1a311a8..70a1a311a8 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136js-testsuite.tcfg
+++ b/bsps/arm/gdbarmsim/config/arm1136js-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136js.cfg b/bsps/arm/gdbarmsim/config/arm1136js.cfg
index 83308c39b0..83308c39b0 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136js.cfg
+++ b/bsps/arm/gdbarmsim/config/arm1136js.cfg
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm7tdmi-testsuite.tcfg b/bsps/arm/gdbarmsim/config/arm7tdmi-testsuite.tcfg
index 70a1a311a8..70a1a311a8 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm7tdmi-testsuite.tcfg
+++ b/bsps/arm/gdbarmsim/config/arm7tdmi-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm7tdmi.cfg b/bsps/arm/gdbarmsim/config/arm7tdmi.cfg
index e992733864..e992733864 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm7tdmi.cfg
+++ b/bsps/arm/gdbarmsim/config/arm7tdmi.cfg
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm920-testsuite.tcfg b/bsps/arm/gdbarmsim/config/arm920-testsuite.tcfg
index 70a1a311a8..70a1a311a8 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm920-testsuite.tcfg
+++ b/bsps/arm/gdbarmsim/config/arm920-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm920.cfg b/bsps/arm/gdbarmsim/config/arm920.cfg
index b246d5bb20..b246d5bb20 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm920.cfg
+++ b/bsps/arm/gdbarmsim/config/arm920.cfg
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/armcortexa9-testsuite.tcfg b/bsps/arm/gdbarmsim/config/armcortexa9-testsuite.tcfg
index 70a1a311a8..70a1a311a8 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/armcortexa9-testsuite.tcfg
+++ b/bsps/arm/gdbarmsim/config/armcortexa9-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/armcortexa9.cfg b/bsps/arm/gdbarmsim/config/armcortexa9.cfg
index 6eecf70615..6eecf70615 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/armcortexa9.cfg
+++ b/bsps/arm/gdbarmsim/config/armcortexa9.cfg
diff --git a/c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg b/bsps/arm/gumstix/config/gumstix.cfg
index 664e42b365..664e42b365 100644
--- a/c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg
+++ b/bsps/arm/gumstix/config/gumstix.cfg
diff --git a/c/src/lib/libbsp/arm/imx/make/custom/imx7.cfg b/bsps/arm/imx/config/imx7.cfg
index 059f54937b..059f54937b 100644
--- a/c/src/lib/libbsp/arm/imx/make/custom/imx7.cfg
+++ b/bsps/arm/imx/config/imx7.cfg
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749-testsuite.tcfg b/bsps/arm/lm3s69xx/config/lm3s3749-testsuite.tcfg
index cdff2a9536..cdff2a9536 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749-testsuite.tcfg
+++ b/bsps/arm/lm3s69xx/config/lm3s3749-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749.cfg b/bsps/arm/lm3s69xx/config/lm3s3749.cfg
index c9edf2baf6..c9edf2baf6 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749.cfg
+++ b/bsps/arm/lm3s69xx/config/lm3s3749.cfg
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965-testsuite.tcfg b/bsps/arm/lm3s69xx/config/lm3s6965-testsuite.tcfg
index 2f36e2ec11..2f36e2ec11 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965-testsuite.tcfg
+++ b/bsps/arm/lm3s69xx/config/lm3s6965-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965.cfg b/bsps/arm/lm3s69xx/config/lm3s6965.cfg
index cba7930d04..cba7930d04 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965.cfg
+++ b/bsps/arm/lm3s69xx/config/lm3s6965.cfg
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965_qemu.cfg b/bsps/arm/lm3s69xx/config/lm3s6965_qemu.cfg
index 0ef2615af6..0ef2615af6 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965_qemu.cfg
+++ b/bsps/arm/lm3s69xx/config/lm3s6965_qemu.cfg
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s69xx.inc b/bsps/arm/lm3s69xx/config/lm3s69xx.inc
index 954a43c1bb..954a43c1bb 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s69xx.inc
+++ b/bsps/arm/lm3s69xx/config/lm3s69xx.inc
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120-testsuite.tcfg b/bsps/arm/lm3s69xx/config/lm4f120-testsuite.tcfg
index 8eafa26328..8eafa26328 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120-testsuite.tcfg
+++ b/bsps/arm/lm3s69xx/config/lm4f120-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120.cfg b/bsps/arm/lm3s69xx/config/lm4f120.cfg
index aa7961e6c7..aa7961e6c7 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120.cfg
+++ b/bsps/arm/lm3s69xx/config/lm4f120.cfg
diff --git a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed-testsuite.tcfg b/bsps/arm/lpc176x/config/lpc1768_mbed-testsuite.tcfg
index 1abc639cdc..1abc639cdc 100644
--- a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed-testsuite.tcfg
+++ b/bsps/arm/lpc176x/config/lpc1768_mbed-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed.cfg b/bsps/arm/lpc176x/config/lpc1768_mbed.cfg
index 3e9255e88f..3e9255e88f 100644
--- a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed.cfg
+++ b/bsps/arm/lpc176x/config/lpc1768_mbed.cfg
diff --git a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram-testsuite.tcfg b/bsps/arm/lpc176x/config/lpc1768_mbed_ahb_ram-testsuite.tcfg
index 8b423a1f04..8b423a1f04 100644
--- a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram-testsuite.tcfg
+++ b/bsps/arm/lpc176x/config/lpc1768_mbed_ahb_ram-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram.cfg b/bsps/arm/lpc176x/config/lpc1768_mbed_ahb_ram.cfg
index e187d1ff30..e187d1ff30 100644
--- a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram.cfg
+++ b/bsps/arm/lpc176x/config/lpc1768_mbed_ahb_ram.cfg
diff --git a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram_eth-testsuite.tcfg b/bsps/arm/lpc176x/config/lpc1768_mbed_ahb_ram_eth-testsuite.tcfg
index ed465c10f6..ed465c10f6 100644
--- a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram_eth-testsuite.tcfg
+++ b/bsps/arm/lpc176x/config/lpc1768_mbed_ahb_ram_eth-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram_eth.cfg b/bsps/arm/lpc176x/config/lpc1768_mbed_ahb_ram_eth.cfg
index e187d1ff30..e187d1ff30 100644
--- a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram_eth.cfg
+++ b/bsps/arm/lpc176x/config/lpc1768_mbed_ahb_ram_eth.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx.inc b/bsps/arm/lpc24xx/config/lpc17xx.inc
index e877959e1d..e877959e1d 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx.inc
+++ b/bsps/arm/lpc24xx/config/lpc17xx.inc
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_ram.cfg b/bsps/arm/lpc24xx/config/lpc17xx_ea_ram.cfg
index caaaf07639..caaaf07639 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_ram.cfg
+++ b/bsps/arm/lpc24xx/config/lpc17xx_ea_ram.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_rom_int-testsuite.tcfg b/bsps/arm/lpc24xx/config/lpc17xx_ea_rom_int-testsuite.tcfg
index 64e3a0585d..64e3a0585d 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_rom_int-testsuite.tcfg
+++ b/bsps/arm/lpc24xx/config/lpc17xx_ea_rom_int-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_rom_int.cfg b/bsps/arm/lpc24xx/config/lpc17xx_ea_rom_int.cfg
index caaaf07639..caaaf07639 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_rom_int.cfg
+++ b/bsps/arm/lpc24xx/config/lpc17xx_ea_rom_int.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_ram.cfg b/bsps/arm/lpc24xx/config/lpc17xx_plx800_ram.cfg
index a3cf1f0816..a3cf1f0816 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_ram.cfg
+++ b/bsps/arm/lpc24xx/config/lpc17xx_plx800_ram.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_rom_int-testsuite.tcfg b/bsps/arm/lpc24xx/config/lpc17xx_plx800_rom_int-testsuite.tcfg
index 9c7f2ce60b..9c7f2ce60b 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_rom_int-testsuite.tcfg
+++ b/bsps/arm/lpc24xx/config/lpc17xx_plx800_rom_int-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_rom_int.cfg b/bsps/arm/lpc24xx/config/lpc17xx_plx800_rom_int.cfg
index a3cf1f0816..a3cf1f0816 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_rom_int.cfg
+++ b/bsps/arm/lpc24xx/config/lpc17xx_plx800_rom_int.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg b/bsps/arm/lpc24xx/config/lpc2362-testsuite.tcfg
index bf8df07b8b..bf8df07b8b 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg
+++ b/bsps/arm/lpc24xx/config/lpc2362-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362.cfg b/bsps/arm/lpc24xx/config/lpc2362.cfg
index d5fc413191..d5fc413191 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362.cfg
+++ b/bsps/arm/lpc24xx/config/lpc2362.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc23xx_tli800-testsuite.tcfg b/bsps/arm/lpc24xx/config/lpc23xx_tli800-testsuite.tcfg
index 768e8ee7d7..768e8ee7d7 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc23xx_tli800-testsuite.tcfg
+++ b/bsps/arm/lpc24xx/config/lpc23xx_tli800-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc23xx_tli800.cfg b/bsps/arm/lpc24xx/config/lpc23xx_tli800.cfg
index a7e7ef34b8..a7e7ef34b8 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc23xx_tli800.cfg
+++ b/bsps/arm/lpc24xx/config/lpc23xx_tli800.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx.inc b/bsps/arm/lpc24xx/config/lpc24xx.inc
index 9bcef4b793..9bcef4b793 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx.inc
+++ b/bsps/arm/lpc24xx/config/lpc24xx.inc
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ea.cfg b/bsps/arm/lpc24xx/config/lpc24xx_ea.cfg
index 813fcb8cb6..813fcb8cb6 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ea.cfg
+++ b/bsps/arm/lpc24xx/config/lpc24xx_ea.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_ram.cfg b/bsps/arm/lpc24xx/config/lpc24xx_ncs_ram.cfg
index a629a4f497..a629a4f497 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_ram.cfg
+++ b/bsps/arm/lpc24xx/config/lpc24xx_ncs_ram.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_ext.cfg b/bsps/arm/lpc24xx/config/lpc24xx_ncs_rom_ext.cfg
index a629a4f497..a629a4f497 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_ext.cfg
+++ b/bsps/arm/lpc24xx/config/lpc24xx_ncs_rom_ext.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int-testsuite.tcfg b/bsps/arm/lpc24xx/config/lpc24xx_ncs_rom_int-testsuite.tcfg
index cec9333713..cec9333713 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int-testsuite.tcfg
+++ b/bsps/arm/lpc24xx/config/lpc24xx_ncs_rom_int-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int.cfg b/bsps/arm/lpc24xx/config/lpc24xx_ncs_rom_int.cfg
index a629a4f497..a629a4f497 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int.cfg
+++ b/bsps/arm/lpc24xx/config/lpc24xx_ncs_rom_int.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_ram.cfg b/bsps/arm/lpc24xx/config/lpc24xx_plx800_ram.cfg
index 6e25ad5dc2..6e25ad5dc2 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_ram.cfg
+++ b/bsps/arm/lpc24xx/config/lpc24xx_plx800_ram.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_rom_int-testsuite.tcfg b/bsps/arm/lpc24xx/config/lpc24xx_plx800_rom_int-testsuite.tcfg
index 94b7f7a947..94b7f7a947 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_rom_int-testsuite.tcfg
+++ b/bsps/arm/lpc24xx/config/lpc24xx_plx800_rom_int-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_rom_int.cfg b/bsps/arm/lpc24xx/config/lpc24xx_plx800_rom_int.cfg
index 6e25ad5dc2..6e25ad5dc2 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_rom_int.cfg
+++ b/bsps/arm/lpc24xx/config/lpc24xx_plx800_rom_int.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx.inc b/bsps/arm/lpc24xx/config/lpc40xx.inc
index 5460a95f54..5460a95f54 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx.inc
+++ b/bsps/arm/lpc24xx/config/lpc40xx.inc
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_ram.cfg b/bsps/arm/lpc24xx/config/lpc40xx_ea_ram.cfg
index 4c4eb4d360..4c4eb4d360 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_ram.cfg
+++ b/bsps/arm/lpc24xx/config/lpc40xx_ea_ram.cfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_rom_int-testsuite.tcfg b/bsps/arm/lpc24xx/config/lpc40xx_ea_rom_int-testsuite.tcfg
index 3a968c4a74..3a968c4a74 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_rom_int-testsuite.tcfg
+++ b/bsps/arm/lpc24xx/config/lpc40xx_ea_rom_int-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_rom_int.cfg b/bsps/arm/lpc24xx/config/lpc40xx_ea_rom_int.cfg
index 4c4eb4d360..4c4eb4d360 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_rom_int.cfg
+++ b/bsps/arm/lpc24xx/config/lpc40xx_ea_rom_int.cfg
diff --git a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx.inc b/bsps/arm/lpc32xx/config/lpc32xx.inc
index f184741242..f184741242 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx.inc
+++ b/bsps/arm/lpc32xx/config/lpc32xx.inc
diff --git a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx.cfg b/bsps/arm/lpc32xx/config/lpc32xx_mzx.cfg
index 343fddef67..343fddef67 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx.cfg
+++ b/bsps/arm/lpc32xx/config/lpc32xx_mzx.cfg
diff --git a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_1-testsuite.tcfg b/bsps/arm/lpc32xx/config/lpc32xx_mzx_stage_1-testsuite.tcfg
index 225ee5dc49..225ee5dc49 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_1-testsuite.tcfg
+++ b/bsps/arm/lpc32xx/config/lpc32xx_mzx_stage_1-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_1.cfg b/bsps/arm/lpc32xx/config/lpc32xx_mzx_stage_1.cfg
index b3838ab904..b3838ab904 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_1.cfg
+++ b/bsps/arm/lpc32xx/config/lpc32xx_mzx_stage_1.cfg
diff --git a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_2.cfg b/bsps/arm/lpc32xx/config/lpc32xx_mzx_stage_2.cfg
index 586ddbec9c..586ddbec9c 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_2.cfg
+++ b/bsps/arm/lpc32xx/config/lpc32xx_mzx_stage_2.cfg
diff --git a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_phycore.cfg b/bsps/arm/lpc32xx/config/lpc32xx_phycore.cfg
index 5c5c56734e..5c5c56734e 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_phycore.cfg
+++ b/bsps/arm/lpc32xx/config/lpc32xx_phycore.cfg
diff --git a/c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.cfg b/bsps/arm/raspberrypi/config/raspberrypi.cfg
index 759b79d8f6..759b79d8f6 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.cfg
+++ b/bsps/arm/raspberrypi/config/raspberrypi.cfg
diff --git a/c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.inc b/bsps/arm/raspberrypi/config/raspberrypi.inc
index a8b6f264c3..a8b6f264c3 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.inc
+++ b/bsps/arm/raspberrypi/config/raspberrypi.inc
diff --git a/c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi2.cfg b/bsps/arm/raspberrypi/config/raspberrypi2.cfg
index a233d3461d..a233d3461d 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi2.cfg
+++ b/bsps/arm/raspberrypi/config/raspberrypi2.cfg
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/make/custom/realview_pbx_a9_qemu.cfg b/bsps/arm/realview-pbx-a9/config/realview_pbx_a9_qemu.cfg
index f6875451cd..f6875451cd 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/make/custom/realview_pbx_a9_qemu.cfg
+++ b/bsps/arm/realview-pbx-a9/config/realview_pbx_a9_qemu.cfg
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/make/custom/realview_pbx_a9_qemu_smp.cfg b/bsps/arm/realview-pbx-a9/config/realview_pbx_a9_qemu_smp.cfg
index fd51a18004..fd51a18004 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/make/custom/realview_pbx_a9_qemu_smp.cfg
+++ b/bsps/arm/realview-pbx-a9/config/realview_pbx_a9_qemu_smp.cfg
diff --git a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx-testsuite.tcfg b/bsps/arm/rtl22xx/config/rtl22xx-testsuite.tcfg
index 6c25615e73..6c25615e73 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx-testsuite.tcfg
+++ b/bsps/arm/rtl22xx/config/rtl22xx-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx.cfg b/bsps/arm/rtl22xx/config/rtl22xx.cfg
index 9b195477f8..9b195477f8 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx.cfg
+++ b/bsps/arm/rtl22xx/config/rtl22xx.cfg
diff --git a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx_t-testsuite.tcfg b/bsps/arm/rtl22xx/config/rtl22xx_t-testsuite.tcfg
index e55524aac4..e55524aac4 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx_t-testsuite.tcfg
+++ b/bsps/arm/rtl22xx/config/rtl22xx_t-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx_t.cfg b/bsps/arm/rtl22xx/config/rtl22xx_t.cfg
index 5cf8b66246..5cf8b66246 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx_t.cfg
+++ b/bsps/arm/rtl22xx/config/rtl22xx_t.cfg
diff --git a/c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg b/bsps/arm/smdk2410/config/smdk2410.cfg
index b5720cae3f..b5720cae3f 100644
--- a/c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg
+++ b/bsps/arm/smdk2410/config/smdk2410.cfg
diff --git a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc-testsuite.tcfg b/bsps/arm/stm32f4/config/stm32f105rc-testsuite.tcfg
index ad44d38d81..ad44d38d81 100644
--- a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc-testsuite.tcfg
+++ b/bsps/arm/stm32f4/config/stm32f105rc-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc.cfg b/bsps/arm/stm32f4/config/stm32f105rc.cfg
index b0a522e08f..b0a522e08f 100644
--- a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc.cfg
+++ b/bsps/arm/stm32f4/config/stm32f105rc.cfg
diff --git a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4-testsuite.tcfg b/bsps/arm/stm32f4/config/stm32f4-testsuite.tcfg
index e3a3775ed3..e3a3775ed3 100644
--- a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4-testsuite.tcfg
+++ b/bsps/arm/stm32f4/config/stm32f4-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4.cfg b/bsps/arm/stm32f4/config/stm32f4.cfg
index edca4bfa32..edca4bfa32 100644
--- a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4.cfg
+++ b/bsps/arm/stm32f4/config/stm32f4.cfg
diff --git a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137.inc b/bsps/arm/tms570/config/tms570ls3137.inc
index 76d5ccd2ba..76d5ccd2ba 100644
--- a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137.inc
+++ b/bsps/arm/tms570/config/tms570ls3137.inc
diff --git a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk-testsuite.tcfg b/bsps/arm/tms570/config/tms570ls3137_hdk-testsuite.tcfg
index cac977c83a..cac977c83a 100644
--- a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk-testsuite.tcfg
+++ b/bsps/arm/tms570/config/tms570ls3137_hdk-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk.cfg b/bsps/arm/tms570/config/tms570ls3137_hdk.cfg
index d769895360..d769895360 100644
--- a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk.cfg
+++ b/bsps/arm/tms570/config/tms570ls3137_hdk.cfg
diff --git a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_intram-testsuite.tcfg b/bsps/arm/tms570/config/tms570ls3137_hdk_intram-testsuite.tcfg
index c13e1597e0..c13e1597e0 100644
--- a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_intram-testsuite.tcfg
+++ b/bsps/arm/tms570/config/tms570ls3137_hdk_intram-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_intram.cfg b/bsps/arm/tms570/config/tms570ls3137_hdk_intram.cfg
index d769895360..d769895360 100644
--- a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_intram.cfg
+++ b/bsps/arm/tms570/config/tms570ls3137_hdk_intram.cfg
diff --git a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_sdram.cfg b/bsps/arm/tms570/config/tms570ls3137_hdk_sdram.cfg
index d769895360..d769895360 100644
--- a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_sdram.cfg
+++ b/bsps/arm/tms570/config/tms570ls3137_hdk_sdram.cfg
diff --git a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_with_loader-testsuite.tcfg b/bsps/arm/tms570/config/tms570ls3137_hdk_with_loader-testsuite.tcfg
index 8286e36b4a..8286e36b4a 100644
--- a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_with_loader-testsuite.tcfg
+++ b/bsps/arm/tms570/config/tms570ls3137_hdk_with_loader-testsuite.tcfg
diff --git a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_with_loader.cfg b/bsps/arm/tms570/config/tms570ls3137_hdk_with_loader.cfg
index d769895360..d769895360 100644
--- a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_with_loader.cfg
+++ b/bsps/arm/tms570/config/tms570ls3137_hdk_with_loader.cfg
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq.inc b/bsps/arm/xilinx-zynq/config/xilinx_zynq.inc
index 59c18f7c95..59c18f7c95 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq.inc
+++ b/bsps/arm/xilinx-zynq/config/xilinx_zynq.inc
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu.cfg b/bsps/arm/xilinx-zynq/config/xilinx_zynq_a9_qemu.cfg
index 013ae6f485..013ae6f485 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu.cfg
+++ b/bsps/arm/xilinx-zynq/config/xilinx_zynq_a9_qemu.cfg
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc702.cfg b/bsps/arm/xilinx-zynq/config/xilinx_zynq_zc702.cfg
index 2de871d46e..2de871d46e 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc702.cfg
+++ b/bsps/arm/xilinx-zynq/config/xilinx_zynq_zc702.cfg
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc706.cfg b/bsps/arm/xilinx-zynq/config/xilinx_zynq_zc706.cfg
index 2de871d46e..2de871d46e 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc706.cfg
+++ b/bsps/arm/xilinx-zynq/config/xilinx_zynq_zc706.cfg
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zedboard.cfg b/bsps/arm/xilinx-zynq/config/xilinx_zynq_zedboard.cfg
index 2de871d46e..2de871d46e 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zedboard.cfg
+++ b/bsps/arm/xilinx-zynq/config/xilinx_zynq_zedboard.cfg
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/make/custom/TLL6527M.cfg b/bsps/bfin/TLL6527M/config/TLL6527M.cfg
index 8226543b89..8226543b89 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/make/custom/TLL6527M.cfg
+++ b/bsps/bfin/TLL6527M/config/TLL6527M.cfg
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/make/custom/bf537Stamp.cfg b/bsps/bfin/bf537Stamp/config/bf537Stamp.cfg
index e27a7d31a1..e27a7d31a1 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/make/custom/bf537Stamp.cfg
+++ b/bsps/bfin/bf537Stamp/config/bf537Stamp.cfg
diff --git a/c/src/lib/libbsp/bfin/eZKit533/make/custom/eZKit533.cfg b/bsps/bfin/eZKit533/config/eZKit533.cfg
index 834039d985..834039d985 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/make/custom/eZKit533.cfg
+++ b/bsps/bfin/eZKit533/config/eZKit533.cfg
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/make/custom/epiphany_sim.cfg b/bsps/epiphany/epiphany_sim/config/epiphany_sim.cfg
index 1fef6085d1..1fef6085d1 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/make/custom/epiphany_sim.cfg
+++ b/bsps/epiphany/epiphany_sim/config/epiphany_sim.cfg
diff --git a/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg b/bsps/i386/pc386/config/pc386.cfg
index dd7f554cbc..dd7f554cbc 100644
--- a/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg
+++ b/bsps/i386/pc386/config/pc386.cfg
diff --git a/c/src/lib/libbsp/i386/pc386/make/custom/pc486.cfg b/bsps/i386/pc386/config/pc486.cfg
index baab16dc32..baab16dc32 100644
--- a/c/src/lib/libbsp/i386/pc386/make/custom/pc486.cfg
+++ b/bsps/i386/pc386/config/pc486.cfg
diff --git a/c/src/lib/libbsp/i386/pc386/make/custom/pc586-sse.cfg b/bsps/i386/pc386/config/pc586-sse.cfg
index 764c40c44e..764c40c44e 100644
--- a/c/src/lib/libbsp/i386/pc386/make/custom/pc586-sse.cfg
+++ b/bsps/i386/pc386/config/pc586-sse.cfg
diff --git a/c/src/lib/libbsp/i386/pc386/make/custom/pc586.cfg b/bsps/i386/pc386/config/pc586.cfg
index 35733a3cde..35733a3cde 100644
--- a/c/src/lib/libbsp/i386/pc386/make/custom/pc586.cfg
+++ b/bsps/i386/pc386/config/pc586.cfg
diff --git a/c/src/lib/libbsp/i386/pc386/make/custom/pc686.cfg b/bsps/i386/pc386/config/pc686.cfg
index fc63cde789..fc63cde789 100644
--- a/c/src/lib/libbsp/i386/pc386/make/custom/pc686.cfg
+++ b/bsps/i386/pc386/config/pc686.cfg
diff --git a/c/src/lib/libbsp/i386/pc386/make/custom/pcp4.cfg b/bsps/i386/pc386/config/pcp4.cfg
index 75ec7d4666..75ec7d4666 100644
--- a/c/src/lib/libbsp/i386/pc386/make/custom/pcp4.cfg
+++ b/bsps/i386/pc386/config/pcp4.cfg
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr.cfg b/bsps/lm32/lm32_evr/config/lm32_evr.cfg
index fc6e65b768..fc6e65b768 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr.cfg
+++ b/bsps/lm32/lm32_evr/config/lm32_evr.cfg
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr_gdbsim-testsuite.tcfg b/bsps/lm32/lm32_evr/config/lm32_evr_gdbsim-testsuite.tcfg
index 595806baed..595806baed 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr_gdbsim-testsuite.tcfg
+++ b/bsps/lm32/lm32_evr/config/lm32_evr_gdbsim-testsuite.tcfg
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr_gdbsim.cfg b/bsps/lm32/lm32_evr/config/lm32_evr_gdbsim.cfg
index 2050654d44..2050654d44 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr_gdbsim.cfg
+++ b/bsps/lm32/lm32_evr/config/lm32_evr_gdbsim.cfg
diff --git a/c/src/lib/libbsp/lm32/milkymist/make/custom/milkymist.cfg b/bsps/lm32/milkymist/config/milkymist.cfg
index 4f280fc612..4f280fc612 100644
--- a/c/src/lib/libbsp/lm32/milkymist/make/custom/milkymist.cfg
+++ b/bsps/lm32/milkymist/config/milkymist.cfg
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg b/bsps/m32c/m32cbsp/config/m32csim-testsuite.tcfg
index d1eee4f443..d1eee4f443 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg
+++ b/bsps/m32c/m32cbsp/config/m32csim-testsuite.tcfg
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim.cfg b/bsps/m32c/m32cbsp/config/m32csim.cfg
index 9ea0d48b80..9ea0d48b80 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim.cfg
+++ b/bsps/m32c/m32cbsp/config/m32csim.cfg
diff --git a/c/src/lib/libbsp/m68k/av5282/make/custom/av5282.cfg b/bsps/m68k/av5282/config/av5282.cfg
index 1c82a4de12..1c82a4de12 100644
--- a/c/src/lib/libbsp/m68k/av5282/make/custom/av5282.cfg
+++ b/bsps/m68k/av5282/config/av5282.cfg
diff --git a/c/src/lib/libbsp/m68k/csb360/make/custom/csb360.cfg b/bsps/m68k/csb360/config/csb360.cfg
index 8694aacec7..8694aacec7 100644
--- a/c/src/lib/libbsp/m68k/csb360/make/custom/csb360.cfg
+++ b/bsps/m68k/csb360/config/csb360.cfg
diff --git a/c/src/lib/libbsp/m68k/gen68340/make/custom/gen68340.cfg b/bsps/m68k/gen68340/config/gen68340.cfg
index 5185e2c5a8..5185e2c5a8 100644
--- a/c/src/lib/libbsp/m68k/gen68340/make/custom/gen68340.cfg
+++ b/bsps/m68k/gen68340/config/gen68340.cfg
diff --git a/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360.cfg b/bsps/m68k/gen68360/config/gen68360.cfg
index d8e3d2c3a5..d8e3d2c3a5 100644
--- a/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360.cfg
+++ b/bsps/m68k/gen68360/config/gen68360.cfg
diff --git a/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360_040.cfg b/bsps/m68k/gen68360/config/gen68360_040.cfg
index 142f3c7ae4..142f3c7ae4 100644
--- a/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360_040.cfg
+++ b/bsps/m68k/gen68360/config/gen68360_040.cfg
diff --git a/c/src/lib/libbsp/m68k/gen68360/make/custom/pgh360.cfg b/bsps/m68k/gen68360/config/pgh360.cfg
index 2303a62b45..2303a62b45 100644
--- a/c/src/lib/libbsp/m68k/gen68360/make/custom/pgh360.cfg
+++ b/bsps/m68k/gen68360/config/pgh360.cfg
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/make/custom/COBRA5475.cfg b/bsps/m68k/genmcf548x/config/COBRA5475.cfg
index 1c27ee9741..1c27ee9741 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/make/custom/COBRA5475.cfg
+++ b/bsps/m68k/genmcf548x/config/COBRA5475.cfg
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/make/custom/genmcf548x.inc b/bsps/m68k/genmcf548x/config/genmcf548x.inc
index 330d47ed06..330d47ed06 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/make/custom/genmcf548x.inc
+++ b/bsps/m68k/genmcf548x/config/genmcf548x.inc
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/make/custom/m5484FireEngine.cfg b/bsps/m68k/genmcf548x/config/m5484FireEngine.cfg
index 7322a36c9f..7322a36c9f 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/make/custom/m5484FireEngine.cfg
+++ b/bsps/m68k/genmcf548x/config/m5484FireEngine.cfg
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/make/custom/mcf5206elite-testsuite.tcfg b/bsps/m68k/mcf5206elite/config/mcf5206elite-testsuite.tcfg
index d11a487569..d11a487569 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/make/custom/mcf5206elite-testsuite.tcfg
+++ b/bsps/m68k/mcf5206elite/config/mcf5206elite-testsuite.tcfg
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/make/custom/mcf5206elite.cfg b/bsps/m68k/mcf5206elite/config/mcf5206elite.cfg
index 258727b9be..258727b9be 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/make/custom/mcf5206elite.cfg
+++ b/bsps/m68k/mcf5206elite/config/mcf5206elite.cfg
diff --git a/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235-testsuite.tcfg b/bsps/m68k/mcf52235/config/mcf52235-testsuite.tcfg
index f81ea1d224..f81ea1d224 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235-testsuite.tcfg
+++ b/bsps/m68k/mcf52235/config/mcf52235-testsuite.tcfg
diff --git a/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235.cfg b/bsps/m68k/mcf52235/config/mcf52235.cfg
index bc69711fd7..bc69711fd7 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235.cfg
+++ b/bsps/m68k/mcf52235/config/mcf52235.cfg
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x-testsuite.tcfg b/bsps/m68k/mcf5225x/config/mcf5225x-testsuite.tcfg
index 76d09e7ee7..76d09e7ee7 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x-testsuite.tcfg
+++ b/bsps/m68k/mcf5225x/config/mcf5225x-testsuite.tcfg
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x.cfg b/bsps/m68k/mcf5225x/config/mcf5225x.cfg
index d195e46199..d195e46199 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x.cfg
+++ b/bsps/m68k/mcf5225x/config/mcf5225x.cfg
diff --git a/c/src/lib/libbsp/m68k/mcf5235/make/custom/mcf5235.cfg b/bsps/m68k/mcf5235/config/mcf5235.cfg
index aed4e2ed5c..aed4e2ed5c 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/make/custom/mcf5235.cfg
+++ b/bsps/m68k/mcf5235/config/mcf5235.cfg
diff --git a/c/src/lib/libbsp/m68k/mcf5329/make/custom/mcf5329.cfg b/bsps/m68k/mcf5329/config/mcf5329.cfg
index 88b6df6ce7..88b6df6ce7 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/make/custom/mcf5329.cfg
+++ b/bsps/m68k/mcf5329/config/mcf5329.cfg
diff --git a/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332-testsuite.tcfg b/bsps/m68k/mrm332/config/mrm332-testsuite.tcfg
index 624b1d982c..624b1d982c 100644
--- a/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332-testsuite.tcfg
+++ b/bsps/m68k/mrm332/config/mrm332-testsuite.tcfg
diff --git a/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332.cfg b/bsps/m68k/mrm332/config/mrm332.cfg
index 979f331399..979f331399 100644
--- a/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332.cfg
+++ b/bsps/m68k/mrm332/config/mrm332.cfg
diff --git a/c/src/lib/libbsp/m68k/mvme147/make/custom/mvme147.cfg b/bsps/m68k/mvme147/config/mvme147.cfg
index 18e9f28b71..18e9f28b71 100644
--- a/c/src/lib/libbsp/m68k/mvme147/make/custom/mvme147.cfg
+++ b/bsps/m68k/mvme147/config/mvme147.cfg
diff --git a/c/src/lib/libbsp/m68k/mvme147s/make/custom/mvme147s.cfg b/bsps/m68k/mvme147s/config/mvme147s.cfg
index 89922a518e..89922a518e 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/make/custom/mvme147s.cfg
+++ b/bsps/m68k/mvme147s/config/mvme147s.cfg
diff --git a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162-testsuite.tcfg b/bsps/m68k/mvme162/config/mvme162-testsuite.tcfg
index 8476d8ecff..8476d8ecff 100644
--- a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162-testsuite.tcfg
+++ b/bsps/m68k/mvme162/config/mvme162-testsuite.tcfg
diff --git a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162.cfg b/bsps/m68k/mvme162/config/mvme162.cfg
index db96fff921..db96fff921 100644
--- a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162.cfg
+++ b/bsps/m68k/mvme162/config/mvme162.cfg
diff --git a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx-testsuite.tcfg b/bsps/m68k/mvme162/config/mvme162lx-testsuite.tcfg
index f1f680287a..f1f680287a 100644
--- a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx-testsuite.tcfg
+++ b/bsps/m68k/mvme162/config/mvme162lx-testsuite.tcfg
diff --git a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx.cfg b/bsps/m68k/mvme162/config/mvme162lx.cfg
index 8483cf0d84..8483cf0d84 100644
--- a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx.cfg
+++ b/bsps/m68k/mvme162/config/mvme162lx.cfg
diff --git a/c/src/lib/libbsp/m68k/mvme167/make/custom/mvme167.cfg b/bsps/m68k/mvme167/config/mvme167.cfg
index c40f248493..c40f248493 100644
--- a/c/src/lib/libbsp/m68k/mvme167/make/custom/mvme167.cfg
+++ b/bsps/m68k/mvme167/config/mvme167.cfg
diff --git a/c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg b/bsps/m68k/uC5282/config/uC5282.cfg
index b8e3f52667..b8e3f52667 100644
--- a/c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg
+++ b/bsps/m68k/uC5282/config/uC5282.cfg
diff --git a/c/src/lib/libbsp/mips/csb350/make/custom/csb350.cfg b/bsps/mips/csb350/config/csb350.cfg
index f6d50662b0..f6d50662b0 100644
--- a/c/src/lib/libbsp/mips/csb350/make/custom/csb350.cfg
+++ b/bsps/mips/csb350/config/csb350.cfg
diff --git a/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane-testsuite.tcfg b/bsps/mips/hurricane/config/hurricane-testsuite.tcfg
index fb84b55762..fb84b55762 100644
--- a/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane-testsuite.tcfg
+++ b/bsps/mips/hurricane/config/hurricane-testsuite.tcfg
diff --git a/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane.cfg b/bsps/mips/hurricane/config/hurricane.cfg
index b1c050b966..b1c050b966 100644
--- a/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane.cfg
+++ b/bsps/mips/hurricane/config/hurricane.cfg
diff --git a/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904-testsuite.tcfg b/bsps/mips/jmr3904/config/jmr3904-testsuite.tcfg
index a8d24a09a9..a8d24a09a9 100644
--- a/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904-testsuite.tcfg
+++ b/bsps/mips/jmr3904/config/jmr3904-testsuite.tcfg
diff --git a/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904.cfg b/bsps/mips/jmr3904/config/jmr3904.cfg
index ed4e6b3be0..ed4e6b3be0 100644
--- a/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904.cfg
+++ b/bsps/mips/jmr3904/config/jmr3904.cfg
diff --git a/c/src/lib/libbsp/mips/malta/make/custom/malta.cfg b/bsps/mips/malta/config/malta.cfg
index a25abcc911..a25abcc911 100644
--- a/c/src/lib/libbsp/mips/malta/make/custom/malta.cfg
+++ b/bsps/mips/malta/config/malta.cfg
diff --git a/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925-testsuite.tcfg b/bsps/mips/rbtx4925/config/rbtx4925-testsuite.tcfg
index fb84b55762..fb84b55762 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925-testsuite.tcfg
+++ b/bsps/mips/rbtx4925/config/rbtx4925-testsuite.tcfg
diff --git a/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925.cfg b/bsps/mips/rbtx4925/config/rbtx4925.cfg
index 744fdb4240..744fdb4240 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925.cfg
+++ b/bsps/mips/rbtx4925/config/rbtx4925.cfg
diff --git a/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938-testsuite.tcfg b/bsps/mips/rbtx4938/config/rbtx4938-testsuite.tcfg
index fb84b55762..fb84b55762 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938-testsuite.tcfg
+++ b/bsps/mips/rbtx4938/config/rbtx4938-testsuite.tcfg
diff --git a/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938.cfg b/bsps/mips/rbtx4938/config/rbtx4938.cfg
index 42cdf17a04..42cdf17a04 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938.cfg
+++ b/bsps/mips/rbtx4938/config/rbtx4938.cfg
diff --git a/c/src/lib/libbsp/moxie/moxiesim/make/custom/moxiesim-testsuite.tcfg b/bsps/moxie/moxiesim/config/moxiesim-testsuite.tcfg
index 056d1c406f..056d1c406f 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/make/custom/moxiesim-testsuite.tcfg
+++ b/bsps/moxie/moxiesim/config/moxiesim-testsuite.tcfg
diff --git a/c/src/lib/libbsp/moxie/moxiesim/make/custom/moxiesim.cfg b/bsps/moxie/moxiesim/config/moxiesim.cfg
index 4d924d9c76..4d924d9c76 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/make/custom/moxiesim.cfg
+++ b/bsps/moxie/moxiesim/config/moxiesim.cfg
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/make/custom/nios2_iss.cfg b/bsps/nios2/nios2_iss/config/nios2_iss.cfg
index f7103703ce..f7103703ce 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/make/custom/nios2_iss.cfg
+++ b/bsps/nios2/nios2_iss/config/nios2_iss.cfg
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/make/custom/no_bsp.cfg b/bsps/no_cpu/no_bsp/config/no_bsp.cfg
index 15e2f29bff..15e2f29bff 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/make/custom/no_bsp.cfg
+++ b/bsps/no_cpu/no_bsp/config/no_bsp.cfg
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k-testsuite.tcfg b/bsps/or1k/generic_or1k/config/generic_or1k-testsuite.tcfg
index 15179ba22f..15179ba22f 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k-testsuite.tcfg
+++ b/bsps/or1k/generic_or1k/config/generic_or1k-testsuite.tcfg
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k.cfg b/bsps/or1k/generic_or1k/config/generic_or1k.cfg
index 9a00643bce..9a00643bce 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k.cfg
+++ b/bsps/or1k/generic_or1k/config/generic_or1k.cfg
diff --git a/c/src/lib/libbsp/powerpc/beatnik/make/custom/beatnik.cfg b/bsps/powerpc/beatnik/config/beatnik.cfg
index 1190cadf62..1190cadf62 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/make/custom/beatnik.cfg
+++ b/bsps/powerpc/beatnik/config/beatnik.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/brs5l.cfg b/bsps/powerpc/gen5200/config/brs5l.cfg
index d6e556a183..d6e556a183 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/brs5l.cfg
+++ b/bsps/powerpc/gen5200/config/brs5l.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/brs6l.cfg b/bsps/powerpc/gen5200/config/brs6l.cfg
index d6e556a183..d6e556a183 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/brs6l.cfg
+++ b/bsps/powerpc/gen5200/config/brs6l.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/dp2.cfg b/bsps/powerpc/gen5200/config/dp2.cfg
index 81941fe0dc..81941fe0dc 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/dp2.cfg
+++ b/bsps/powerpc/gen5200/config/dp2.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/gen5200.inc b/bsps/powerpc/gen5200/config/gen5200.inc
index 71c605c8da..71c605c8da 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/gen5200.inc
+++ b/bsps/powerpc/gen5200/config/gen5200.inc
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/icecube.cfg b/bsps/powerpc/gen5200/config/icecube.cfg
index c53040e1b3..c53040e1b3 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/icecube.cfg
+++ b/bsps/powerpc/gen5200/config/icecube.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_cr825.cfg b/bsps/powerpc/gen5200/config/pm520_cr825.cfg
index d86814ab66..d86814ab66 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_cr825.cfg
+++ b/bsps/powerpc/gen5200/config/pm520_cr825.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_ze30.cfg b/bsps/powerpc/gen5200/config/pm520_ze30.cfg
index e16e2e1886..e16e2e1886 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_ze30.cfg
+++ b/bsps/powerpc/gen5200/config/pm520_ze30.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/br_uid.cfg b/bsps/powerpc/gen83xx/config/br_uid.cfg
index 0db23d54dd..0db23d54dd 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/br_uid.cfg
+++ b/bsps/powerpc/gen83xx/config/br_uid.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/gen83xx.inc b/bsps/powerpc/gen83xx/config/gen83xx.inc
index e1bee9f786..e1bee9f786 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/gen83xx.inc
+++ b/bsps/powerpc/gen83xx/config/gen83xx.inc
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/hsc_cm01.cfg b/bsps/powerpc/gen83xx/config/hsc_cm01.cfg
index 8f2ac1829d..8f2ac1829d 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/hsc_cm01.cfg
+++ b/bsps/powerpc/gen83xx/config/hsc_cm01.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8309som.cfg b/bsps/powerpc/gen83xx/config/mpc8309som.cfg
index be25fcd4fb..be25fcd4fb 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8309som.cfg
+++ b/bsps/powerpc/gen83xx/config/mpc8309som.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8313erdb.cfg b/bsps/powerpc/gen83xx/config/mpc8313erdb.cfg
index 4a6331e8c4..4a6331e8c4 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8313erdb.cfg
+++ b/bsps/powerpc/gen83xx/config/mpc8313erdb.cfg
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8349eamds.cfg b/bsps/powerpc/gen83xx/config/mpc8349eamds.cfg
index b58c60a92a..b58c60a92a 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8349eamds.cfg
+++ b/bsps/powerpc/gen83xx/config/mpc8349eamds.cfg
diff --git a/c/src/lib/libbsp/powerpc/haleakala/make/custom/haleakala.cfg b/bsps/powerpc/haleakala/config/haleakala.cfg
index 90b9292d0b..90b9292d0b 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/make/custom/haleakala.cfg
+++ b/bsps/powerpc/haleakala/config/haleakala.cfg
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mcp750.cfg b/bsps/powerpc/motorola_powerpc/config/mcp750.cfg
index 691a76a65a..691a76a65a 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mcp750.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/mcp750.cfg
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mtx603e.cfg b/bsps/powerpc/motorola_powerpc/config/mtx603e.cfg
index dd889b8e70..dd889b8e70 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mtx603e.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/mtx603e.cfg
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2100.cfg b/bsps/powerpc/motorola_powerpc/config/mvme2100.cfg
index e358c2d7af..e358c2d7af 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2100.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/mvme2100.cfg
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2307.cfg b/bsps/powerpc/motorola_powerpc/config/mvme2307.cfg
index 1a5115999b..1a5115999b 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2307.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/mvme2307.cfg
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep-altivec.cfg b/bsps/powerpc/motorola_powerpc/config/qemuprep-altivec.cfg
index 9d09089f94..9d09089f94 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep-altivec.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/qemuprep-altivec.cfg
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep.cfg b/bsps/powerpc/motorola_powerpc/config/qemuprep.cfg
index fa5abd6bba..fa5abd6bba 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/qemuprep.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/gwlcfm-testsuite.tcfg
index f8e516bb8e..f8e516bb8e 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/gwlcfm-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm.cfg b/bsps/powerpc/mpc55xxevb/config/gwlcfm.cfg
index f9a40532cb..f9a40532cb 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/gwlcfm.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5566evb-testsuite.tcfg
index cba4641dc3..cba4641dc3 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5566evb-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb.cfg b/bsps/powerpc/mpc55xxevb/config/mpc5566evb.cfg
index 0e19d66284..0e19d66284 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5566evb.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb_spe-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5566evb_spe-testsuite.tcfg
index 826a183b8e..826a183b8e 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb_spe-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5566evb_spe-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb_spe.cfg b/bsps/powerpc/mpc55xxevb/config/mpc5566evb_spe.cfg
index b0feb2e1ba..b0feb2e1ba 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb_spe.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5566evb_spe.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc55xx.inc b/bsps/powerpc/mpc55xxevb/config/mpc55xx.inc
index 5b0b843ac4..5b0b843ac4 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc55xx.inc
+++ b/bsps/powerpc/mpc55xxevb/config/mpc55xx.inc
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc55xx_spe.inc b/bsps/powerpc/mpc55xxevb/config/mpc55xx_spe.inc
index fa69d09a3e..fa69d09a3e 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc55xx_spe.inc
+++ b/bsps/powerpc/mpc55xxevb/config/mpc55xx_spe.inc
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_dpu-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5643l_dpu-testsuite.tcfg
index 84d7efad7b..84d7efad7b 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_dpu-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5643l_dpu-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_dpu.cfg b/bsps/powerpc/mpc55xxevb/config/mpc5643l_dpu.cfg
index 67fe396486..67fe396486 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_dpu.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5643l_dpu.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_evb-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5643l_evb-testsuite.tcfg
index 373d10b544..373d10b544 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_evb-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5643l_evb-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_evb.cfg b/bsps/powerpc/mpc55xxevb/config/mpc5643l_evb.cfg
index eb9c0db185..eb9c0db185 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_evb.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5643l_evb.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5668g-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5668g-testsuite.tcfg
index 6c79cceeac..6c79cceeac 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5668g-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5668g-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5668g.cfg b/bsps/powerpc/mpc55xxevb/config/mpc5668g.cfg
index b0cb600143..b0cb600143 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5668g.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5668g.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_app-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_app-testsuite.tcfg
index aa6f47e038..aa6f47e038 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_app-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_app-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_app.cfg b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_app.cfg
index b0feb2e1ba..b0feb2e1ba 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_app.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_app.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_boot-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_boot-testsuite.tcfg
index f359262339..f359262339 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_boot-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_boot-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_boot.cfg b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_boot.cfg
index b0feb2e1ba..b0feb2e1ba 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_boot.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_boot.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_rsm6-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5674f_rsm6-testsuite.tcfg
index c417b93df1..c417b93df1 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_rsm6-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674f_rsm6-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_rsm6.cfg b/bsps/powerpc/mpc55xxevb/config/mpc5674f_rsm6.cfg
index b0feb2e1ba..b0feb2e1ba 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_rsm6.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674f_rsm6.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb-testsuite.tcfg
index 6c79cceeac..6c79cceeac 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb.cfg b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb.cfg
index eb1a3f5c3d..eb1a3f5c3d 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb_spe-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb_spe-testsuite.tcfg
index 6c79cceeac..6c79cceeac 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb_spe-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb_spe-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb_spe.cfg b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb_spe.cfg
index b0feb2e1ba..b0feb2e1ba 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb_spe.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb_spe.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/phycore_mpc5554-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/phycore_mpc5554-testsuite.tcfg
index 3ca7f48c46..3ca7f48c46 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/phycore_mpc5554-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/phycore_mpc5554-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/phycore_mpc5554.cfg b/bsps/powerpc/mpc55xxevb/config/phycore_mpc5554.cfg
index b0feb2e1ba..b0feb2e1ba 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/phycore_mpc5554.cfg
+++ b/bsps/powerpc/mpc55xxevb/config/phycore_mpc5554.cfg
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/make/custom/mpc8260ads.cfg b/bsps/powerpc/mpc8260ads/config/mpc8260ads.cfg
index 4869e726d6..4869e726d6 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/make/custom/mpc8260ads.cfg
+++ b/bsps/powerpc/mpc8260ads/config/mpc8260ads.cfg
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/make/custom/mvme3100.cfg b/bsps/powerpc/mvme3100/config/mvme3100.cfg
index 6e7c6950f5..6e7c6950f5 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/make/custom/mvme3100.cfg
+++ b/bsps/powerpc/mvme3100/config/mvme3100.cfg
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/make/custom/mvme5500.cfg b/bsps/powerpc/mvme5500/config/mvme5500.cfg
index 6a0fceabe7..6a0fceabe7 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/make/custom/mvme5500.cfg
+++ b/bsps/powerpc/mvme5500/config/mvme5500.cfg
diff --git a/c/src/lib/libbsp/powerpc/psim/make/custom/psim.cfg b/bsps/powerpc/psim/config/psim.cfg
index cb399493d2..cb399493d2 100644
--- a/c/src/lib/libbsp/powerpc/psim/make/custom/psim.cfg
+++ b/bsps/powerpc/psim/config/psim.cfg
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg b/bsps/powerpc/qemuppc/config/qemuppc.cfg
index f424ec22ee..f424ec22ee 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg
+++ b/bsps/powerpc/qemuppc/config/qemuppc.cfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq.inc b/bsps/powerpc/qoriq/config/qoriq.inc
index ff9586eec4..ff9586eec4 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq.inc
+++ b/bsps/powerpc/qoriq/config/qoriq.inc
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_0-testsuite.tcfg b/bsps/powerpc/qoriq/config/qoriq_core_0-testsuite.tcfg
index fb84b55762..fb84b55762 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_0-testsuite.tcfg
+++ b/bsps/powerpc/qoriq/config/qoriq_core_0-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_0.cfg b/bsps/powerpc/qoriq/config/qoriq_core_0.cfg
index 8ce12d84a3..8ce12d84a3 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_0.cfg
+++ b/bsps/powerpc/qoriq/config/qoriq_core_0.cfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_1-testsuite.tcfg b/bsps/powerpc/qoriq/config/qoriq_core_1-testsuite.tcfg
index fb84b55762..fb84b55762 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_1-testsuite.tcfg
+++ b/bsps/powerpc/qoriq/config/qoriq_core_1-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_1.cfg b/bsps/powerpc/qoriq/config/qoriq_core_1.cfg
index ee7eadd947..ee7eadd947 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_1.cfg
+++ b/bsps/powerpc/qoriq/config/qoriq_core_1.cfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500-testsuite.tcfg b/bsps/powerpc/qoriq/config/qoriq_e500-testsuite.tcfg
index fb84b55762..fb84b55762 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500-testsuite.tcfg
+++ b/bsps/powerpc/qoriq/config/qoriq_e500-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500.cfg b/bsps/powerpc/qoriq/config/qoriq_e500.cfg
index 91e957d967..91e957d967 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500.cfg
+++ b/bsps/powerpc/qoriq/config/qoriq_e500.cfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_32-testsuite.tcfg b/bsps/powerpc/qoriq/config/qoriq_e6500_32-testsuite.tcfg
index fb84b55762..fb84b55762 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_32-testsuite.tcfg
+++ b/bsps/powerpc/qoriq/config/qoriq_e6500_32-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_32.cfg b/bsps/powerpc/qoriq/config/qoriq_e6500_32.cfg
index d0f0391384..d0f0391384 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_32.cfg
+++ b/bsps/powerpc/qoriq/config/qoriq_e6500_32.cfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_64-testsuite.tcfg b/bsps/powerpc/qoriq/config/qoriq_e6500_64-testsuite.tcfg
index fb84b55762..fb84b55762 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_64-testsuite.tcfg
+++ b/bsps/powerpc/qoriq/config/qoriq_e6500_64-testsuite.tcfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_64.cfg b/bsps/powerpc/qoriq/config/qoriq_e6500_64.cfg
index b766fec8c9..b766fec8c9 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_64.cfg
+++ b/bsps/powerpc/qoriq/config/qoriq_e6500_64.cfg
diff --git a/c/src/lib/libbsp/powerpc/ss555/make/custom/ss555.cfg b/bsps/powerpc/ss555/config/ss555.cfg
index 1745bb5cad..1745bb5cad 100644
--- a/c/src/lib/libbsp/powerpc/ss555/make/custom/ss555.cfg
+++ b/bsps/powerpc/ss555/config/ss555.cfg
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/make/custom/t32mppc.cfg b/bsps/powerpc/t32mppc/config/t32mppc.cfg
index 1bbfe76a09..1bbfe76a09 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/make/custom/t32mppc.cfg
+++ b/bsps/powerpc/t32mppc/config/t32mppc.cfg
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/pghplus.cfg b/bsps/powerpc/tqm8xx/config/pghplus.cfg
index 75eb65fe90..75eb65fe90 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/pghplus.cfg
+++ b/bsps/powerpc/tqm8xx/config/pghplus.cfg
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc b/bsps/powerpc/tqm8xx/config/tqm8xx.inc
index f9a31d0835..f9a31d0835 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc
+++ b/bsps/powerpc/tqm8xx/config/tqm8xx.inc
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx_stk8xx.cfg b/bsps/powerpc/tqm8xx/config/tqm8xx_stk8xx.cfg
index 7b5ab01b8a..7b5ab01b8a 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx_stk8xx.cfg
+++ b/bsps/powerpc/tqm8xx/config/tqm8xx_stk8xx.cfg
diff --git a/c/src/lib/libbsp/powerpc/virtex/make/custom/virtex.cfg b/bsps/powerpc/virtex/config/virtex.cfg
index 412b0da7b9..412b0da7b9 100644
--- a/c/src/lib/libbsp/powerpc/virtex/make/custom/virtex.cfg
+++ b/bsps/powerpc/virtex/config/virtex.cfg
diff --git a/c/src/lib/libbsp/powerpc/virtex4/make/custom/virtex4.cfg b/bsps/powerpc/virtex4/config/virtex4.cfg
index a893abe9b5..a893abe9b5 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/make/custom/virtex4.cfg
+++ b/bsps/powerpc/virtex4/config/virtex4.cfg
diff --git a/c/src/lib/libbsp/powerpc/virtex5/make/custom/virtex5.cfg b/bsps/powerpc/virtex5/config/virtex5.cfg
index 6f039da854..6f039da854 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/make/custom/virtex5.cfg
+++ b/bsps/powerpc/virtex5/config/virtex5.cfg
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/make/custom/riscv64_generic.cfg b/bsps/riscv/riscv_generic/config/riscv64_generic.cfg
index 04897e5bba..04897e5bba 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/make/custom/riscv64_generic.cfg
+++ b/bsps/riscv/riscv_generic/config/riscv64_generic.cfg
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/make/custom/riscv_generic.cfg b/bsps/riscv/riscv_generic/config/riscv_generic.cfg
index 785ac42c67..785ac42c67 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/make/custom/riscv_generic.cfg
+++ b/bsps/riscv/riscv_generic/config/riscv_generic.cfg
diff --git a/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1-testsuite.tcfg b/bsps/sh/gensh1/config/gensh1-testsuite.tcfg
index c133712fd0..c133712fd0 100644
--- a/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1-testsuite.tcfg
+++ b/bsps/sh/gensh1/config/gensh1-testsuite.tcfg
diff --git a/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1.cfg b/bsps/sh/gensh1/config/gensh1.cfg
index 16b61d222b..16b61d222b 100644
--- a/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1.cfg
+++ b/bsps/sh/gensh1/config/gensh1.cfg
diff --git a/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2-testsuite.tcfg b/bsps/sh/gensh2/config/gensh2-testsuite.tcfg
index c5b0c88fae..c5b0c88fae 100644
--- a/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2-testsuite.tcfg
+++ b/bsps/sh/gensh2/config/gensh2-testsuite.tcfg
diff --git a/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2.cfg b/bsps/sh/gensh2/config/gensh2.cfg
index 49cf0850d2..49cf0850d2 100644
--- a/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2.cfg
+++ b/bsps/sh/gensh2/config/gensh2.cfg
diff --git a/c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg b/bsps/sh/gensh4/config/gensh4.cfg
index 016262f11e..016262f11e 100644
--- a/c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg
+++ b/bsps/sh/gensh4/config/gensh4.cfg
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh1-testsuite.tcfg b/bsps/sh/shsim/config/simsh1-testsuite.tcfg
index d567a8d697..d567a8d697 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh1-testsuite.tcfg
+++ b/bsps/sh/shsim/config/simsh1-testsuite.tcfg
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh1.cfg b/bsps/sh/shsim/config/simsh1.cfg
index 0f1da687a8..0f1da687a8 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh1.cfg
+++ b/bsps/sh/shsim/config/simsh1.cfg
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2-testsuite.tcfg b/bsps/sh/shsim/config/simsh2-testsuite.tcfg
index 8d4f381dfd..8d4f381dfd 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2-testsuite.tcfg
+++ b/bsps/sh/shsim/config/simsh2-testsuite.tcfg
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2.cfg b/bsps/sh/shsim/config/simsh2.cfg
index cde1fb2fbf..cde1fb2fbf 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2.cfg
+++ b/bsps/sh/shsim/config/simsh2.cfg
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e-testsuite.tcfg b/bsps/sh/shsim/config/simsh2e-testsuite.tcfg
index 100b61cc9d..100b61cc9d 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e-testsuite.tcfg
+++ b/bsps/sh/shsim/config/simsh2e-testsuite.tcfg
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e.cfg b/bsps/sh/shsim/config/simsh2e.cfg
index ce34d26d78..ce34d26d78 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e.cfg
+++ b/bsps/sh/shsim/config/simsh2e.cfg
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh4-testsuite.tcfg b/bsps/sh/shsim/config/simsh4-testsuite.tcfg
index 0fa2e7744e..0fa2e7744e 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh4-testsuite.tcfg
+++ b/bsps/sh/shsim/config/simsh4-testsuite.tcfg
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh4.cfg b/bsps/sh/shsim/config/simsh4.cfg
index c23a8b93b5..c23a8b93b5 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh4.cfg
+++ b/bsps/sh/shsim/config/simsh4.cfg
diff --git a/c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg b/bsps/sparc/erc32/config/erc32.cfg
index 84cc752daf..84cc752daf 100644
--- a/c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg
+++ b/bsps/sparc/erc32/config/erc32.cfg
diff --git a/c/src/lib/libbsp/sparc/leon2/make/custom/at697f.cfg b/bsps/sparc/leon2/config/at697f.cfg
index 94ab6efbe9..94ab6efbe9 100644
--- a/c/src/lib/libbsp/sparc/leon2/make/custom/at697f.cfg
+++ b/bsps/sparc/leon2/config/at697f.cfg
diff --git a/c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg b/bsps/sparc/leon2/config/leon2.cfg
index a5e76e7aa9..a5e76e7aa9 100644
--- a/c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg
+++ b/bsps/sparc/leon2/config/leon2.cfg
diff --git a/c/src/lib/libbsp/sparc/leon3/make/custom/gr712rc.cfg b/bsps/sparc/leon3/config/gr712rc.cfg
index 897dd0142f..897dd0142f 100644
--- a/c/src/lib/libbsp/sparc/leon3/make/custom/gr712rc.cfg
+++ b/bsps/sparc/leon3/config/gr712rc.cfg
diff --git a/c/src/lib/libbsp/sparc/leon3/make/custom/gr740.cfg b/bsps/sparc/leon3/config/gr740.cfg
index 86da029c42..86da029c42 100644
--- a/c/src/lib/libbsp/sparc/leon3/make/custom/gr740.cfg
+++ b/bsps/sparc/leon3/config/gr740.cfg
diff --git a/c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg b/bsps/sparc/leon3/config/leon3.cfg
index d931d6c5f1..d931d6c5f1 100644
--- a/c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg
+++ b/bsps/sparc/leon3/config/leon3.cfg
diff --git a/c/src/lib/libbsp/sparc/leon3/make/custom/ut699.cfg b/bsps/sparc/leon3/config/ut699.cfg
index a8fff49b3a..a8fff49b3a 100644
--- a/c/src/lib/libbsp/sparc/leon3/make/custom/ut699.cfg
+++ b/bsps/sparc/leon3/config/ut699.cfg
diff --git a/c/src/lib/libbsp/sparc/leon3/make/custom/ut700.cfg b/bsps/sparc/leon3/config/ut700.cfg
index bcca9010ed..bcca9010ed 100644
--- a/c/src/lib/libbsp/sparc/leon3/make/custom/ut700.cfg
+++ b/bsps/sparc/leon3/config/ut700.cfg
diff --git a/c/src/lib/libbsp/sparc64/niagara/make/custom/niagara.cfg b/bsps/sparc64/niagara/config/niagara.cfg
index 2fd8973bd6..2fd8973bd6 100644
--- a/c/src/lib/libbsp/sparc64/niagara/make/custom/niagara.cfg
+++ b/bsps/sparc64/niagara/config/niagara.cfg
diff --git a/c/src/lib/libbsp/sparc64/usiii/make/custom/usiii.cfg b/bsps/sparc64/usiii/config/usiii.cfg
index b9fad21839..b9fad21839 100644
--- a/c/src/lib/libbsp/sparc64/usiii/make/custom/usiii.cfg
+++ b/bsps/sparc64/usiii/config/usiii.cfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e1sim-testsuite.tcfg b/bsps/v850/gdbv850sim/config/v850e1sim-testsuite.tcfg
index 4bec8f5bbc..4bec8f5bbc 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e1sim-testsuite.tcfg
+++ b/bsps/v850/gdbv850sim/config/v850e1sim-testsuite.tcfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e1sim.cfg b/bsps/v850/gdbv850sim/config/v850e1sim.cfg
index 7aefdcf31c..7aefdcf31c 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e1sim.cfg
+++ b/bsps/v850/gdbv850sim/config/v850e1sim.cfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2sim-testsuite.tcfg b/bsps/v850/gdbv850sim/config/v850e2sim-testsuite.tcfg
index 4bec8f5bbc..4bec8f5bbc 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2sim-testsuite.tcfg
+++ b/bsps/v850/gdbv850sim/config/v850e2sim-testsuite.tcfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2sim.cfg b/bsps/v850/gdbv850sim/config/v850e2sim.cfg
index 0313ab82cd..0313ab82cd 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2sim.cfg
+++ b/bsps/v850/gdbv850sim/config/v850e2sim.cfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2v3sim-testsuite.tcfg b/bsps/v850/gdbv850sim/config/v850e2v3sim-testsuite.tcfg
index 4bec8f5bbc..4bec8f5bbc 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2v3sim-testsuite.tcfg
+++ b/bsps/v850/gdbv850sim/config/v850e2v3sim-testsuite.tcfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2v3sim.cfg b/bsps/v850/gdbv850sim/config/v850e2v3sim.cfg
index ac2740ed52..ac2740ed52 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2v3sim.cfg
+++ b/bsps/v850/gdbv850sim/config/v850e2v3sim.cfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850esim-testsuite.tcfg b/bsps/v850/gdbv850sim/config/v850esim-testsuite.tcfg
index 4bec8f5bbc..4bec8f5bbc 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850esim-testsuite.tcfg
+++ b/bsps/v850/gdbv850sim/config/v850esim-testsuite.tcfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850esim.cfg b/bsps/v850/gdbv850sim/config/v850esim.cfg
index 0c0a4a9bed..0c0a4a9bed 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850esim.cfg
+++ b/bsps/v850/gdbv850sim/config/v850esim.cfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850essim-testsuite.tcfg b/bsps/v850/gdbv850sim/config/v850essim-testsuite.tcfg
index 4bec8f5bbc..4bec8f5bbc 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850essim-testsuite.tcfg
+++ b/bsps/v850/gdbv850sim/config/v850essim-testsuite.tcfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850essim.cfg b/bsps/v850/gdbv850sim/config/v850essim.cfg
index 77594591ec..77594591ec 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850essim.cfg
+++ b/bsps/v850/gdbv850sim/config/v850essim.cfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850sim-testsuite.tcfg b/bsps/v850/gdbv850sim/config/v850sim-testsuite.tcfg
index 4bec8f5bbc..4bec8f5bbc 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850sim-testsuite.tcfg
+++ b/bsps/v850/gdbv850sim/config/v850sim-testsuite.tcfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850sim.cfg b/bsps/v850/gdbv850sim/config/v850sim.cfg
index 9dcc918423..9dcc918423 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850sim.cfg
+++ b/bsps/v850/gdbv850sim/config/v850sim.cfg
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850sim.inc b/bsps/v850/gdbv850sim/config/v850sim.inc
index 8b363ea2ec..8b363ea2ec 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850sim.inc
+++ b/bsps/v850/gdbv850sim/config/v850sim.inc
diff --git a/c/configure.ac b/c/configure.ac
index 92288615ca..f7636239ee 100644
--- a/c/configure.ac
+++ b/c/configure.ac
@@ -5,6 +5,7 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([src])
 RTEMS_TOP(..)
+with_rtems_source_top=$(cd ${srcdir}/.. && pwd)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
 
@@ -30,7 +31,7 @@ AS_IF([test x"$enable_rtemsbsp" = x"no"],[
 
 # Check sanity of BSPs in $rtems_bsp
 for _rtems_bsp in : $rtems_bsp; do test "x$_rtems_bsp" = x: && continue
-  # make sure there is a make/custom file for the bsp
+  # make sure there is a config/*.cfg file for the bsp
   _RTEMS_CHECK_CUSTOM_BSP([$_rtems_bsp.cfg],[bsp_cfg])
 
   AS_IF([test -n "$bsp_cfg"],
diff --git a/c/src/aclocal/bsp-alias.m4 b/c/src/aclocal/bsp-alias.m4
index 9aafbccee0..77d8205aba 100644
--- a/c/src/aclocal/bsp-alias.m4
+++ b/c/src/aclocal/bsp-alias.m4
@@ -1,11 +1,13 @@
 dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl Internal subroutine to RTEMS_BSP_ALIAS
-AC_DEFUN([_RTEMS_BSP_ALIAS],
-[# account for "aliased" bsps which share source code
-      for bsp_cfgs in `ls "$srcdir"/"$RTEMS_TOPdir"/c/src/lib/libbsp/"$RTEMS_CPU"/*/"make/custom/$1.cfg" 2>/dev/null`; do
+AC_DEFUN([_RTEMS_BSP_ALIAS],[
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+# account for "aliased" bsps which share source code
+      for bsp_cfgs in `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/"config/$1.cfg" 2>/dev/null`; do
         $2=`echo "$bsp_cfgs" | sed \
-          -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
-          -e "s,/make/custom/.*\.cfg$,,"`
+          -e "s,^${RTEMS_SOURCE_ROOT}/bsps/$RTEMS_CPU/,," \
+          -e "s,/config/.*\.cfg$,,"`
         break
       done
 ])
diff --git a/c/src/aclocal/check-custom-bsp.m4 b/c/src/aclocal/check-custom-bsp.m4
index 262f48cd60..11c2f1f7d2 100644
--- a/c/src/aclocal/check-custom-bsp.m4
+++ b/c/src/aclocal/check-custom-bsp.m4
@@ -1,13 +1,13 @@
 AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
-AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
+AC_REQUIRE([RTEMS_SOURCE_TOP])dnl sets RTEMS_SOURCE_ROOT
   $2=
   for i in \
-    `ls "${srcdir}/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}"/*/make/custom/$1 2>/dev/null`;
+    `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/config/$1 2>/dev/null`;
   do
     AS_IF([test -r $i],[
       $2="$i"
-      break
+      break;
     ])
   done
 ])
diff --git a/rtems-bsps b/rtems-bsps
index 6bee5fa7e0..8c85fc10d4 100755
--- a/rtems-bsps
+++ b/rtems-bsps
@@ -1,12 +1,12 @@
 #! /bin/sh
 
 top=$(dirname $0)
-base="${top}/c/src/lib/libbsp"
+base="${top}/bsps"
 base_e=$(echo ${base} | sed -e 's/\//\\\//g')
 
 last_arch=""
 
-cfg_list=$(LANG=C LC_COLLATE=C find ${base} -mindepth 5 -name \*.cfg | sort)
+cfg_list=$(LANG=C LC_COLLATE=C find ${base} -mindepth 3 -name \*.cfg | sort)
 
 max_bsp_len=0
 arch_count=0
@@ -37,7 +37,7 @@ for bsp_path in ${cfg_list};
 do
  arch=$(echo ${bsp_path} | sed -e "s/${base_e}*\///" -e 's/\/.*//')
  bsp=$(echo ${bsp_path} | sed -e "s/.*\///" -e 's/\.cfg//')
- path=$(echo ${bsp_path} | sed -e "s/\/make.*//")
+ path=$(echo ${bsp_path} | sed -e "s/\/config.*//")
  if test "${last_arch}" != "${arch}"; then
    echo "${arch}:"
    last_arch=${arch}
diff --git a/testsuites/aclocal/rtems-test-check.m4 b/testsuites/aclocal/rtems-test-check.m4
index 7c7192573b..ca71795cc7 100644
--- a/testsuites/aclocal/rtems-test-check.m4
+++ b/testsuites/aclocal/rtems-test-check.m4
@@ -7,7 +7,7 @@ AC_DEFUN([RTEMS_TEST_CHECK],
  AC_MSG_CHECKING([${RTEMS_CPU}/${RTEMS_BSP} $1 test])
  tcheck="${RTEMS_SOURCE_ROOT}/tools/build/rtems-test-check-py"
  tdata="${RTEMS_BSP}-testsuite.tcfg"
- tincludes="${RTEMS_SOURCE_ROOT}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/make/custom:${RTEMS_SOURCE_ROOT}/testsuites"
+ tincludes="${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/config:${RTEMS_SOURCE_ROOT}/testsuites"
  if test -f $tcheck; then
   check_result=`$tcheck exclude ${RTEMS_BSP} $tdata $tincludes $1`
  else