From 7d83c6c7830b9f1823486d8e6f87dc4f106364a8 Mon Sep 17 00:00:00 2001 From: Thanassis Tsiodras Date: Wed, 15 Jun 2016 16:00:52 +0200 Subject: [PATCH] RTEMS is at 4.12 now --- OAR/README.md | 14 +++++++------- .../{build.rtems.4.11.sh => build.rtems.4.12.sh} | 13 +++++++------ 2 files changed, 14 insertions(+), 13 deletions(-) rename OAR/contrib/{build.rtems.4.11.sh => build.rtems.4.12.sh} (90%) diff --git a/OAR/README.md b/OAR/README.md index 6859ffb..d432105 100644 --- a/OAR/README.md +++ b/OAR/README.md @@ -11,7 +11,7 @@ source code demonstrates how to: Building RTEMS via the RSB -------------------------- -The contrib folder includes a script that you can use to compile RTEMS4.11 +The contrib folder includes a script that you can use to compile RTEMS4.12 with the Leon2 and Leon3 BSPs from the OAR repository. Note that [as discussed in the RTEMS mailing list](https://lists.rtems.org/pipermail/users/2016-February/029782.html), you will need to compile your BSP for native or emulated FPU, based @@ -90,7 +90,7 @@ To use emulation (default, if `FPU` option is not provided), pass `FPU=0`: The `FPU` and `CFG` options are completely independent ; you can e.g. compile a debug version that uses native FPU, and a release one that uses -emulation. Just keep in mind that currently, 4.11 +emulation. Just keep in mind that currently, 4.12 [does not allow you to use the same BSP](https://lists.rtems.org/pipermail/users/2016-February/029782.html), for both native and emulated FPU usage ; you'll have to build separate BSPs by tweaking the `leon2.cfg`/`leon3.cfg` files when you build RTEMS. @@ -118,23 +118,23 @@ If you want to see the complete commands used, pass `V=1`: $ touch src/task1.c $ make CFG=debug FPU=0 V=1 - /opt/rtems-4.11-2016.04.01.NONFPU/bin/sparc-rtems4.11-gcc -c \ - -B/opt/rtems-4.11-2016.04.01.NONFPU/sparc-rtems4.11/leon3/lib \ + /opt/rtems-4.12-2016.06.13.NONFPU/bin/sparc-rtems4.12-gcc -c \ + -B/opt/rtems-4.12-2016.06.13.NONFPU/sparc-rtems4.12/leon3/lib \ -specs bsp_specs -qrtems -mcpu=cypress -DBSP_leon3 -ffunction-sections \ -fdata-sections -Wall -Wmissing-prototypes \ -Wimplicit-function-declaration -Wstrict-prototypes -Wnested-externs \ -g -Wall -D_DEBUG -I src -msoft-float \ -o objs.debug.NONFPU.leon3/task1.o src/task1.c - /opt/rtems-4.11-2016.04.01.NONFPU/bin/sparc-rtems4.11-gcc -g \ + /opt/rtems-4.12-2016.06.13.NONFPU/bin/sparc-rtems4.12-gcc -g \ -o bin.debug.NONFPU.leon3/fputest objs.debug.NONFPU.leon3/init.o \ objs.debug.NONFPU.leon3/task1.o objs.debug.NONFPU.leon3/task2.o \ objs.debug.NONFPU.leon3/common.o -msoft-float \ - -B/opt/rtems-4.11-2016.04.01.NONFPU/sparc-rtems4.11/leon3/lib \ + -B/opt/rtems-4.12-2016.06.13.NONFPU/sparc-rtems4.12/leon3/lib \ -specs bsp_specs -qrtems -mcpu=cypress -DBSP_leon3 \ -ffunction-sections -fdata-sections -Wall -Wmissing-prototypes \ -Wimplicit-function-declaration -Wstrict-prototypes \ -Wnested-externs -Wl,--gc-sections - Built with RTEMS at /opt/rtems-4.11-2016.04.01.NONFPU/sparc-rtems4.11/leon3/lib for leon3. + Built with RTEMS at /opt/rtems-4.12-2016.06.13.NONFPU/sparc-rtems4.12/leon3/lib for leon3. # Support diff --git a/OAR/contrib/build.rtems.4.11.sh b/OAR/contrib/build.rtems.4.12.sh similarity index 90% rename from OAR/contrib/build.rtems.4.11.sh rename to OAR/contrib/build.rtems.4.12.sh index ca3b692..a7f9416 100755 --- a/OAR/contrib/build.rtems.4.11.sh +++ b/OAR/contrib/build.rtems.4.12.sh @@ -1,11 +1,11 @@ #!/bin/bash # -# This script builds the RTEMS4.11/Sparc cross-compiler -# and Leon2/3 BSPs. +# This script builds the RTEMS/SPARC cross-compiler +# and leon2/leon3/ngmp BSPs. # -# To have a reproducible setup, we suggest you execute -# this script under a Debian jessie chroot, bootstrapped -# via the following: +# To have a reproducible setup, it would be prudent if you +# executed this script under a Debian jessie chroot, +# bootstrapped via the following: # # mkdir /opt/jessie-chroot # debootstrap jessie /opt/jessie-chroot @@ -59,7 +59,8 @@ BUILD_LOG=/root/rtems.build.logs/${DATE}.log # If your network is like the one in ESA/ESTEC and this is forbidden, # you'll have to fetch these tarballs and hardlink to them each time # (so no FTP action is triggered by the RTEMS RSB builder). - # This is how I do it - adapt according to your needs: + # + # This is one way to do it - adapt it according to your needs: # # cd rtems # [ ! -d sources ] && { -- GitLab