Changeset adb85dd in rtems for aclocal


Ignore:
Timestamp:
Apr 21, 2018, 8:22:08 AM (15 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
f004ace8
Parents:
37dc047
git-author:
Sebastian Huber <sebastian.huber@…> (04/21/18 08:22:08)
git-committer:
Sebastian Huber <sebastian.huber@…> (04/23/18 13:18:42)
Message:

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.

Location:
aclocal
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • aclocal/bsp-alias.m4

    r37dc047 radb85dd  
    11dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
    22dnl Internal subroutine to RTEMS_BSP_ALIAS
    3 AC_DEFUN([_RTEMS_BSP_ALIAS],
    4 [# account for "aliased" bsps which share source code
    5       for bsp_cfgs in `ls "$srcdir"/"$RTEMS_TOPdir"/c/src/lib/libbsp/"$RTEMS_CPU"/*/"make/custom/$1.cfg" 2>/dev/null`; do
     3AC_DEFUN([_RTEMS_BSP_ALIAS],[
     4AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
     5AC_REQUIRE([RTEMS_SOURCE_TOP])
     6# account for "aliased" bsps which share source code
     7      for bsp_cfgs in `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/"config/$1.cfg" 2>/dev/null`; do
    68        $2=`echo "$bsp_cfgs" | sed \
    7           -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
    8           -e "s,/make/custom/.*\.cfg$,,"`
     9          -e "s,^${RTEMS_SOURCE_ROOT}/bsps/$RTEMS_CPU/,," \
     10          -e "s,/config/.*\.cfg$,,"`
    911        break
    1012      done
  • aclocal/check-bsps.m4

    r37dc047 radb85dd  
    55[
    66AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
    7 AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
     7AC_REQUIRE([RTEMS_SOURCE_TOP])dnl sets RTEMS_SOURCE_ROOT
    88
    99AC_MSG_CHECKING([for available BSPs])
    1010  $1=
    11   for bsp_make in `echo "$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU"/*/make 2>/dev/null`; do
     11  for bsp_make in `echo "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/config 2>/dev/null`; do
    1212    bsp_family=`echo "$bsp_make" | sed \
    13       -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
    14       -e "s,/make$,,"`
    15     for bsp_cfgs in `ls "$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$bsp_family/make/custom/"*.cfg 2>/dev/null`; do
     13      -e "s,^${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/,," \
     14      -e "s,/config$,,"`
     15    for bsp_cfgs in `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/$bsp_family/config/"*.cfg 2>/dev/null`; do
    1616      bsp_cfg=`echo "$bsp_cfgs" | sed \
    17         -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$bsp_family/make/custom/,," \
     17        -e "s,^${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/$bsp_family/config/,," \
    1818        -e "s,\.cfg$,,"`
    1919      $1="[$]$1 $bsp_cfg"
  • aclocal/check-custom-bsp.m4

    r37dc047 radb85dd  
    11AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
    22AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
    3 AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
     3AC_REQUIRE([RTEMS_SOURCE_TOP])dnl sets RTEMS_SOURCE_ROOT
    44  $2=
    55  for i in \
    6     `ls "${srcdir}/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}"/*/make/custom/$1 2>/dev/null`;
     6    `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/config/$1 2>/dev/null`;
    77  do
    88    AS_IF([test -r $i],[
     
    1414
    1515AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[
    16   _RTEMS_CHECK_CUSTOM_BSP([[$]$1],[BSP_FOUND])
     16  _RTEMS_CHECK_CUSTOM_BSP([[$]$1.cfg],[BSP_FOUND])
     17  AS_IF([test -z "$BSP_FOUND"],[
     18    AC_MSG_ERROR([missing [$]$1.cfg])
     19  ])
    1720])
  • aclocal/enable-rtemsbsp.m4

    r37dc047 radb85dd  
    2424     fi
    2525     target_arch=$(echo ${target_alias} | sed -e "s/\-.*//g")
    26      libbsp=${srctop}/c/src/lib/libbsp
     26     libbsp=${srctop}/bsps
    2727     libbsp_e=$(echo ${libbsp} | sed -e 's/\//\\\//g')
    28      cfg_list=$(LANG=C LC_COLLATE=C find ${libbsp} -mindepth 5 -name \*.cfg)
     28     cfg_list=$(LANG=C LC_COLLATE=C find ${libbsp} -mindepth 1 -name \*.cfg)
    2929     for bsp in ${enable_rtemsbsp};
    3030     do
Note: See TracChangeset for help on using the changeset viewer.