From e5fb750378eadbb0f2d931f8a3478e011a4d21e9 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Thu, 31 Dec 2009 00:17:38 +0100 Subject: Modularize OpenOCD paths in the example Makefiles. --- examples/fancyblink/Makefile | 12 +++++++++--- examples/miniblink/Makefile | 12 +++++++++--- examples/usart/Makefile | 12 +++++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) (limited to 'examples') diff --git a/examples/fancyblink/Makefile b/examples/fancyblink/Makefile index 5dff6b2..e2bc0db1 100644 --- a/examples/fancyblink/Makefile +++ b/examples/fancyblink/Makefile @@ -33,7 +33,12 @@ CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ LDSCRIPT = $(BINARY).ld LDFLAGS = -L$(TOOLCHAIN_DIR)/lib -T$(LDSCRIPT) -nostartfiles OBJS = $(BINARY).o -OPENOCD = openocd + +OPENOCD_BASE = /usr +OPENOCD = $(OPENOCD_BASE)/bin/openocd +OPENOCD_SCRIPTS = $(OPENOCD_BASE)/share/openocd/scripts +OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/parport.cfg +OPENOCD_BOARD = $(OPENOCD_SCRIPTS)/board/olimex_stm32_h103.cfg # Be silent per default, but 'make V=1' will show all compiler calls. ifneq ($(V),1) @@ -78,8 +83,9 @@ clean: flash: images @printf " FLASH $(BINARY).bin\n" @# IMPORTANT: Don't use "resume", only "reset" will work correctly! - $(Q)$(OPENOCD) -f interface/jtagkey-tiny.cfg \ - -f board/olimex_stm32_h103.cfg \ + $(Q)$(OPENOCD) -s $(OPENOCD_SCRIPTS) \ + -f $(OPENOCD_FLASHER) \ + -f $(OPENOCD_BOARD) \ -c "init" -c "reset halt" \ -c "flash write_image erase $(BINARY).bin 0x08000000" \ -c "reset" \ diff --git a/examples/miniblink/Makefile b/examples/miniblink/Makefile index 13b0b0c..803b007 100644 --- a/examples/miniblink/Makefile +++ b/examples/miniblink/Makefile @@ -33,7 +33,12 @@ CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ LDSCRIPT = $(BINARY).ld LDFLAGS = -L$(TOOLCHAIN_DIR)/lib -T$(LDSCRIPT) -nostartfiles OBJS = $(BINARY).o -OPENOCD = openocd + +OPENOCD_BASE = /usr +OPENOCD = $(OPENOCD_BASE)/bin/openocd +OPENOCD_SCRIPTS = $(OPENOCD_BASE)/share/openocd/scripts +OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/parport.cfg +OPENOCD_BOARD = $(OPENOCD_SCRIPTS)/board/olimex_stm32_h103.cfg # Be silent per default, but 'make V=1' will show all compiler calls. ifneq ($(V),1) @@ -78,8 +83,9 @@ clean: flash: images @printf " FLASH $(BINARY).bin\n" @# IMPORTANT: Don't use "resume", only "reset" will work correctly! - $(Q)$(OPENOCD) -f interface/jtagkey-tiny.cfg \ - -f board/olimex_stm32_h103.cfg \ + $(Q)$(OPENOCD) -s $(OPENOCD_SCRIPTS) \ + -f $(OPENOCD_FLASHER) \ + -f $(OPENOCD_BOARD) \ -c "init" -c "reset halt" \ -c "flash write_image erase $(BINARY).bin 0x08000000" \ -c "reset" \ diff --git a/examples/usart/Makefile b/examples/usart/Makefile index ef32191..8593399 100644 --- a/examples/usart/Makefile +++ b/examples/usart/Makefile @@ -33,7 +33,12 @@ CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ LDSCRIPT = $(BINARY).ld LDFLAGS = -L$(TOOLCHAIN_DIR)/lib -T$(LDSCRIPT) -nostartfiles OBJS = $(BINARY).o -OPENOCD = openocd + +OPENOCD_BASE = /usr +OPENOCD = $(OPENOCD_BASE)/bin/openocd +OPENOCD_SCRIPTS = $(OPENOCD_BASE)/share/openocd/scripts +OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/parport.cfg +OPENOCD_BOARD = $(OPENOCD_SCRIPTS)/board/olimex_stm32_h103.cfg # Be silent per default, but 'make V=1' will show all compiler calls. ifneq ($(V),1) @@ -78,8 +83,9 @@ clean: flash: images @printf " FLASH $(BINARY).bin\n" @# IMPORTANT: Don't use "resume", only "reset" will work correctly! - $(Q)$(OPENOCD) -f interface/jtagkey-tiny.cfg \ - -f board/olimex_stm32_h103.cfg \ + $(Q)$(OPENOCD) -s $(OPENOCD_SCRIPTS) \ + -f $(OPENOCD_FLASHER) \ + -f $(OPENOCD_BOARD) \ -c "init" -c "reset halt" \ -c "flash write_image erase $(BINARY).bin 0x08000000" \ -c "reset" \ -- cgit v1.2.3