aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann2010-12-29 15:22:39 +0100
committerUwe Hermann2010-12-29 15:22:39 +0100
commit24e9860d304c09f804c392fc3ae530c78de29886 (patch)
treef5b620f8197f3f6c5aaaa26c96f004ba68014b10
parent1c6d7cf06a099294df30ccfd8139bad573140dba (diff)
Drop Paparazzi-specific stuff, deduplicate Makefiles.
-rwxr-xr-xdoo1
-rw-r--r--examples/lisa-m/Makefile5
-rw-r--r--examples/lisa-m/usb_dfu/Makefile74
-rw-r--r--examples/lisa-m/usb_hid/Makefile78
-rw-r--r--examples/stm32-h103/usb_dfu/Makefile74
-rw-r--r--examples/stm32-h103/usb_hid/Makefile77
-rw-r--r--examples/stm32-h103/usb_iap/Makefile77
7 files changed, 8 insertions, 378 deletions
diff --git a/doo b/doo
deleted file mode 100755
index ba3e768..0000000
--- a/doo
+++ /dev/null
@@ -1 +0,0 @@
-PREFIX=/opt/paparazzi/stm32/bin/arm-none-eabi make
diff --git a/examples/lisa-m/Makefile b/examples/lisa-m/Makefile
index c92f799..e8065ee 100644
--- a/examples/lisa-m/Makefile
+++ b/examples/lisa-m/Makefile
@@ -24,14 +24,15 @@ Q := @
MAKEFLAGS += --no-print-directory
endif
+# TODO: Add usb_dfu later, doesn't build at the moment.
all: usb_hid
usb_hid:
- @printf " BUILD examples/stm32-h103/usb_hid\n"
+ @printf " BUILD examples/lisa-m/usb_hid\n"
$(Q)$(MAKE) -C usb_hid
clean:
- @printf " CLEAN examples/stm32-h103/usb_hid\n"
+ @printf " CLEAN examples/lisa-m/usb_hid\n"
$(Q)$(MAKE) -C usb_hid clean
.PHONY: usb_hid clean
diff --git a/examples/lisa-m/usb_dfu/Makefile b/examples/lisa-m/usb_dfu/Makefile
index 775a991..b9ab00a 100644
--- a/examples/lisa-m/usb_dfu/Makefile
+++ b/examples/lisa-m/usb_dfu/Makefile
@@ -19,77 +19,5 @@
BINARY = usbdfu
-# PREFIX ?= arm-none-eabi
-PREFIX ?= arm-elf
-CC = $(PREFIX)-gcc
-LD = $(PREFIX)-gcc
-OBJCOPY = $(PREFIX)-objcopy
-OBJDUMP = $(PREFIX)-objdump
-# Uncomment this line if you want to use the installed (not local) library.
-#TOOLCHAIN_DIR = `dirname \`which $(CC)\``/..
-TOOLCHAIN_DIR = ../../..
-CFLAGS = -O0 -g3 -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
- -mcpu=cortex-m3 -mthumb
-LDSCRIPT = $(BINARY).ld
-LDFLAGS = -L$(TOOLCHAIN_DIR)/lib -T$(LDSCRIPT) -nostartfiles -Wl,--defsym,_stack=0x20001000
-OBJS = $(BINARY).o
-
-OPENOCD_BASE = /usr
-OPENOCD = $(OPENOCD_BASE)/bin/openocd
-OPENOCD_SCRIPTS = $(OPENOCD_BASE)/share/openocd/scripts
-OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/jtagkey.cfg
-OPENOCD_BOARD = $(OPENOCD_SCRIPTS)/target/stm32.cfg
-
-# Be silent per default, but 'make V=1' will show all compiler calls.
-ifneq ($(V),1)
-Q := @
-NULL := 2>/dev/null
-endif
-
-all: images
-
-images: $(BINARY)
- @printf " OBJCOPY $(BINARY).bin\n"
- $(Q)$(OBJCOPY) -Obinary $(BINARY) $(BINARY).bin
- @printf " OBJCOPY $(BINARY).hex\n"
- $(Q)$(OBJCOPY) -Oihex $(BINARY) $(BINARY).hex
- @printf " OBJCOPY $(BINARY).srec\n"
- $(Q)$(OBJCOPY) -Osrec $(BINARY) $(BINARY).srec
- @printf " OBJDUMP $(BINARY).list\n"
- $(Q)$(OBJDUMP) -S $(BINARY) > $(BINARY).list
-
-$(BINARY): $(OBJS) $(LDSCRIPT)
- @printf " LD $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(LD) $(LDFLAGS) -o $(BINARY) $(OBJS) -lopenstm32
-
-%.o: %.c Makefile
- @printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) $(CFLAGS) -o $@ -c $<
-
-clean:
- @printf " CLEAN $(subst $(shell pwd)/,,$(OBJS))\n"
- $(Q)rm -f *.o
- @printf " CLEAN $(BINARY)\n"
- $(Q)rm -f $(BINARY)
- @printf " CLEAN $(BINARY).bin\n"
- $(Q)rm -f $(BINARY).bin
- @printf " CLEAN $(BINARY).hex\n"
- $(Q)rm -f $(BINARY).hex
- @printf " CLEAN $(BINARY).srec\n"
- $(Q)rm -f $(BINARY).srec
- @printf " CLEAN $(BINARY).list\n"
- $(Q)rm -f $(BINARY).list
-
-flash: images
- @printf " FLASH $(BINARY).bin\n"
- @# IMPORTANT: Don't use "resume", only "reset" will work correctly!
- $(Q)$(OPENOCD) -s $(OPENOCD_SCRIPTS) \
- -f $(OPENOCD_FLASHER) \
- -f $(OPENOCD_BOARD) \
- -c "init" -c "reset halt" \
- -c "flash write_image erase $(BINARY).hex" \
- -c "reset" \
- -c "shutdown" $(NULL)
-
-.PHONY: images clean
+include ../../Makefile.include
diff --git a/examples/lisa-m/usb_hid/Makefile b/examples/lisa-m/usb_hid/Makefile
index 10f3d65..ea2018f 100644
--- a/examples/lisa-m/usb_hid/Makefile
+++ b/examples/lisa-m/usb_hid/Makefile
@@ -19,81 +19,5 @@
BINARY = usbhid
-PREFIX=/opt/paparazzi/stm32/bin/arm-none-eabi
-# PREFIX ?= arm-none-eabi
-#PREFIX ?= arm-elf
-CC = $(PREFIX)-gcc
-LD = $(PREFIX)-gcc
-OBJCOPY = $(PREFIX)-objcopy
-OBJDUMP = $(PREFIX)-objdump
-# Uncomment this line if you want to use the installed (not local) library.
-#TOOLCHAIN_DIR = `dirname \`which $(CC)\``/..
-TOOLCHAIN_DIR = ../../..
-CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
- -mcpu=cortex-m3 -mthumb
-LDSCRIPT = $(BINARY).ld
-LDFLAGS = -L$(TOOLCHAIN_DIR)/lib -T$(LDSCRIPT) -nostartfiles
-OBJS = $(BINARY).o
-
-#OPENOCD_BASE = /usr
-OPENOCD_BASE = /opt/paparazzi/stm32
-OPENOCD = $(OPENOCD_BASE)/bin/openocd
-OPENOCD_SCRIPTS = $(OPENOCD_BASE)/share/openocd/scripts
-#OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/openocd-usb.cfg
-OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/jtagkey-tiny.cfg
-#OPENOCD_BOARD = $(OPENOCD_SCRIPTS)/board/paparazzi_lisa_m.cfg
-OPENOCD_BOARD = /opt/paparazzi/stm32/share/openocd/scripts/board/lisa-l.cfg
-
-# Be silent per default, but 'make V=1' will show all compiler calls.
-ifneq ($(V),1)
-Q := @
-NULL := 2>/dev/null
-endif
-
-all: images
-
-images: $(BINARY)
- @printf " OBJCOPY $(BINARY).bin\n"
- $(Q)$(OBJCOPY) -Obinary $(BINARY) $(BINARY).bin
- @printf " OBJCOPY $(BINARY).hex\n"
- $(Q)$(OBJCOPY) -Oihex $(BINARY) $(BINARY).hex
- @printf " OBJCOPY $(BINARY).srec\n"
- $(Q)$(OBJCOPY) -Osrec $(BINARY) $(BINARY).srec
- @printf " OBJDUMP $(BINARY).list\n"
- $(Q)$(OBJDUMP) -S $(BINARY) > $(BINARY).list
-
-$(BINARY): $(OBJS) $(LDSCRIPT)
- @printf " LD $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(LD) $(LDFLAGS) -o $(BINARY) $(OBJS) -lopenstm32
-
-%.o: %.c Makefile
- @printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) $(CFLAGS) -o $@ -c $<
-
-clean:
- @printf " CLEAN $(subst $(shell pwd)/,,$(OBJS))\n"
- $(Q)rm -f *.o
- @printf " CLEAN $(BINARY)\n"
- $(Q)rm -f $(BINARY)
- @printf " CLEAN $(BINARY).bin\n"
- $(Q)rm -f $(BINARY).bin
- @printf " CLEAN $(BINARY).hex\n"
- $(Q)rm -f $(BINARY).hex
- @printf " CLEAN $(BINARY).srec\n"
- $(Q)rm -f $(BINARY).srec
- @printf " CLEAN $(BINARY).list\n"
- $(Q)rm -f $(BINARY).list
-
-flash: images
- @printf " FLASH $(BINARY).bin\n"
- @# IMPORTANT: Don't use "resume", only "reset" will work correctly!
- $(Q)$(OPENOCD) -s $(OPENOCD_SCRIPTS) \
- -f $(OPENOCD_FLASHER) \
- -f $(OPENOCD_BOARD) \
- -c "init" -c "reset halt" \
- -c "flash write_image erase $(BINARY).hex" \
- -c "reset" \
- -c "shutdown" $(NULL)
-
-.PHONY: images clean
+include ../../Makefile.include
diff --git a/examples/stm32-h103/usb_dfu/Makefile b/examples/stm32-h103/usb_dfu/Makefile
index 775a991..b9ab00a 100644
--- a/examples/stm32-h103/usb_dfu/Makefile
+++ b/examples/stm32-h103/usb_dfu/Makefile
@@ -19,77 +19,5 @@
BINARY = usbdfu
-# PREFIX ?= arm-none-eabi
-PREFIX ?= arm-elf
-CC = $(PREFIX)-gcc
-LD = $(PREFIX)-gcc
-OBJCOPY = $(PREFIX)-objcopy
-OBJDUMP = $(PREFIX)-objdump
-# Uncomment this line if you want to use the installed (not local) library.
-#TOOLCHAIN_DIR = `dirname \`which $(CC)\``/..
-TOOLCHAIN_DIR = ../../..
-CFLAGS = -O0 -g3 -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
- -mcpu=cortex-m3 -mthumb
-LDSCRIPT = $(BINARY).ld
-LDFLAGS = -L$(TOOLCHAIN_DIR)/lib -T$(LDSCRIPT) -nostartfiles -Wl,--defsym,_stack=0x20001000
-OBJS = $(BINARY).o
-
-OPENOCD_BASE = /usr
-OPENOCD = $(OPENOCD_BASE)/bin/openocd
-OPENOCD_SCRIPTS = $(OPENOCD_BASE)/share/openocd/scripts
-OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/jtagkey.cfg
-OPENOCD_BOARD = $(OPENOCD_SCRIPTS)/target/stm32.cfg
-
-# Be silent per default, but 'make V=1' will show all compiler calls.
-ifneq ($(V),1)
-Q := @
-NULL := 2>/dev/null
-endif
-
-all: images
-
-images: $(BINARY)
- @printf " OBJCOPY $(BINARY).bin\n"
- $(Q)$(OBJCOPY) -Obinary $(BINARY) $(BINARY).bin
- @printf " OBJCOPY $(BINARY).hex\n"
- $(Q)$(OBJCOPY) -Oihex $(BINARY) $(BINARY).hex
- @printf " OBJCOPY $(BINARY).srec\n"
- $(Q)$(OBJCOPY) -Osrec $(BINARY) $(BINARY).srec
- @printf " OBJDUMP $(BINARY).list\n"
- $(Q)$(OBJDUMP) -S $(BINARY) > $(BINARY).list
-
-$(BINARY): $(OBJS) $(LDSCRIPT)
- @printf " LD $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(LD) $(LDFLAGS) -o $(BINARY) $(OBJS) -lopenstm32
-
-%.o: %.c Makefile
- @printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) $(CFLAGS) -o $@ -c $<
-
-clean:
- @printf " CLEAN $(subst $(shell pwd)/,,$(OBJS))\n"
- $(Q)rm -f *.o
- @printf " CLEAN $(BINARY)\n"
- $(Q)rm -f $(BINARY)
- @printf " CLEAN $(BINARY).bin\n"
- $(Q)rm -f $(BINARY).bin
- @printf " CLEAN $(BINARY).hex\n"
- $(Q)rm -f $(BINARY).hex
- @printf " CLEAN $(BINARY).srec\n"
- $(Q)rm -f $(BINARY).srec
- @printf " CLEAN $(BINARY).list\n"
- $(Q)rm -f $(BINARY).list
-
-flash: images
- @printf " FLASH $(BINARY).bin\n"
- @# IMPORTANT: Don't use "resume", only "reset" will work correctly!
- $(Q)$(OPENOCD) -s $(OPENOCD_SCRIPTS) \
- -f $(OPENOCD_FLASHER) \
- -f $(OPENOCD_BOARD) \
- -c "init" -c "reset halt" \
- -c "flash write_image erase $(BINARY).hex" \
- -c "reset" \
- -c "shutdown" $(NULL)
-
-.PHONY: images clean
+include ../../Makefile.include
diff --git a/examples/stm32-h103/usb_hid/Makefile b/examples/stm32-h103/usb_hid/Makefile
index f280cfb..ea2018f 100644
--- a/examples/stm32-h103/usb_hid/Makefile
+++ b/examples/stm32-h103/usb_hid/Makefile
@@ -19,80 +19,5 @@
BINARY = usbhid
-PREFIX=/opt/paparazzi/stm32/bin/arm-none-eabi
-# PREFIX ?= arm-none-eabi
-#PREFIX ?= arm-elf
-CC = $(PREFIX)-gcc
-LD = $(PREFIX)-gcc
-OBJCOPY = $(PREFIX)-objcopy
-OBJDUMP = $(PREFIX)-objdump
-# Uncomment this line if you want to use the installed (not local) library.
-#TOOLCHAIN_DIR = `dirname \`which $(CC)\``/..
-TOOLCHAIN_DIR = ../../..
-CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
- -mcpu=cortex-m3 -mthumb
-LDSCRIPT = $(BINARY).ld
-LDFLAGS = -L$(TOOLCHAIN_DIR)/lib -T$(LDSCRIPT) -nostartfiles
-OBJS = $(BINARY).o
-
-#OPENOCD_BASE = /usr
-OPENOCD_BASE = /opt/paparazzi/stm32
-OPENOCD = $(OPENOCD_BASE)/bin/openocd
-OPENOCD_SCRIPTS = $(OPENOCD_BASE)/share/openocd/scripts
-#OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/openocd-usb.cfg
-OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/jtagkey-tiny.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)
-Q := @
-NULL := 2>/dev/null
-endif
-
-all: images
-
-images: $(BINARY)
- @printf " OBJCOPY $(BINARY).bin\n"
- $(Q)$(OBJCOPY) -Obinary $(BINARY) $(BINARY).bin
- @printf " OBJCOPY $(BINARY).hex\n"
- $(Q)$(OBJCOPY) -Oihex $(BINARY) $(BINARY).hex
- @printf " OBJCOPY $(BINARY).srec\n"
- $(Q)$(OBJCOPY) -Osrec $(BINARY) $(BINARY).srec
- @printf " OBJDUMP $(BINARY).list\n"
- $(Q)$(OBJDUMP) -S $(BINARY) > $(BINARY).list
-
-$(BINARY): $(OBJS) $(LDSCRIPT)
- @printf " LD $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(LD) $(LDFLAGS) -o $(BINARY) $(OBJS) -lopenstm32
-
-%.o: %.c Makefile
- @printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) $(CFLAGS) -o $@ -c $<
-
-clean:
- @printf " CLEAN $(subst $(shell pwd)/,,$(OBJS))\n"
- $(Q)rm -f *.o
- @printf " CLEAN $(BINARY)\n"
- $(Q)rm -f $(BINARY)
- @printf " CLEAN $(BINARY).bin\n"
- $(Q)rm -f $(BINARY).bin
- @printf " CLEAN $(BINARY).hex\n"
- $(Q)rm -f $(BINARY).hex
- @printf " CLEAN $(BINARY).srec\n"
- $(Q)rm -f $(BINARY).srec
- @printf " CLEAN $(BINARY).list\n"
- $(Q)rm -f $(BINARY).list
-
-flash: images
- @printf " FLASH $(BINARY).bin\n"
- @# IMPORTANT: Don't use "resume", only "reset" will work correctly!
- $(Q)$(OPENOCD) -s $(OPENOCD_SCRIPTS) \
- -f $(OPENOCD_FLASHER) \
- -f $(OPENOCD_BOARD) \
- -c "init" -c "reset halt" \
- -c "flash write_image erase $(BINARY).hex" \
- -c "reset" \
- -c "shutdown" $(NULL)
-
-.PHONY: images clean
+include ../../Makefile.include
diff --git a/examples/stm32-h103/usb_iap/Makefile b/examples/stm32-h103/usb_iap/Makefile
index 195e5da..674de74 100644
--- a/examples/stm32-h103/usb_iap/Makefile
+++ b/examples/stm32-h103/usb_iap/Makefile
@@ -19,80 +19,5 @@
BINARY = usbiap
-PREFIX=/opt/paparazzi/stm32/bin/arm-none-eabi
-# PREFIX ?= arm-none-eabi
-#PREFIX ?= arm-elf
-CC = $(PREFIX)-gcc
-LD = $(PREFIX)-gcc
-OBJCOPY = $(PREFIX)-objcopy
-OBJDUMP = $(PREFIX)-objdump
-# Uncomment this line if you want to use the installed (not local) library.
-#TOOLCHAIN_DIR = `dirname \`which $(CC)\``/..
-TOOLCHAIN_DIR = ../../..
-CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
- -mcpu=cortex-m3 -mthumb
-LDSCRIPT = $(BINARY).ld
-LDFLAGS = -L$(TOOLCHAIN_DIR)/lib -T$(LDSCRIPT) -nostartfiles
-OBJS = $(BINARY).o
-
-#OPENOCD_BASE = /usr
-OPENOCD_BASE = /opt/paparazzi/stm32
-OPENOCD = $(OPENOCD_BASE)/bin/openocd
-OPENOCD_SCRIPTS = $(OPENOCD_BASE)/share/openocd/scripts
-#OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/openocd-usb.cfg
-OPENOCD_FLASHER = $(OPENOCD_SCRIPTS)/interface/jtagkey-tiny.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)
-Q := @
-NULL := 2>/dev/null
-endif
-
-all: images
-
-images: $(BINARY)
- @printf " OBJCOPY $(BINARY).bin\n"
- $(Q)$(OBJCOPY) -Obinary $(BINARY) $(BINARY).bin
- @printf " OBJCOPY $(BINARY).hex\n"
- $(Q)$(OBJCOPY) -Oihex $(BINARY) $(BINARY).hex
- @printf " OBJCOPY $(BINARY).srec\n"
- $(Q)$(OBJCOPY) -Osrec $(BINARY) $(BINARY).srec
- @printf " OBJDUMP $(BINARY).list\n"
- $(Q)$(OBJDUMP) -S $(BINARY) > $(BINARY).list
-
-$(BINARY): $(OBJS) $(LDSCRIPT)
- @printf " LD $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(LD) $(LDFLAGS) -o $(BINARY) $(OBJS) -lopenstm32
-
-%.o: %.c Makefile
- @printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) $(CFLAGS) -o $@ -c $<
-
-clean:
- @printf " CLEAN $(subst $(shell pwd)/,,$(OBJS))\n"
- $(Q)rm -f *.o
- @printf " CLEAN $(BINARY)\n"
- $(Q)rm -f $(BINARY)
- @printf " CLEAN $(BINARY).bin\n"
- $(Q)rm -f $(BINARY).bin
- @printf " CLEAN $(BINARY).hex\n"
- $(Q)rm -f $(BINARY).hex
- @printf " CLEAN $(BINARY).srec\n"
- $(Q)rm -f $(BINARY).srec
- @printf " CLEAN $(BINARY).list\n"
- $(Q)rm -f $(BINARY).list
-
-flash: images
- @printf " FLASH $(BINARY).bin\n"
- @# IMPORTANT: Don't use "resume", only "reset" will work correctly!
- $(Q)$(OPENOCD) -s $(OPENOCD_SCRIPTS) \
- -f $(OPENOCD_FLASHER) \
- -f $(OPENOCD_BOARD) \
- -c "init" -c "reset halt" \
- -c "flash write_image erase $(BINARY).hex" \
- -c "reset" \
- -c "shutdown" $(NULL)
-
-.PHONY: images clean
+include ../../Makefile.includes