From b24ce6dbd7a8176cc3d1beba2976af8e15c4315b Mon Sep 17 00:00:00 2001 From: Rogerz Zhang Date: Sun, 17 Mar 2013 20:44:57 +0800 Subject: [PATCH 1/3] Update toolchain to sourcery 2012 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5504efb3a8..5444961f56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ notifications: before_script: # travis has changed to 64-bit and we require 32-bit compatibility libraries - "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-2011.03-42-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 | tar xjf - -C /tmp && export RTT_EXEC_PATH=/tmp/arm-2011.03/bin && /tmp/arm-2011.03/bin/arm-none-eabi-gcc --version || 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" - export RTT_ROOT=`pwd` - export RTT_CC='gcc' From 16743a7cf41be4e29189854ecbe2ec4268788892 Mon Sep 17 00:00:00 2001 From: Rogerz Zhang Date: Sun, 17 Mar 2013 21:26:03 +0800 Subject: [PATCH 2/3] Add mips bsp building --- .travis.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5444961f56..b7e26cbfd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ before_script: # travis has changed to 64-bit and we require 32-bit compatibility libraries - "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" - export RTT_ROOT=`pwd` - export RTT_CC='gcc' @@ -15,11 +16,11 @@ script: env: - RTT_BSP='at91sam9260' RTT_TOOL_CHAIN='sourcery-arm' -# - RTT_BSP='avr32uc3b0' -# - RTT_BSP='bf533' -# - RTT_BSP='dev3210' +# - RTT_BSP='avr32uc3b0' # avr +# - RTT_BSP='bf533' # no scons + - RTT_BSP='dev3210' RTT_TOOL_CHAIN='sourcery-mips' - RTT_BSP='efm32' RTT_TOOL_CHAIN='sourcery-arm' -# - RTT_BSP='jz47xx' + - RTT_BSP='jz47xx' RTT_TOOL_CHAIN='sourcery-mips' - RTT_BSP='lm3s8962' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='lm3s9b9x' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='lm4f232' RTT_TOOL_CHAIN='sourcery-arm' @@ -29,26 +30,27 @@ env: - RTT_BSP='lpc178x' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='lpc2148' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='lpc2478' RTT_TOOL_CHAIN='sourcery-arm' -# - RTT_BSP='ls1bdev' -# - RTT_BSP='m16c62p' + - RTT_BSP='ls1bdev' RTT_TOOL_CHAIN='sourcery-mips' +# - RTT_BSP='m16c62p' # m32c - RTT_BSP='mb9bf500r' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='mb9bf506r' RTT_TOOL_CHAIN='sourcery-arm' -# - RTT_BSP='microblaze' +# - RTT_BSP='microblaze' # no scons - RTT_BSP='mini2440' RTT_TOOL_CHAIN='sourcery-arm' # - RTT_BSP='mini4020' # no scons -# - RTT_BSP='nios_ii' -# - RTT_BSP='nuc140' -# - RTT_BSP='pic32ethernet' +# - RTT_BSP='nios_ii' # no scons +# - RTT_BSP='nuc140' # no scons +# - RTT_BSP='pic32ethernet' # no scons # - RTT_BSP='sam7s' # no scons - RTT_BSP='sam7x' RTT_TOOL_CHAIN='sourcery-arm' +# - RTT_BSP='simlinux' # linux # - RTT_BSP='simulator' # x86 - RTT_BSP='stm32f0x' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='stm32f107' RTT_TOOL_CHAIN='sourcery-arm' - 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' -# - RTT_BSP='upd70f3454' -# - RTT_BSP='wh44b0' +# - RTT_BSP='taihu' # ppc +# - RTT_BSP='upd70f3454' # iar +# - RTT_BSP='wh44b0' # no scons # - RTT_BSP='x86' # x86 -# - RTT_BSP='xplorer4330' +# - RTT_BSP='xplorer4330' # no scons From 17e5f804fff19cffbf956f242fd210d54ec3b35e Mon Sep 17 00:00:00 2001 From: Rogerz Zhang Date: Sun, 17 Mar 2013 21:32:18 +0800 Subject: [PATCH 3/3] Remove rtgui from bsp/dev3210 --- bsp/dev3210/rtconfig.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bsp/dev3210/rtconfig.h b/bsp/dev3210/rtconfig.h index 168b22a27a..7968b263f3 100644 --- a/bsp/dev3210/rtconfig.h +++ b/bsp/dev3210/rtconfig.h @@ -140,7 +140,9 @@ #define RT_LWIP_ETHTHREAD_STACKSIZE 512 /* SECTION: RT-Thread/GUI */ -#define RT_USING_RTGUI +// #define RT_USING_RTGUI + +#ifdef RT_USING_RTGUI /* name length of RTGUI object */ #define RTGUI_NAME_MAX 12 @@ -161,4 +163,6 @@ /* default font size in RTGUI */ #define RTGUI_DEFAULT_FONT_SIZE 16 +#endif // RT_USING_RTGUI + #endif