diff --git a/aclocal/bsp-alias.m4 b/aclocal/bsp-alias.m4 index 9aafbccee05..77d8205abae 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 381b2e31979..610ae40f16c 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 43b379c0950..11c2f1f7d24 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 a6406c315b0..fcec39825d3 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 a0c6eda1f2a..3115ee06782 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 similarity index 100% rename from c/src/lib/libbsp/arm/altera-cyclone-v/make/custom/altcycv.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/altera-cyclone-v/make/custom/altcycv_devkit.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/altera-cyclone-v/make/custom/altcycv_devkit_smp.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/atsam/make/custom/atsamv-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/atsam/make/custom/atsamv.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/beagle/make/custom/beagle.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/beagle/make/custom/beagleboardorig.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/beagle/make/custom/beagleboardxm.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/beagle/make/custom/beagleboneblack.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/beagle/make/custom/beaglebonewhite.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/csb336/make/custom/csb336.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/csb337/make/custom/csb337.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/csb337/make/custom/csb637.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/csb337/make/custom/kit637_v6.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/edb7312/make/custom/edb7312.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136jfs-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136jfs.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136js-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136js.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm7tdmi-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm7tdmi.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm920-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm920.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gdbarmsim/make/custom/armcortexa9-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gdbarmsim/make/custom/armcortexa9.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/imx/make/custom/imx7.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965_qemu.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s69xx.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram_eth-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram_eth.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_ram.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_rom_int-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_rom_int.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_ram.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_rom_int-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_rom_int.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc23xx_tli800-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc23xx_tli800.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ea.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_ram.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_ext.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_ram.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_rom_int-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_rom_int.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_ram.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_rom_int-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_rom_int.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_1-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_1.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_2.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_phycore.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi2.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/realview-pbx-a9/make/custom/realview_pbx_a9_qemu.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/realview-pbx-a9/make/custom/realview_pbx_a9_qemu_smp.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx_t-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx_t.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_intram-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_intram.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_sdram.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_with_loader-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_with_loader.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc702.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc706.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zedboard.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/bfin/TLL6527M/make/custom/TLL6527M.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/bfin/bf537Stamp/make/custom/bf537Stamp.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/bfin/eZKit533/make/custom/eZKit533.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/epiphany/epiphany_sim/make/custom/epiphany_sim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/i386/pc386/make/custom/pc486.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/i386/pc386/make/custom/pc586-sse.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/i386/pc386/make/custom/pc586.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/i386/pc386/make/custom/pc686.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/i386/pc386/make/custom/pcp4.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr_gdbsim-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr_gdbsim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/lm32/milkymist/make/custom/milkymist.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/av5282/make/custom/av5282.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/csb360/make/custom/csb360.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/gen68340/make/custom/gen68340.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360_040.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/gen68360/make/custom/pgh360.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/genmcf548x/make/custom/COBRA5475.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/genmcf548x/make/custom/genmcf548x.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/genmcf548x/make/custom/m5484FireEngine.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mcf5206elite/make/custom/mcf5206elite-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mcf5206elite/make/custom/mcf5206elite.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mcf5235/make/custom/mcf5235.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mcf5329/make/custom/mcf5329.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mvme147/make/custom/mvme147.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mvme147s/make/custom/mvme147s.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/mvme167/make/custom/mvme167.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/mips/csb350/make/custom/csb350.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/mips/hurricane/make/custom/hurricane-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/mips/hurricane/make/custom/hurricane.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/mips/malta/make/custom/malta.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/moxie/moxiesim/make/custom/moxiesim-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/moxie/moxiesim/make/custom/moxiesim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/nios2/nios2_iss/make/custom/nios2_iss.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/no_cpu/no_bsp/make/custom/no_bsp.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/beatnik/make/custom/beatnik.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen5200/make/custom/brs5l.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen5200/make/custom/brs6l.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen5200/make/custom/dp2.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen5200/make/custom/gen5200.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen5200/make/custom/icecube.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_cr825.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_ze30.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen83xx/make/custom/br_uid.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen83xx/make/custom/gen83xx.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen83xx/make/custom/hsc_cm01.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8309som.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8313erdb.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8349eamds.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/haleakala/make/custom/haleakala.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mcp750.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mtx603e.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2100.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2307.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep-altivec.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb_spe-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb_spe.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc55xx.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc55xx_spe.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_dpu-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_dpu.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_evb-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_evb.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5668g-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5668g.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_app-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_app.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_boot-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_boot.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_rsm6-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_rsm6.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb_spe-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb_spe.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/phycore_mpc5554-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/phycore_mpc5554.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mpc8260ads/make/custom/mpc8260ads.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mvme3100/make/custom/mvme3100.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/mvme5500/make/custom/mvme5500.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/psim/make/custom/psim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_0-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_0.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_1-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_1.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_32-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_32.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_64-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_64.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/ss555/make/custom/ss555.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/t32mppc/make/custom/t32mppc.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/tqm8xx/make/custom/pghplus.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx_stk8xx.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/virtex/make/custom/virtex.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/virtex4/make/custom/virtex4.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/powerpc/virtex5/make/custom/virtex5.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/riscv/riscv_generic/make/custom/riscv64_generic.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/riscv/riscv_generic/make/custom/riscv_generic.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/gensh1/make/custom/gensh1-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/gensh1/make/custom/gensh1.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/gensh2/make/custom/gensh2-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/gensh2/make/custom/gensh2.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/shsim/make/custom/simsh1-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/shsim/make/custom/simsh1.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/shsim/make/custom/simsh2-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/shsim/make/custom/simsh2.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/shsim/make/custom/simsh2e-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/shsim/make/custom/simsh2e.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/shsim/make/custom/simsh4-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sh/shsim/make/custom/simsh4.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sparc/leon2/make/custom/at697f.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sparc/leon3/make/custom/gr712rc.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sparc/leon3/make/custom/gr740.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sparc/leon3/make/custom/ut699.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sparc/leon3/make/custom/ut700.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sparc64/niagara/make/custom/niagara.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/sparc64/usiii/make/custom/usiii.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e1sim-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e1sim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2sim-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2sim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2v3sim-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850e2v3sim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850esim-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850esim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850essim-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850essim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850sim-testsuite.tcfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850sim.cfg rename to 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 similarity index 100% rename from c/src/lib/libbsp/v850/gdbv850sim/make/custom/v850sim.inc rename to bsps/v850/gdbv850sim/config/v850sim.inc diff --git a/c/configure.ac b/c/configure.ac index 92288615caf..f7636239eea 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 9aafbccee05..77d8205abae 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 262f48cd606..11c2f1f7d24 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 6bee5fa7e07..8c85fc10d48 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 7c7192573ba..ca71795cc75 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