diff --git a/.travis.yml b/.travis.yml index b7e26cbfd45dc9a163245d770fd8cf133f58b2d7..876da9095b4b451ac80f0337239e5a16ce80c940 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ before_script: - "sudo apt-get -qq install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 || true" - "[ $RTT_TOOL_CHAIN = 'sourcery-arm' ] && curl -s https://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-2012.09-63-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 | sudo tar xjf - -C /opt && export RTT_EXEC_PATH=/opt/arm-2012.09/bin && /opt/arm-2012.09/bin/arm-none-eabi-gcc --version || true" - "[ $RTT_TOOL_CHAIN = 'sourcery-mips' ] && curl -s https://sourcery.mentor.com/public/gnu_toolchain/mips-sde-elf/mips-2012.09-98-mips-sde-elf-i686-pc-linux-gnu.tar.bz2 | sudo tar xjf - -C /opt && export RTT_EXEC_PATH=/opt/mips-2012.09/bin && /opt/mips-2012.09/bin/mips-sde-elf-gcc --version || true" + - "[ $RTT_TOOL_CHAIN = 'sourcery-ppc' ] && curl -s https://sourcery.mentor.com/public/gnu_toolchain/powerpc-eabi/freescale-2011.03-39-powerpc-eabi-i686-pc-linux-gnu.tar.bz2 | sudo tar xjf - -C /opt && export RTT_EXEC_PATH=/opt/freescale-2011.03/bin && /opt/freescale-2011.03/bin/powerpc-eabi-gcc --version || true" - export RTT_ROOT=`pwd` - export RTT_CC='gcc' @@ -49,7 +50,7 @@ env: - RTT_BSP='stm32f10x' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='stm32f20x' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='stm32f40x' RTT_TOOL_CHAIN='sourcery-arm' -# - RTT_BSP='taihu' # ppc + - RTT_BSP='taihu' RTT_TOOL_CHAIN='sourcery-ppc' # - RTT_BSP='upd70f3454' # iar # - RTT_BSP='wh44b0' # no scons # - RTT_BSP='x86' # x86 diff --git a/bsp/taihu/rtconfig.py b/bsp/taihu/rtconfig.py index ecaa2ee93a4dae1efcda69a393239f765023759a..c20f59457097124af5b3fd1a7b8b42ab79346f4d 100644 --- a/bsp/taihu/rtconfig.py +++ b/bsp/taihu/rtconfig.py @@ -1,4 +1,7 @@ +import os + # toolchains options + ARCH='ppc' CPU='ppc405' CROSS_TOOL='gcc' @@ -8,6 +11,9 @@ PLATFORM = 'gcc' EXEC_PATH = 'C:/Program Files/CodeSourcery/Sourcery G++ Lite/bin' BUILD = 'debug' +if os.getenv('RTT_EXEC_PATH'): + EXEC_PATH = os.getenv('RTT_EXEC_PATH') + if PLATFORM == 'gcc': # toolchains PREFIX = 'powerpc-eabi-' diff --git a/bsp/taihu/taihu.lds b/bsp/taihu/taihu.lds index 3a4f339982b616ed91eb3cacb05ff31564451d1a..7b4eae28bde1c1b58264d8f90183f4034977592c 100644 --- a/bsp/taihu/taihu.lds +++ b/bsp/taihu/taihu.lds @@ -36,7 +36,7 @@ SECTIONS .text : { - KEEP(build\libcpu\ppc\ppc405\start_gcc.o (.text)) + KEEP(build/libcpu/ppc/ppc405/start_gcc.o (.text)) *(.text) *(.fixup)