Changeset 5320d75 in rtems-testing


Ignore:
Timestamp:
Nov 9, 2017, 9:19:36 PM (18 months ago)
Author:
Joel Sherrill <joel@…>
Branches:
8895273c193787f84c4585a10f6d6aceb3b25dc4
Children:
b1943cf
Parents:
3b635c6
git-author:
Joel Sherrill <joel@…> (11/09/17 21:19:36)
git-committer:
Joel Sherrill <joel@…> (11/09/17 21:20:10)
Message:

rtems/bit_rtems: Add support for building new TCP/IP

Location:
rtems
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • rtems/bit_rtems

    r3b635c6 r5320d75  
    264264fi
    265265
    266 if [ ${ENABLE_RTEMS_TCPIP} = yes ] ; then
    267   case ${CPU} in
    268     avr) TCPIP_FLAG="--disable-networking" ;;
    269     *)   TCPIP_FLAG="--enable-networking" ;;
    270   esac
    271 else
    272   TCPIP_FLAG="--disable-networking"
    273 fi
     266case ${ENABLE_RTEMS_TCPIP} in
     267  yes)
     268    case ${CPU} in
     269      avr) TCPIP_FLAG="--disable-networking" ;;
     270      *)   TCPIP_FLAG="--enable-networking" ;;
     271    esac
     272    ;;
     273  no)
     274    TCPIP_FLAG="--disable-networking"
     275    ;;
     276  new)
     277    type waf >/dev/null 2>&1
     278     check_fatal $? "waf is not in your PATH"
     279
     280    TCPIP_FLAG="--disable-networking"
     281    if [ ${do_install} = "no" ] ; then
     282      do_install="yes"
     283    fi
     284    ;;
     285esac
    274286
    275287#    --disable-rtems-inlines
     
    336348    #or1k)          # RTEMS PR XXX
    337349    #   ENABLE_RTEMS_CXX="--disable-cxx" ;;
    338     #avr|bfin|lm32|m32r|moxie|tic4x|v850)
    339350    m32c)           # m32c does not have C++ support in GCC
     351       ENABLE_RTEMS_CXX="--disable-cxx" ;;
     352    avr|bfin|m32r|tic4x)
    340353       ENABLE_RTEMS_CXX="--disable-cxx" ;;
    341354    *) ENABLE_RTEMS_CXX="--enable-cxx" ;;
     
    435448         ${MAKE} RTEMS_BSP= ${MAKE_DEBUG_ARG} install
    436449       else
    437          find ${INSTALL_POINT}/${target} -name "*.h" -o -name "*.a" | \
    438            while read f
    439            do
    440              rpm -qf $f >/dev/null 2>&1
    441              test $? -eq 1 && (echo $f ; rm -f $f)
    442            done
     450         rm -rf ${INSTALL_POINT}/${target}/${BSP_TO_TEST}
     451         check_fatal $? "failed to clean BSP install point"
    443452
    444453         ${MAKE} RTEMS_BSP=${BSP_TO_TEST} ${MAKE_DEBUG_ARG} install
     
    605614      posix|bare*) ;;
    606615      *)
    607         if [ -d ../examples-v2 ] ; then
    608           SUITES="${SUITES} examples-v2"
    609         else
    610           echo "WARNING! examples-v2 not found"
     616        cd ..
     617        if [ -d rtems-libbsd -a ${ENABLE_RTEMS_TCPIP} = "new" ] ; then
     618          cd rtems-libbsd
     619          waf distclean
     620          check_fatal $? "failed waf distclean - rtems-libbsd on ${BSP_TO_TEST}"
     621
     622          gcc=`type ${target}-gcc 2>&1 | cut -d' ' -f3`
     623          tooldir=`echo ${gcc} | sed -e 's/\/bin.*$//'`
     624          RTEMS_MAKEFILE_PATH=${INSTALL_POINT}/${target}/${BSP_TO_TEST} \
     625          waf configure \
     626            --rtems=${INSTALL_POINT} \
     627            --rtems-tools=${tooldir} \
     628            --rtems-bsps=${CPU}/${BSP_TO_TEST} \
     629            --prefix=${INSTALL_POINT}
     630          check_fatal $? "failed waf configure - rtems-libbsd on ${BSP_TO_TEST}"
     631 
     632          waf
     633          check_fatal $? "failed waf - rtems-libbsd on ${BSP_TO_TEST}"
     634 
     635          waf install
     636          check_fatal $? "failed waf install - rtems-libbsd on ${BSP_TO_TEST}"
     637          cd ..
    611638        fi
    612639
    613         if [ -d ../class-examples ] ; then
    614           SUITES="${SUITES} class-examples"
    615         else
    616           echo "WARNING! class-examples not found"
    617         fi
    618 
    619         if [ -d ../examples ] ; then
    620           SUITES="${SUITES} examples"
    621         else
    622           echo "WARNING! examples not found"
    623         fi
     640        # Other repositories
     641        SUITES=""
     642        for suite in examples-v2 class-examples examples
     643        do
     644          if [ -d ${suite} ] ; then
     645            SUITES="${SUITES} ${suite}"
     646          else
     647            echo "WARNING! ${suite} not found"
     648          fi
     649        done
    624650
    625651        if [ ${ENABLE_RTEMS_TCPIP} = yes ] ; then
    626           if [ -d ../network-demos ] ; then
     652          if [ -d network-demos ] ; then
    627653            SUITES="${SUITES} network-demos"
    628654          fi
     
    632658        for suite in ${SUITES}
    633659        do
    634           cd ..
    635660          cd ${suite}
    636661          check_fatal $? "failed cd to ${suite}."
     
    647672             ${MAKE} ${MAKE_DEBUG_ARG} clean
    648673          check_fatal $? "failed clean ${suite} on ${BSP_TO_TEST}."
     674
     675          cd ..
    649676        done
    650677
     
    652679        if [ ${ENABLE_RTEMS_POSIX} = yes -a  \
    653680             ${ENABLE_RTEMS_TCPIP} = yes -a \
    654              -d ../rtems-addon-packages ] ; then
    655 
    656           cd ../rtems-addon-packages
     681             -d rtems-addon-packages ] ; then
     682
     683          cd rtems-addon-packages
    657684          check_fatal $? "failed cd to rtems-addon-packages."
    658685
  • rtems/user.cfg

    r3b635c6 r5320d75  
    1919
    2020#RTEMS_VERSION=4.11
    21 RTEMS_VERSION=4.12
     21# RTEMS_VERSION=4.12
     22RTEMS_VERSION=5
    2223#RTEMS_VERSION=4.10
    2324
     
    4041# associated clients and servers.  This is automatically disabled
    4142# for BSPs that have no networking support.
    42 ENABLE_RTEMS_TCPIP=no
     43# Values: yes, no, or new
     44ENABLE_RTEMS_TCPIP=yes
    4345
    4446# Set this to yes if you want to enable the RTEMS uITRON 3.0 API
     
    6466# #tests appropriate for your configuration.  Or set it to
    6567# samples if you just want the samples
    66 # ENABLE_RTEMS_TESTS=no
    6768# ENABLE_RTEMS_TESTS=samples
    6869ENABLE_RTEMS_TESTS=yes
Note: See TracChangeset for help on using the changeset viewer.