diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | src/arch/blinkenrocket/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/arch/esp8266/Makefile.inc | 19 | ||||
| -rw-r--r-- | src/arch/msp430fr5969lp/Makefile.inc | 12 | ||||
| -rw-r--r-- | src/arch/msp430fr5994lp/Makefile.inc | 12 |
5 files changed, 39 insertions, 22 deletions
@@ -151,23 +151,23 @@ clean: arch_clean help: arch_help @echo - @echo "Global flags:" + @echo "common flags:" @echo " timer_cycles timer_us timer_s" @echo " loop" @echo @echo "${arch} drivers:" - @echo " $(shell ls src/arch/${arch}/driver | fgrep .c | cut -d . -f 1)" + @ls -1 src/arch/${arch}/driver | fgrep .c | cut -d . -f 1 | sed 's/^/ /' @echo - @echo "Global drivers:" - @echo " $(shell ls src/driver | fgrep .c | cut -d . -f 1)" + @echo "common drivers:" + @ls -1 src/driver | fgrep .c | cut -d . -f 1 | sed 's/^/ /' @echo - @echo "Global architectures:" - @echo " $(shell ls src/arch)" + @echo "available architectures:" + @ls -1 src/arch | sed 's/^/ /' info: arch_info @echo "COMMON_FLAGS: ${COMMON_FLAGS}" @echo "CFLAGS: ${CFLAGS}" @echo "CXXFLAGS: ${CXXFLAGS}" - @echo "Selected Drivers: ${drivers} / ${arch_drivers}" + @echo "Selected (common/arch) drivers: ${drivers} / ${arch_drivers}" -.PHONY: clean default stack help info +.PHONY: clean default stack stackm help info diff --git a/src/arch/blinkenrocket/Makefile.inc b/src/arch/blinkenrocket/Makefile.inc index 28275b8..9b19857 100644 --- a/src/arch/blinkenrocket/Makefile.inc +++ b/src/arch/blinkenrocket/Makefile.inc @@ -34,7 +34,7 @@ OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o} .cc.o: ${QUIET}${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} -c -o $@ ${@:.o=.cc} -.cc.o: +.c.o: ${QUIET}${CC} ${INCLUDES} ${COMMON_FLAGS} ${CFLAGS} -c -o $@ ${@:.o=.c} build/system.elf: ${OBJECTS} diff --git a/src/arch/esp8266/Makefile.inc b/src/arch/esp8266/Makefile.inc index 6f97898..d2ae7d8 100644 --- a/src/arch/esp8266/Makefile.inc +++ b/src/arch/esp8266/Makefile.inc @@ -1,9 +1,9 @@ # vim:ft=make -TOOLCHAIN_BASE = /home/derf/var/projects/esp8266/toolchain/xtensa-lx106-elf/bin -SDK_BASE = /home/derf/var/projects/esp8266/toolchain/xtensa-lx106-elf/xtensa-lx106-elf/sysroot/usr -ESPTOOL = esptool -PORT = /dev/ttyUSB0 +TOOLCHAIN_BASE ?= /home/derf/var/projects/esp8266/toolchain/xtensa-lx106-elf/bin +SDK_BASE ?= /home/derf/var/projects/esp8266/toolchain/xtensa-lx106-elf/xtensa-lx106-elf/sysroot/usr +ESPTOOL ?= esptool +PORT ?= /dev/ttyUSB0 CC = ${TOOLCHAIN_BASE}/xtensa-lx106-elf-gcc CXX = ${TOOLCHAIN_BASE}/xtensa-lx106-elf-g++ @@ -72,8 +72,17 @@ monitor: screen /dev/ttyUSB0 115200 arch_help: + @echo "esp8266 coding advice:" + @echo " The ESP8266 SDK does not give full hardware control." + @echo " Applications must release control every hundred or so milliseconds." + @echo " It is strongly recommended to only use loop=1" + @echo @echo "esp8266 specific flags:" - @echo " - none -" + @echo " esp8266_led2 = 0 (enable if you are using a NodeMCU dev board with two LEDs)" + @echo " TOOLCHAIN_BASE = /home/derf/var/projects/esp8266/toolchain/xtensa-lx106-elf/bin" + @echo " SDK_BASE = /home/derf/var/projects/esp8266/toolchain/xtensa-lx106-elf/xtensa-lx106-elf/sysroot/usr" + @echo " ESPTOOL = esptool" + @echo " PORT = /dev/ttyUSB0" arch_info: @echo "Counter Overflow: ?/?" diff --git a/src/arch/msp430fr5969lp/Makefile.inc b/src/arch/msp430fr5969lp/Makefile.inc index 15c3a89..f689b3f 100644 --- a/src/arch/msp430fr5969lp/Makefile.inc +++ b/src/arch/msp430fr5969lp/Makefile.inc @@ -5,6 +5,8 @@ MCU = msp430fr5969 cpu_freq ?= 16000000 +MSP430_FLASHER_DIR ?= /home/derf/var/projects/msp430/MSP430Flasher_1.3.7 + INCLUDES += -I/opt/msp430/ti/gcc/include COMMON_FLAGS += -mcpu=${CPU} -mmcu=${MCU} -DMULTIPASS_ARCH_msp430fr5969lp COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C @@ -83,8 +85,8 @@ build/system.hex: build/system.elf ${QUIET}${OBJCOPY} -O ihex ${@:.hex=.elf} $@ program: build/system.hex - ${QUIET}LD_LIBRARY_PATH=/home/derf/var/projects/msp430/MSP430Flasher_1.3.7 \ - /home/derf/var/projects/msp430/MSP430Flasher_1.3.7/MSP430Flasher \ + ${QUIET}LD_LIBRARY_PATH=${MSP430_FLASHER_DIR} \ + ${MSP430_FLASHER_DIR}/MSP430Flasher \ -w build/system.hex -v -g -z '[VCC]' arch_clean: @@ -95,8 +97,10 @@ monitor: ${QUIET}screen /dev/ttyACM1 115200 arch_help: - @echo "msp430fR5969lp specific flags:" - @echo " - none -" + @echo "msp430fr5969lp specific flags:" + @echo " cpu_freq = 16000000 (desired CPU frequency in Hz, not all values are supported)" + @echo " MSP430_FLASHER_DIR = /home/derf/var/projects/msp430/MSP430Flasher_1.3.7" + @echo " (required for flashing, must contain libmsp430.so and MSP430Flasher)" arch_info: @echo "CPU Freq: ${cpu_freq} Hz" diff --git a/src/arch/msp430fr5994lp/Makefile.inc b/src/arch/msp430fr5994lp/Makefile.inc index 2dd0ff4..6dcddf1 100644 --- a/src/arch/msp430fr5994lp/Makefile.inc +++ b/src/arch/msp430fr5994lp/Makefile.inc @@ -5,6 +5,8 @@ MCU = msp430fr5994 cpu_freq ?= 16000000 +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 COMMON_FLAGS += -mcpu=${CPU} -mmcu=${MCU} -DMULTIPASS_ARCH_msp430fr5994lp COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C @@ -87,8 +89,8 @@ build/system.hex: build/system.elf ${QUIET}${OBJCOPY} -O ihex ${@:.hex=.elf} $@ program: build/system.hex - ${QUIET}LD_LIBRARY_PATH=/home/derf/var/projects/msp430/MSP430Flasher_1.3.15 \ - /home/derf/var/projects/msp430/MSP430Flasher_1.3.15/MSP430Flasher \ + ${QUIET}LD_LIBRARY_PATH=${MSP430_FLASHER_DIR} \ + ${MSP430_FLASHER_DIR}/MSP430Flasher \ -w build/system.hex -v -g -z '[VCC]' arch_clean: @@ -99,8 +101,10 @@ monitor: ${QUIET}screen /dev/ttyACM1 115200 arch_help: - @echo "msp430fR5994lp specific flags:" - @echo " - none -" + @echo "msp430fr5994lp specific flags:" + @echo " cpu_freq = 16000000 (desired CPU frequency in Hz, not all values are supported)" + @echo " MSP430_FLASHER_DIR = /home/derf/var/projects/msp430/MSP430Flasher_1.3.15" + @echo " (required for flashing, must contain libmsp430.so and MSP430Flasher)" arch_info: @echo "CPU Freq: ${cpu_freq} Hz" |