[rtems-testing commit] rtems/common.sh rtems/user.cfg: Update for RTEMS 5

[Joel Sherrill]

Module:    rtems-testing
Branch:    master
Commit:    7c6e19d1571939f2df588d8fbd60d9e7b6d35cca
Changeset: http://git.rtems.org/rtems-testing/commit/?id=7c6e19d1571939f2df588d8fbd60d9e7b6d35cca

Author:    Joel Sherrill <joel at rtems.org>
Date:      Thu Nov  9 15:10:53 2017 -0600

rtems/common.sh rtems/user.cfg: Update for RTEMS 5

---

 rtems/common.sh | 12 +++++++-----
 rtems/user.cfg  |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/rtems/common.sh b/rtems/common.sh
index 5485b9e..a7d0711 100644
--- a/rtems/common.sh
+++ b/rtems/common.sh
@@ -34,13 +34,13 @@ print_rtems_cpus()
 {
   echo
   echo "CPU is one of the following: "
-  echo "  arm   avr	bfin	h8300	i386	lm32	m32c"
-  echo "  m32r 	m68k	mips	moxie	nios2	or1k	powerpc"
+  echo "  arm   avr	bfin	epiphany h8300	i386	lm32	m32c"
+  echo "  m32r 	m68k	mips	moxie	 nios2	or1k	powerpc"
   echo "  sh	sparc	sparc64	v850"
   echo 
   echo "Formats without a -XXX suffix are the preferred target."
   echo 
-  echo "CPU-rtems4.11 is used as the GNU target."
+  echo "CPU-rtems5 is used as the GNU target."
 }
 
 # CPU must be set before we run any of this stuff
@@ -56,6 +56,7 @@ case ${CPU} in
   bfin)         ;;
   c3x)         CPU=c4x ; target=c4x-rtems ;;
   c4x)         ;;
+  epiphany)    ;;
   h8300)       ;;
   hppa1.1)     ;;
   i386)        ;;
@@ -70,9 +71,10 @@ case ${CPU} in
   or32)        ;;
   powerpc)     ;;
   sh)          ;;
-  tic4x)       ;;
+  riscv*)      ;;
   sparc)       ;;
   sparc64)     ;;
+  tic4x)       ;;
   v850)        ;;
   native)      CPU=unix;;
   unix)        ;;
@@ -85,7 +87,7 @@ case ${CPU} in
 esac
  
 # insert the os version
-target=`echo $target | sed -e 's/-rtems$/-rtems4.11/' -e 's/-rtemself$/-rtemself4.11/'`
+target=`echo $target | sed -e 's/-rtems$/-rtems5/' -e 's/-rtemself$/-rtemself5/'`
 
 #
 #  Figure out if GNU make is available
diff --git a/rtems/user.cfg b/rtems/user.cfg
index 2db9809..6055172 100644
--- a/rtems/user.cfg
+++ b/rtems/user.cfg
@@ -15,7 +15,7 @@
 #      Recommended installation point for various OS's:
 #         Linux:    /usr/local/rtems
 #         Solaris:  /opt/gnu/rtems
-INSTALL_POINT=/home/joel/rtems-4.11-work/bsp-install/
+INSTALL_POINT=/home/joel/rtems-work/bsp-install/
 
 #
 # RTEMS Configuration Information