Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump msp430-elf to 9.2.0-15 #100

Merged
merged 1 commit into from
Feb 10, 2020
Merged

Conversation

kaspar030
Copy link
Contributor

This PR udpates the msp430-elf toolchain package to version 15, which fixes the installation paths (which were broken in #99).

Also updates GDB to the newly released 9.1.

@kaspar030 kaspar030 added the bug label Feb 10, 2020
@kaspar030 kaspar030 requested a review from gschorcht February 10, 2020 11:06
@kaspar030
Copy link
Contributor Author

@gschorcht this time I checked if the resulting container can build RIOT-OS/RIOT#12457...

[kaspar@ng riot/examples/hello-world (update_msp430)]$ BUILD_IN_DOCKER=1 BOARD=z1 make clean all -j8
Launching build container using image "riot/riotbuild:latest".
docker run --rm -t -u "$(id -u)" \                          
    -v '/usr/share/zoneinfo/Europe/Berlin:/etc/localtime:ro' -v '/home/kaspar/src/riot:/data/riotbuild/riotbase:delegated' -e 'RIOT
BASE=/data/riotbuild/riotbase' -e 'CCACHE_BASEDIR=/data/riotbuild/riotbase' -e 'BUILD_DIR=/data/riotbuild/riotbase/build' -e 'RIOTP
ROJECT=/data/riotbuild/riotbase' -e 'RIOTCPU=/data/riotbuild/riotbase/cpu' -e 'RIOTBOARD=/data/riotbuild/riotbase/boards' -e 'RIOTM
AKE=/data/riotbuild/riotbase/makefiles' -v '/home/kaspar/.gitcache:/data/riotbuild/gitcache:delegated' -e 'GIT_CACHE_DIR=/data/riot
build/gitcache'    \                                                                                                               
    -e 'BOARD=z1' \
    -w '/data/riotbuild/riotbase/examples/hello-world/' \
    'riot/riotbuild:latest' make all   
Building application "hello-world" for "z1" with MCU "msp430fxyz".

"make" -C /data/riotbuild/riotbase/boards/z1
"make" -C /data/riotbuild/riotbase/core
"make" -C /data/riotbuild/riotbase/cpu/msp430fxyz
"make" -C /data/riotbuild/riotbase/cpu/msp430_common
/tmp/ccV2guj9.s: Assembler messages:
/tmp/ccV2guj9.s:93: Warning: a NOP might be needed here, before an interrupt enable instruction
/tmp/ccV2guj9.s:134: Warning: a NOP might be needed here, before an interrupt enable instruction
"make" -C /data/riotbuild/riotbase/cpu/msp430_common/periph
"make" -C /data/riotbuild/riotbase/cpu/msp430fxyz/periph
"make" -C /data/riotbuild/riotbase/drivers
"make" -C /data/riotbuild/riotbase/drivers/periph_common
"make" -C /data/riotbuild/riotbase/sys
"make" -C /data/riotbuild/riotbase/sys/auto_init
"make" -C /data/riotbuild/riotbase/sys/newlib_syscalls_default
"make" -C /data/riotbuild/riotbase/sys/stdio_uart
   text    data     bss     dec     hex filename
   8183     132    1516    9831    2667 /data/riotbuild/riotbase/examples/hello-world/bin/z1/hello-world.elf

and

[kaspar@ng riot/examples/hello-world (update_msp430)]$ BOARD=z1 make term
/home/kaspar/src/riot/dist/tools/pyterm/pyterm -p "/dev/ttyUSB0" -b "115200" 
Twisted not available, please install it if you want to use pyterm's JSON capabilities
2020-02-10 12:09:06,179 # Connect to serial port /dev/ttyUSB0
Welcome to pyterm!
Type '/exit' to exit.
2020-02-10 12:09:09,409 # main(): This is RIOT! (Version: 2020.04-devel-352-gd637f1-update_msp430)
2020-02-10 12:09:09,410 # Hello World!
2020-02-10 12:09:09,410 # You are running RIOT on a(n) z1 board.
2020-02-10 12:09:09,410 # This board features a(n) msp430fxyz MCU.

@kaspar030 kaspar030 requested a review from benpicco February 10, 2020 12:47
Copy link
Contributor

@gschorcht gschorcht left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This time I also checked the resulting container with RIOT-OS/RIOT#12457 😉 It seems that it works:

DOCKER_IMAGE=riotbuild BUILD_IN_DOCKER=1 make BOARD=telosb -C examples/hello-world
Launching build container using image "riotbuild".
docker run --rm -t -u "$(id -u)" \
    -v '/usr/share/zoneinfo/Europe/Berlin:/etc/localtime:ro' -v '/home/gs/src/RIOT-Xtensa-ESP.working:/data/riotbuild/riotbase:delegated' -e 'RIOTBASE=/data/riotbuild/riotbase' -e 'CCACHE_BASEDIR=/data/riotbuild/riotbase' -e 'BUILD_DIR=/data/riotbuild/riotbase/build' -e 'RIOTPROJECT=/data/riotbuild/riotbase' -e 'RIOTCPU=/data/riotbuild/riotbase/cpu' -e 'RIOTBOARD=/data/riotbuild/riotbase/boards' -e 'RIOTMAKE=/data/riotbuild/riotbase/makefiles'      \
    -e 'BOARD=telosb' \
    -w '/data/riotbuild/riotbase/examples/hello-world/' \
    'riotbuild' make  'BOARD=telosb'  
Building application "hello-world" for "telosb" with MCU "msp430fxyz".

"make" -C /data/riotbuild/riotbase/boards/telosb
"make" -C /data/riotbuild/riotbase/core
"make" -C /data/riotbuild/riotbase/cpu/msp430fxyz
"make" -C /data/riotbuild/riotbase/cpu/msp430_common
"make" -C /data/riotbuild/riotbase/cpu/msp430_common/periph
"make" -C /data/riotbuild/riotbase/cpu/msp430fxyz/periph
"make" -C /data/riotbuild/riotbase/drivers
"make" -C /data/riotbuild/riotbase/drivers/periph_common
"make" -C /data/riotbuild/riotbase/sys
"make" -C /data/riotbuild/riotbase/sys/auto_init
"make" -C /data/riotbuild/riotbase/sys/newlib_syscalls_default
"make" -C /data/riotbuild/riotbase/sys/stdio_uart
   text	   data	    bss	    dec	    hex	filename
   8535	    176	   1516	  10227	   27f3	/data/riotbuild/riotbase/examples/hello-world/bin/telosb/hello-world.elf

@gschorcht gschorcht merged commit 6168ac5 into RIOT-OS:master Feb 10, 2020
@kaspar030 kaspar030 deleted the udpate_msp430 branch February 10, 2020 14:24
@kaspar030
Copy link
Contributor Author

Thanks @gschorcht!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants