diff --git a/HACKING b/HACKING index 6a2a877d..70f34fdb 100644 --- a/HACKING +++ b/HACKING @@ -30,7 +30,7 @@ Development guidelines - The name should be of the form SUBSYSTEM_REGISTER_BIT, e.g. ADC_CR2_DMA, where ADC is the subsystem name, CR2 is the register NAME, and DMA is the name of the bit in the register that is defined. - + - All subsystem-specific function names should be prefixed with the subsystem name. For example, gpio_set_mode() or rcc_osc_on(). diff --git a/examples/Makefile.include b/examples/Makefile.include index 53cf598f..9677067f 100644 --- a/examples/Makefile.include +++ b/examples/Makefile.include @@ -94,24 +94,25 @@ ifeq ($(OOCD_SERIAL),) @printf " FLASH $<\n" @# IMPORTANT: Don't use "resume", only "reset" will work correctly! $(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \ - -f board/$(OOCD_BOARD).cfg \ - -c "init" -c "reset init" \ - -c "stm32x mass_erase 0" \ - -c "flash write_image $(*).hex" \ - -c "reset" \ - -c "shutdown" $(NULL) + -f board/$(OOCD_BOARD).cfg \ + -c "init" -c "reset init" \ + -c "stm32x mass_erase 0" \ + -c "flash write_image $(*).hex" \ + -c "reset" \ + -c "shutdown" $(NULL) else %.flash: %.hex @printf " FLASH $<\n" @# IMPORTANT: Don't use "resume", only "reset" will work correctly! $(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \ - -f board/$(OOCD_BOARD).cfg \ - -c "ft2232_serial $(OOCD_SERIAL)" \ - -c "init" -c "reset init" \ - -c "stm32x mass_erase 0" \ - -c "flash write_image $(*).hex" \ - -c "reset" \ - -c "shutdown" $(NULL) + -f board/$(OOCD_BOARD).cfg \ + -c "ft2232_serial $(OOCD_SERIAL)" \ + -c "init" -c "reset init" \ + -c "stm32x mass_erase 0" \ + -c "flash write_image $(*).hex" \ + -c "reset" \ + -c "shutdown" $(NULL) endif .PHONY: images clean + diff --git a/examples/lisa-m/usb_dfu/Makefile b/examples/lisa-m/usb_dfu/Makefile index b9ab00a9..183b7c8a 100644 --- a/examples/lisa-m/usb_dfu/Makefile +++ b/examples/lisa-m/usb_dfu/Makefile @@ -17,7 +17,7 @@ ## along with this program. If not, see . ## -BINARY = usbdfu +BINARY = usbdfu include ../../Makefile.include diff --git a/examples/lisa-m/usb_hid/Makefile b/examples/lisa-m/usb_hid/Makefile index ea2018fc..79674678 100644 --- a/examples/lisa-m/usb_hid/Makefile +++ b/examples/lisa-m/usb_hid/Makefile @@ -17,7 +17,7 @@ ## along with this program. If not, see . ## -BINARY = usbhid +BINARY = usbhid include ../../Makefile.include diff --git a/examples/mb525/fancyblink/Makefile b/examples/mb525/fancyblink/Makefile index a712cc44..09aff6f3 100644 --- a/examples/mb525/fancyblink/Makefile +++ b/examples/mb525/fancyblink/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = fancyblink +BINARY = fancyblink include ../../Makefile.include + diff --git a/examples/mb525/pwmleds/Makefile b/examples/mb525/pwmleds/Makefile index 241e1faf..a6f9f4e5 100644 --- a/examples/mb525/pwmleds/Makefile +++ b/examples/mb525/pwmleds/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = pwmleds +BINARY = pwmleds include ../../Makefile.include + diff --git a/examples/obldc/can/Makefile b/examples/obldc/can/Makefile index 397a4453..4d9fd570 100644 --- a/examples/obldc/can/Makefile +++ b/examples/obldc/can/Makefile @@ -20,3 +20,4 @@ BINARY = can include ../../Makefile.include + diff --git a/examples/obldc/led/Makefile b/examples/obldc/led/Makefile index 40d30f3e..665cd45f 100644 --- a/examples/obldc/led/Makefile +++ b/examples/obldc/led/Makefile @@ -20,3 +20,4 @@ BINARY = led include ../../Makefile.include + diff --git a/examples/obldc/systick/Makefile b/examples/obldc/systick/Makefile index a83b7ff6..f08d0851 100644 --- a/examples/obldc/systick/Makefile +++ b/examples/obldc/systick/Makefile @@ -20,3 +20,4 @@ BINARY = systick include ../../Makefile.include + diff --git a/examples/obldc/usart/Makefile b/examples/obldc/usart/Makefile index 6484117a..75050cd8 100644 --- a/examples/obldc/usart/Makefile +++ b/examples/obldc/usart/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = usart +BINARY = usart include ../../Makefile.include + diff --git a/examples/obldc/usart_irq/Makefile b/examples/obldc/usart_irq/Makefile index 1c0a6c26..eba2bb58 100644 --- a/examples/obldc/usart_irq/Makefile +++ b/examples/obldc/usart_irq/Makefile @@ -22,3 +22,4 @@ BINARY = usart_irq OOCD_BOARD = open-bldc include ../../Makefile.include + diff --git a/examples/other/adc_temperature_sensor/Makefile b/examples/other/adc_temperature_sensor/Makefile index 2b26a1be..c5020db3 100644 --- a/examples/other/adc_temperature_sensor/Makefile +++ b/examples/other/adc_temperature_sensor/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = adc +BINARY = adc include ../../Makefile.include + diff --git a/examples/other/dma_mem2mem/Makefile b/examples/other/dma_mem2mem/Makefile index b92e3951..ea782136 100644 --- a/examples/other/dma_mem2mem/Makefile +++ b/examples/other/dma_mem2mem/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = dma +BINARY = dma include ../../Makefile.include + diff --git a/examples/other/dogm128/Makefile b/examples/other/dogm128/Makefile index 158b33b8..74ec0e5c 100644 --- a/examples/other/dogm128/Makefile +++ b/examples/other/dogm128/Makefile @@ -17,8 +17,9 @@ ## along with this program. If not, see . ## -BINARY = main +BINARY = main OBJS = dogm128.o include ../../Makefile.include + diff --git a/examples/other/i2c_stts75_sensor/Makefile b/examples/other/i2c_stts75_sensor/Makefile index 6ca704e3..32ee0660 100644 --- a/examples/other/i2c_stts75_sensor/Makefile +++ b/examples/other/i2c_stts75_sensor/Makefile @@ -17,8 +17,9 @@ ## along with this program. If not, see . ## -BINARY = i2c_stts75_sensor +BINARY = i2c_stts75_sensor OBJS = stts75.o include ../../Makefile.include + diff --git a/examples/other/rtc/Makefile b/examples/other/rtc/Makefile index 10fa5af0..d74946f0 100644 --- a/examples/other/rtc/Makefile +++ b/examples/other/rtc/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = rtc +BINARY = rtc include ../../Makefile.include + diff --git a/examples/other/systick/Makefile b/examples/other/systick/Makefile index 20c889f1..f08d0851 100644 --- a/examples/other/systick/Makefile +++ b/examples/other/systick/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = systick +BINARY = systick include ../../Makefile.include + diff --git a/examples/other/timer_interrupt/Makefile b/examples/other/timer_interrupt/Makefile index c4cd3b69..f6721e90 100644 --- a/examples/other/timer_interrupt/Makefile +++ b/examples/other/timer_interrupt/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = timer +BINARY = timer include ../../Makefile.include + diff --git a/examples/other/usb_cdcacm/Makefile b/examples/other/usb_cdcacm/Makefile index 1ca37fcd..ab55ba22 100644 --- a/examples/other/usb_cdcacm/Makefile +++ b/examples/other/usb_cdcacm/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = cdcacm +BINARY = cdcacm include ../../Makefile.include + diff --git a/examples/other/usb_dfu/Makefile b/examples/other/usb_dfu/Makefile index 9b107aa6..183b7c8a 100644 --- a/examples/other/usb_dfu/Makefile +++ b/examples/other/usb_dfu/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = usbdfu +BINARY = usbdfu include ../../Makefile.include + diff --git a/examples/other/usb_hid/Makefile b/examples/other/usb_hid/Makefile index 378a374c..79674678 100644 --- a/examples/other/usb_hid/Makefile +++ b/examples/other/usb_hid/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = usbhid +BINARY = usbhid include ../../Makefile.include + diff --git a/examples/stm32-h103/fancyblink/Makefile b/examples/stm32-h103/fancyblink/Makefile index a712cc44..09aff6f3 100644 --- a/examples/stm32-h103/fancyblink/Makefile +++ b/examples/stm32-h103/fancyblink/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = fancyblink +BINARY = fancyblink include ../../Makefile.include + diff --git a/examples/stm32-h103/miniblink/Makefile b/examples/stm32-h103/miniblink/Makefile index 37c70fdf..cbbded6b 100644 --- a/examples/stm32-h103/miniblink/Makefile +++ b/examples/stm32-h103/miniblink/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = miniblink +BINARY = miniblink include ../../Makefile.include + diff --git a/examples/stm32-h103/spi/Makefile b/examples/stm32-h103/spi/Makefile index 1e229195..a63e92df 100644 --- a/examples/stm32-h103/spi/Makefile +++ b/examples/stm32-h103/spi/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = spi +BINARY = spi include ../../Makefile.include + diff --git a/examples/stm32-h103/usart/Makefile b/examples/stm32-h103/usart/Makefile index 6484117a..75050cd8 100644 --- a/examples/stm32-h103/usart/Makefile +++ b/examples/stm32-h103/usart/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = usart +BINARY = usart include ../../Makefile.include + diff --git a/examples/stm32-h103/usb_cdcacm/Makefile b/examples/stm32-h103/usb_cdcacm/Makefile index 1ca37fcd..ab55ba22 100644 --- a/examples/stm32-h103/usb_cdcacm/Makefile +++ b/examples/stm32-h103/usb_cdcacm/Makefile @@ -17,6 +17,7 @@ ## along with this program. If not, see . ## -BINARY = cdcacm +BINARY = cdcacm include ../../Makefile.include + diff --git a/examples/stm32-h103/usb_dfu/Makefile b/examples/stm32-h103/usb_dfu/Makefile index b9ab00a9..183b7c8a 100644 --- a/examples/stm32-h103/usb_dfu/Makefile +++ b/examples/stm32-h103/usb_dfu/Makefile @@ -17,7 +17,7 @@ ## along with this program. If not, see . ## -BINARY = usbdfu +BINARY = usbdfu include ../../Makefile.include diff --git a/examples/stm32-h103/usb_hid/Makefile b/examples/stm32-h103/usb_hid/Makefile index ea2018fc..79674678 100644 --- a/examples/stm32-h103/usb_hid/Makefile +++ b/examples/stm32-h103/usb_hid/Makefile @@ -17,7 +17,7 @@ ## along with this program. If not, see . ## -BINARY = usbhid +BINARY = usbhid include ../../Makefile.include diff --git a/examples/stm32-h103/usb_iap/Makefile b/examples/stm32-h103/usb_iap/Makefile index 674de74b..9c93f91b 100644 --- a/examples/stm32-h103/usb_iap/Makefile +++ b/examples/stm32-h103/usb_iap/Makefile @@ -17,7 +17,7 @@ ## along with this program. If not, see . ## -BINARY = usbiap +BINARY = usbiap include ../../Makefile.includes