From 7e78e47444c29b4d0c804877b28aa778fa0576c3 Mon Sep 17 00:00:00 2001
From: "William D. Jones" <thor0505@comcast.net>
Date: Tue, 24 Mar 2020 00:40:25 -0400
Subject: [PATCH] msp_exp430f5529lp: Fix board.mk, remove .travis.yml.bck.

---
 .travis.yml.bck                   | 34 -------------------------------
 examples/rules.mk                 |  1 -
 hw/bsp/msp_exp430f5529lp/board.mk | 15 +++++++-------
 3 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 .travis.yml.bck

diff --git a/.travis.yml.bck b/.travis.yml.bck
deleted file mode 100644
index ab84d757e..000000000
--- a/.travis.yml.bck
+++ /dev/null
@@ -1,34 +0,0 @@
-language: c
-dist: bionic
-compiler:
-  - gcc
-
-addons:
-  apt:
-    sources:
-      - sourceline: "ppa:team-gcc-arm-embedded/ppa"
-    packages:
-      - python3
-      - ruby
-      - gcc-arm-embedded
-
-install:
-  - gem install ceedling
-
-before_script:
-  - wget http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/8_3_0_0/exports/msp430-gcc-8.3.0.16_linux64.tar.bz2 -O /tmp/msp430-gcc.tar.bz2
-  - tar -xjf /tmp/msp430-gcc.tar.bz2
-  - export PATH=$PATH:$PWD/msp430-gcc-8.3.0.16_linux64/bin
-  - arm-none-eabi-gcc --version
-  - msp430-elf-gcc --version
-
-script:
-  # Build all examples
-  - python3 tools/build_all.py
-  # Run unit tests
-  - cd test
-  - ceedling test:all
-  - cd ..
-
-after_success:
-  - source tools/build_success.sh
diff --git a/examples/rules.mk b/examples/rules.mk
index 04cdef2d2..0343391cb 100644
--- a/examples/rules.mk
+++ b/examples/rules.mk
@@ -35,7 +35,6 @@ ifeq ($(BOARD), msp_exp430f5529lp)
 else
   LDFLAGS += $(CFLAGS) -fshort-enums -Wl,-T,$(TOP)/$(LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nosys.specs -specs=nano.specs
 endif
-LDFLAGS += $(addprefix -L,$(LDINC))
 ASFLAGS += $(CFLAGS)
 
 # Assembly files can be name with upper case .S, convert it to .s
diff --git a/hw/bsp/msp_exp430f5529lp/board.mk b/hw/bsp/msp_exp430f5529lp/board.mk
index b1264d346..13e3b7217 100644
--- a/hw/bsp/msp_exp430f5529lp/board.mk
+++ b/hw/bsp/msp_exp430f5529lp/board.mk
@@ -9,6 +9,7 @@ CFLAGS += \
 # All source paths should be relative to the top level.
 LD_FILE = hw/mcu/ti/msp430/msp430-gcc-support-files/include/msp430f5529.ld
 LDINC += $(TOP)/hw/mcu/ti/msp430/msp430-gcc-support-files/include
+LDFLAGS += $(addprefix -L,$(LDINC))
 
 INC += $(TOP)/hw/mcu/ti/msp430/msp430-gcc-support-files/include
 
@@ -16,17 +17,17 @@ INC += $(TOP)/hw/mcu/ti/msp430/msp430-gcc-support-files/include
 VENDOR = ti
 CHIP_FAMILY = msp430x5xx
 
-# Allow user to use mspdebug if set on make command line.
-ifdef MSPDEBUG
-# flash target using mspdebug.
-flash: $(BUILD)/$(BOARD)-firmware.elf
-	$(MSPDEBUG) tilib "prog $<" --allow-fw-update
-else
 # export for libmsp430.so to same installation
+ifneq ($(OS),Windows_NT)
 export LD_LIBRARY_PATH=$(dir $(shell which MSP430Flasher))
+endif
+
 # flash target using TI MSP430-Flasher
 # http://www.ti.com/tool/MSP430-FLASHER
 # Please add its installation dir to PATH
 flash: $(BUILD)/$(BOARD)-firmware.hex
 	MSP430Flasher -w $< -z [VCC]
-endif
+
+# flash target using mspdebug.
+flash-mspdebug: $(BUILD)/$(BOARD)-firmware.elf
+	$(MSPDEBUG) tilib "prog $<" --allow-fw-update