diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-21 10:22:08 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-23 15:18:42 +0200 |
commit | adb85dd473af5c9a72e9da9b7fe013d1b216abc3 (patch) | |
tree | ed54d2ce2354cf2b75995d1e1f2bc685436bc4ca /aclocal | |
parent | bsps: Remove AC_CONFIG_SRCDIR() (diff) | |
download | rtems-adb85dd473af5c9a72e9da9b7fe013d1b216abc3.tar.bz2 |
bsps: Move make/custom/* files to bsps
Adjust various build files. Remove automatic generation of the
c/src/lib/libbsp/*/acinclude.m4 files from bootstrap script.
This patch is a part of the BSP source reorganization.
Update #3285.
Diffstat (limited to '')
-rw-r--r-- | aclocal/bsp-alias.m4 | 12 | ||||
-rw-r--r-- | aclocal/check-bsps.m4 | 12 | ||||
-rw-r--r-- | aclocal/check-custom-bsp.m4 | 9 | ||||
-rw-r--r-- | aclocal/enable-rtemsbsp.m4 | 4 |
4 files changed, 21 insertions, 16 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 |