diff options
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | src/arch/msp430fr5994lp/Makefile.inc | 14 |
2 files changed, 10 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e0e91a..d389dd8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,12 +31,11 @@ build_msp430fr5969lp: build_msp430fr5994lp: stage: build before_script: - - export PATH="/opt/msp430/ti/msp430-gcc-full-linux-5.0.0.36/bin:$PATH" + - export PATH="/opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin:$PATH" script: - - dpkg --add-architecture i386 - apt-get update -qy - - apt-get install -y build-essential curl libc6:i386 libgcc1:i386 libstdc++6:i386 - - curl -s https://ess.cs.uos.de/static/.gitlab-ci/msp430-gcc-full-linux-5.0.0.36.tar.xz | tar -C /opt -xJf - + - apt-get install -y build-essential curl + - curl -s https://ess.cs.uos.de/static/.gitlab-ci/msp430-gcc-full-linux-5.1.2.0.tar.xz | tar -C /opt -xJf - - mkdir -p build - make -B arch=msp430fr5994lp app=donothing - make -B arch=msp430fr5994lp app=ledblink loop=1 timer_s=1 diff --git a/src/arch/msp430fr5994lp/Makefile.inc b/src/arch/msp430fr5994lp/Makefile.inc index f73c28d..a58a7c2 100644 --- a/src/arch/msp430fr5994lp/Makefile.inc +++ b/src/arch/msp430fr5994lp/Makefile.inc @@ -10,7 +10,7 @@ cpu_freq ?= 8000000 MSP430_FLASHER_DIR ?= /home/derf/var/projects/msp430/MSP430Flasher_1.3.15 -INCLUDES += -I/opt/msp430/ti/msp430-gcc-full-linux-5.0.0.36/include +INCLUDES += -I/opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/include COMMON_FLAGS += -mcpu=${CPU} -mmcu=${MCU} -DMULTIPASS_ARCH_msp430fr5994lp COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C @@ -20,17 +20,17 @@ endif # LTO seems to be broken. -CC = /opt/msp430/ti/msp430-gcc-full-linux-5.0.0.36/bin/msp430-elf-gcc -CXX = /opt/msp430/ti/msp430-gcc-full-linux-5.0.0.36/bin/msp430-elf-g++ -OBJCOPY = /opt/msp430/ti/msp430-gcc-full-linux-5.0.0.36/bin/msp430-elf-objcopy -OBJDUMP = /opt/msp430/ti/msp430-gcc-full-linux-5.0.0.36/bin/msp430-elf-objdump +CC = /opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin/msp430-elf-gcc +CXX = /opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin/msp430-elf-g++ +OBJCOPY = /opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin/msp430-elf-objcopy +OBJDUMP = /opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin/msp430-elf-objdump ARCH_SHORTNAME = msp430 CXX_TARGETS += src/arch/msp430fr5994lp/arch.cc ifeq (${aspectc}, 1) - CXX = ag++ -r build/repo.acp -v 0 --c_compiler /opt/msp430/ti/msp430-gcc-full-linux-5.0.0.36/bin/msp430-elf-g++ -p . --Xcompiler + CXX = ag++ -r build/repo.acp -v 0 --c_compiler /opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin/msp430-elf-g++ -p . --Xcompiler endif ifneq ($(findstring adc,${arch_drivers}), ) @@ -87,7 +87,7 @@ OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o} ${ASM_TARGETS:.S=.o} build/system.elf: ${OBJECTS} ${QUIET}${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} \ - -Wl,--library-path=/opt/msp430/ti/msp430-gcc-full-linux-5.0.0.36/include/ \ + -Wl,--library-path=/opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/include/ \ -Wl,--gc-sections \ -o $@ ${OBJECTS} |