From 1019f52bb7573a58da700cb5d291316ffa6c0630 Mon Sep 17 00:00:00 2001
From: Rogerz Zhang <rogerz.zhang@gmail.com>
Date: Sun, 31 Mar 2013 22:23:48 +0800
Subject: [PATCH 1/2] add powerpc bsp to travis-ci

---
 .travis.yml           | 3 ++-
 bsp/taihu/rtconfig.py | 6 ++++++
 bsp/taihu/taihu.lds   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b7e26cbfd4..876da9095b 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 ecaa2ee93a..c20f594570 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 3a4f339982..7b4eae28bd 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)

From 158e9cdf9132e1d51c526f103d31eb07e56adace Mon Sep 17 00:00:00 2001
From: Rogerz Zhang <rogerz.zhang@gmail.com>
Date: Sun, 31 Mar 2013 23:05:04 +0800
Subject: [PATCH 2/2] add more command string for scons

---
 tools/building.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/building.py b/tools/building.py
index 8237a0fd32..a90ad69c1d 100644
--- a/tools/building.py
+++ b/tools/building.py
@@ -125,7 +125,9 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
     if not GetOption('verbose'):
         # override the default verbose command string
         env.Replace(
+            ARCOMSTR = 'AR $TARGET',
             ASCOMSTR = 'AS $TARGET',
+            ASPPCOMSTR = 'AS $TARGET',
             CCCOMSTR = 'CC $TARGET',
             CXXCOMSTR = 'CXX $TARGET',
             LINKCOMSTR = 'LINK $TARGET'