Browse Source

move some more generic infra over

main
John-Mark Gurney 2 years ago
parent
commit
e3655696da
2 changed files with 9 additions and 7 deletions
  1. +1
    -7
      Makefile
  2. +8
    -0
      mk/mu.progs.mk

+ 1
- 7
Makefile View File

@@ -71,13 +71,7 @@ LIBSYOTE_TEST = libsyote_test.$(SOEXT)
$(LIBSYOTE_TEST): $(LIBSYOTE_TEST_OBJS) $(LIBSYOTE_TEST): $(LIBSYOTE_TEST_OBJS)
$(CC) -shared -o $@ $(.ALLSRC) $(CC) -shared -o $@ $(.ALLSRC)


DEPENDS = .arm_deps .test_deps
.PHONY: $(DEPENDS)
depend: $(DEPENDS)

.for i in $(DEPENDS)
.sinclude "$i"
.endfor
DEPENDS = .test_deps


# Temporarily disabled as OpenOCD can't program EEPROM on the STM32L1. # Temporarily disabled as OpenOCD can't program EEPROM on the STM32L1.
# This could be used to add the data to flash. # This could be used to add the data to flash.


+ 8
- 0
mk/mu.progs.mk View File

@@ -6,8 +6,16 @@ ALLTGTS+= $(i)$(PROGEXT) $(i).list
ASRCS.$(i) = $(SRCS) $(SRCS.$(i)) ASRCS.$(i) = $(SRCS) $(SRCS.$(i))
OBJS.$(i) = $(ASRCS.$(i):C/.c$/.o/) OBJS.$(i) = $(ASRCS.$(i):C/.c$/.o/)


DEPENDS += .arm_deps

.arm_deps: $(ASRCS.$(i)) .arm_deps: $(ASRCS.$(i))


.PHONY: depend
depend: $(DEPENDS)

.for i in $(DEPENDS)
.sinclude "$i"
.endfor
$(i)$(PROGEXT) $(i).map: $(OBJS.$(i)) $(i)$(PROGEXT) $(i).map: $(OBJS.$(i))
$(ARMCC) $(ARMTARGET) -o $(i)$(PROGEXT) $(.ALLSRC) -T$(LINKER_SCRIPT) --specs=nosys.specs -Wl,-Map="$(i).map" -Wl,--gc-sections -static --specs=nano.specs -Wl,--start-group -lc -lm -Wl,--end-group $(ARMCC) $(ARMTARGET) -o $(i)$(PROGEXT) $(.ALLSRC) -T$(LINKER_SCRIPT) --specs=nosys.specs -Wl,-Map="$(i).map" -Wl,--gc-sections -static --specs=nano.specs -Wl,--start-group -lc -lm -Wl,--end-group




Loading…
Cancel
Save