Added bare bsp from Chris Johns <cjohns@plessey.com.au>.

1 files changed, 57 insertions, 11 deletions

diff --git a/configure.in b/configure.in
index f8674f6e3f..4f520709ff 100644
--- a/configure.in
+++ b/configure.in
@@ -64,6 +64,22 @@ AC_ARG_ENABLE(libcdir, \
 [ RTEMS_LIBC_DIR="${enableval}" ; \
 test -d ${enableval} || AC_MSG_ERROR("$enableval is not a directory" ) ] )
 
+AC_ARG_ENABLE(cpu-cflags,
+[  --enable-cpu-cflags                  specify a particular cpu cflag],
+[case "${enableval}" in
+  no) CPU_CFLAGS="" ;;
+  *)    CPU_CFLAGS="${enableval}" ;;
+esac],
+[CPU_CFLAGS=""])
+
+AC_ARG_ENABLE(cpu-model,
+[  --enable-cpu-model                   specify a particular cpu model],
+[case "${enableval}" in
+  no) RTEMS_CPU_MODEL="" ;;
+  *)    RTEMS_CPU_MODEL="${enableval}" ;;
+esac],
+[CPU_CFLAGS=""])
+
 RTEMS_PREFIX=${target_cpu}-${target_vendor}
 
 dnl BEGIN configure.host.in
@@ -123,6 +139,9 @@ RTEMS_HOST=$host_os
 
 case "${target}" in
   # hpux unix port should go here
+  hppa1.1-*-rtems*)
+	target_cpu=hppa1_1
+	;;
   i[[3456]]86-go32-rtems*)
 	target_cpu=i386
 	rtems_bsp="go32 go32_p5"
@@ -139,6 +158,9 @@ case "${target}" in
         target_cpu=no_cpu
 	RTEMS_HAS_POSIX_API=no
 	;;
+  powerpc-*rtems*)
+	target_cpu=ppc
+	;;
   sparc-sun-solaris*)             # unix "simulator" port
 	target_cpu=unix
         RTEMS_HOST=Solaris
@@ -239,6 +261,9 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then
       esac;
     done
 
+    rtems_bsp="$rtems_bsp bare"
+    makefiles="$makefiles c/src/lib/libbsp/bare/Makefile"
+
     AC_MSG_RESULT([$rtems_bsp done])
   fi
 
@@ -260,17 +285,36 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then
     esac
 
     # Is there code where there should be for this BSP?
-    if test -d "$srcdir/c/src/lib/libbsp/$target_cpu/$bspdir"; then
-      RTEMS_BSP_LIST="$RTEMS_BSP_LIST $i"
-      # make sure the Makefiles in a bsp directory are only done once
-      echo $bspdirs | grep $bspdir >/dev/null 2>&1
-      if test $? -ne 0 ; then
-        bspdirs="$bspdirs $bspdir"
-        RTEMS_CHECK_MAKEFILE(c/src/lib/libbsp/$target_cpu/$bspdir)
-      fi
-    else
-      AC_MSG_ERROR([unable to find libbsp directory ($bspdir) for  $i])
-    fi
+    # The bare bsp is a special case as it is not under the target_cpu path
+    case $i in
+      bare) 
+        if test -d "$srcdir/c/src/lib/libbsp/$bspdir"; then
+          RTEMS_BSP_LIST="$RTEMS_BSP_LIST $i"
+          # make sure the Makefiles in a bsp directory are only done once
+          echo $bspdirs | grep $bspdir >/dev/null 2>&1
+          if test $? -ne 0 ; then
+            bspdirs="$bspdirs $bspdir"
+            RTEMS_CHECK_MAKEFILE(c/src/lib/libbsp/$bspdir)
+          fi
+        else
+          AC_MSG_ERROR([unable to find libbsp directory ($bspdir) for  $i])
+        fi
+      ;;
+      *) 
+        if test -d "$srcdir/c/src/lib/libbsp/$target_cpu/$bspdir"; then
+          RTEMS_BSP_LIST="$RTEMS_BSP_LIST $i"
+          # make sure the Makefiles in a bsp directory are only done once
+          echo $bspdirs | grep $bspdir >/dev/null 2>&1
+          if test $? -ne 0 ; then
+            bspdirs="$bspdirs $bspdir"
+            RTEMS_CHECK_MAKEFILE(c/src/lib/libbsp/$target_cpu/$bspdir)
+          fi
+        else
+          AC_MSG_ERROR([unable to find libbsp directory ($bspdir) for  $i])
+        fi
+      ;;
+    esac
+    
   done
 fi
 
@@ -369,6 +413,8 @@ AC_SUBST(RTEMS_USE_MACROS)
 AC_SUBST(RTEMS_HAS_CPLUSPLUS)
 AC_SUBST(RTEMS_USE_GCC272)
 AC_SUBST(RTEMS_LIBC_DIR)
+AC_SUBST(CPU_CFLAGS)
+AC_SUBST(RTEMS_CPU_MODEL)
 AC_SUBST(PROJECT_ROOT)
 AC_SUBST(program_prefix)