diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | aclocal/bsp-alias.m4 | 5 | ||||
| -rw-r--r-- | aclocal/check-bsps.m4 | 41 |
3 files changed, 25 insertions, 26 deletions
@@ -1,5 +1,10 @@ 2001-11-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/check-bsps.m4: Reworked. + * aclocal/bsp-alias.m4: Add score603e_g1, apply m4sugar. + +2001-11-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/bspopts.m4: New file. 2001-11-13 Joel Sherrill <joel@OARcorp.com> diff --git a/aclocal/bsp-alias.m4 b/aclocal/bsp-alias.m4 index e9586516df..45aa4d54a8 100644 --- a/aclocal/bsp-alias.m4 +++ b/aclocal/bsp-alias.m4 @@ -25,6 +25,7 @@ AC_DEFUN(_RTEMS_BSP_ALIAS, erc32nfp) $2=erc32 ;; # erc32 without fpu leon1) $2=leon ;; # leon without fpu leon2) $2=leon ;; # leon with fpu + score603e_g1) $2=score603e ;; # score603e generation 1 simsh7032) $2=shsim ;; # SH7032 simulator simsh7045) $2=shsim ;; # SH7045 simulator *) $2=$1;; @@ -34,6 +35,6 @@ AC_DEFUN(_RTEMS_BSP_ALIAS, dnl RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY) dnl convert a bsp alias $1 into its bsp directory RTEMS_BSP_FAMILY AC_DEFUN(RTEMS_BSP_ALIAS, -[_RTEMS_BSP_ALIAS(ifelse([$1],,[$RTEMS_BSP],[$1]), - ifelse([$2],,[RTEMS_BSP_FAMILY],[$2]))] +[_RTEMS_BSP_ALIAS(m4_if([$1],,[$RTEMS_BSP],[$1]), + m4_if([$2],,[RTEMS_BSP_FAMILY],[$2]))] ) diff --git a/aclocal/check-bsps.m4 b/aclocal/check-bsps.m4 index 25963d1b80..0f41e0a407 100644 --- a/aclocal/check-bsps.m4 +++ b/aclocal/check-bsps.m4 @@ -11,31 +11,24 @@ AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir AC_MSG_CHECKING([for bsps]) files=`ls $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU` for file in $files; do - case $file in - ChangeLog*);; - shared*);; - Makefile*);; - READ*);; - CVS*);; - pxfl*);; - ac*);; - config*);; + if test -r $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$file/bsp_specs; then + case $file in # Now account for BSPs with build variants - c4xsim) rtems_bsp="$rtems_bsp c4xsim c3xsim";; - gen68360) rtems_bsp="$rtems_bsp gen68360 gen68360_040";; - p4000) rtems_bsp="$rtems_bsp p4600 p4650";; - mvme162) rtems_bsp="$rtems_bsp mvme162 mvme162lx";; - mbx8xx) rtems_bsp="$rtems_bsp mbx821_001 mbx860_002";; - motorola_powerpc) rtems_bsp="$rtems_bsp mvme2307 mcp750";; - pc386) rtems_bsp="$rtems_bsp pc386 pc386dx pc486 pc586 pc686 pck6";; - erc32) rtems_bsp="$rtems_bsp erc32 erc32nfp";; - leon) rtems_bsp="$rtems_bsp leon1 leon2";; - sim68000) rtems_bsp="$rtems_bsp sim68000 simcpu32";; - shsim) rtems_bsp="$rtems_bsp simsh7032 simsh7045";; - *) if test -d $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$file; then - $1="[$]$1 $file" - fi;; - esac; + c4xsim) $1="[$]$1 c4xsim c3xsim";; + gen68360) $1="[$]$1 gen68360 gen68360_040";; + p4000) $1="[$]$1 p4600 p4650";; + mvme162) $1="[$]$1 mvme162 mvme162lx";; + mbx8xx) $1="[$]$1 mbx821_001 mbx860_002 mbx860_005b";; + motorola_powerpc) $1="[$]$1 mvme2307 mcp750";; + pc386) $1="[$]$1 pc386 pc386dx pc486 pc586 pc686 pck6";; + erc32) $1="[$]$1 erc32 erc32nfp";; + leon) $1="[$]$1 leon1 leon2";; + score603e) $1="[$]$1 score603e score603e_g1";; + sim68000) $1="[$]$1 sim68000 simcpu32";; + shsim) $1="[$]$1 simsh7032 simsh7045";; + *) $1="[$]$1 $file";; + esac; + fi done AC_MSG_RESULT([[$]$1 .. done]) ])dnl |