diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-03-02 11:26:14 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-03-02 11:26:14 -0500 |
| commit | 9430fea2c551dad91815df021510a19190df6d97 (patch) | |
| tree | ef461fe8867f3329ff0f372847a914af20104265 /src/stm32f1/Makefile | |
| parent | 309a47c7810bf55d993210c2da014ede7dae8a87 (diff) | |
| download | kutter-9430fea2c551dad91815df021510a19190df6d97.tar.gz kutter-9430fea2c551dad91815df021510a19190df6d97.tar.xz kutter-9430fea2c551dad91815df021510a19190df6d97.zip | |
Makefile: Fix lpc176x and stm32f1 builds
Commit e18501d0 broke the build for targets that added objects to
klipper.elf via adding dependencies. Rework the build so that it is
possible to add objects to klipper.elf via a new OBJS_klipper.elf
makefile variable.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/stm32f1/Makefile')
| -rw-r--r-- | src/stm32f1/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/stm32f1/Makefile b/src/stm32f1/Makefile index 925038c2..12a60c2e 100644 --- a/src/stm32f1/Makefile +++ b/src/stm32f1/Makefile @@ -12,9 +12,6 @@ CFLAGS += -Ilib/cmsis-core CFLAGS += -Ilib/cmsis-stm32f1/include -Ilib/hal-stm32f1/include CFLAGS += -DSTM32F103xB -CFLAGS_klipper.elf += -T $(OUT)stm32f1.ld -CFLAGS_klipper.elf += --specs=nano.specs --specs=nosys.specs - # Add source files src-y += stm32f1/main.c stm32f1/gpio.c src-$(CONFIG_HAVE_GPIO_ADC) += stm32f1/adc.c @@ -24,22 +21,24 @@ src-y += generic/crc16_ccitt.c generic/armcm_irq.c generic/armcm_timer.c src-y += ../lib/cmsis-stm32f1/source/system_stm32f1xx.c src-$(CONFIG_USBSERIAL) += stm32f1/usbserial.c generic/usb_cdc.c src-$(CONFIG_SERIAL) += stm32f1/serial.c generic/serial_irq.c -asmsrc-y = ../lib/cmsis-stm32f1/source/startup_stm32f103xb.s # Add assembler build rules $(OUT)%.o: %.s $(OUT)autoconf.h $(OUT)board-link @echo " Assembling $@" $(Q)$(AS) $< -o $@ -$(OUT)klipper.elf: $(patsubst %.s, $(OUT)src/%.o,$(asmsrc-y)) +asmsrc-y = ../lib/cmsis-stm32f1/source/startup_stm32f103xb.s +OBJS_klipper.elf += $(patsubst %.s, $(OUT)src/%.o,$(asmsrc-y)) # Build the linker script -target-y := $(OUT)stm32f1.ld $(target-y) - $(OUT)stm32f1.ld: src/stm32f1/stm32f1.ld $(OUT)board-link @echo " Preprocessing $@" $(Q)$(CPP) -P -MD -MT $@ -DFLASH_START=$(CONFIG_FLASH_START) $< -o $@ +CFLAGS_klipper.elf += -T $(OUT)stm32f1.ld +CFLAGS_klipper.elf += --specs=nano.specs --specs=nosys.specs +$(OUT)klipper.elf : $(OUT)stm32f1.ld + # Binary output file rules target-y += $(OUT)klipper.bin |