Skip to content

Commit 434a180

Browse files
committed
make system updated, libopencm3-template module added
1 parent e8d93ec commit 434a180

File tree

7 files changed

+14
-181
lines changed

7 files changed

+14
-181
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "libopencm3"]
22
path = libopencm3
33
url = https://github.com/libopencm3/libopencm3
4+
[submodule "libopencm3-template"]
5+
path = libopencm3-template
6+
url = https://github.com/libopencm3/libopencm3-template

.profile

Whitespace-only changes.

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ libopencm3-clean:
4444

4545
pwm-build:
4646
@$(CYGWIN_DIR)/bash -c "mkdir -p $(OUTPUT_DIR) $(BUILD_DIR)"
47-
$(CYGWIN_DIR)/bash -e ./compile.sh $(PWD)/pwm V=1 all
47+
$(CYGWIN_DIR)/bash -e ./compile.sh $(PWD)/pwm V=1 $(OUTPUT_DIR)/$(PROJECT).bin $(OUTPUT_DIR)/$(PROJECT).list
4848

4949
pwm-clean:
50-
rm -rf $(PROJECT)/build
50+
rm -rf ./build/$(PROJECT)
5151
$(CYGWIN_DIR)/bash -e ./compile.sh $(CPWD)/pwm V=1 clean
5252

5353
pwm-flash: pwm-build

libopencm3-template

Submodule libopencm3-template added at 9b7d535

pwm/Makefile

+7-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@ OOCD_FILE = board/stm32f4discovery.cfg
3232
VPATH += $(SHARED_DIR)
3333
INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
3434
OPENCM3_DIR=../libopencm3
35+
OPENCM3_TEMPLATE_DIR=../libopencm3-template
3536

3637
include $(OPENCM3_DIR)/mk/genlink-config.mk
37-
include ../rules.mk
38+
include $(OPENCM3_TEMPLATE_DIR)/rules.mk
3839
include $(OPENCM3_DIR)/mk/genlink-rules.mk
40+
41+
$(OUTPUT_DIR)/$(PROJECT).elf: $(OBJS) $(LDSCRIPT) $(LIBDEPS)
42+
@printf " LD\t$@\n"
43+
$(Q)$(LD) $(TGT_LDFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
44+

rules.mk

-177
This file was deleted.

0 commit comments

Comments
 (0)