diff options
| author | root <root@lamia.panaceas.james.local> | 2015-09-07 12:01:10 +0100 |
|---|---|---|
| committer | root <root@lamia.panaceas.james.local> | 2015-09-07 12:01:10 +0100 |
| commit | 66dee77d69889528d3d755e7fd19005bdd57a077 (patch) | |
| tree | 3556ed265d033c797fe9cd9df95722d33ce17861 | |
| parent | b4902aa6f9bbc070d70bb843e3e4725b890e9f33 (diff) | |
| download | bracelet-66dee77d69889528d3d755e7fd19005bdd57a077.tar.gz bracelet-66dee77d69889528d3d755e7fd19005bdd57a077.tar.bz2 bracelet-66dee77d69889528d3d755e7fd19005bdd57a077.zip | |
fish
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | bootloader/Makefile | 18 | ||||
| m--------- | bootloader/sdk-9.0.0 | 0 |
3 files changed, 13 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index f593d55..88c4f11 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "bootloader/sdk-9.0.0"] - path = bootloader/sdk-9.0.0 - url = ssh://git@git.panaceas.org/git/nRF51/sdk-9.0.0 [submodule "sdk-9.0.0"] path = sdk-9.0.0 url = ssh://git@git.panaceas.org/git/nRF51/sdk-9.0.0 diff --git a/bootloader/Makefile b/bootloader/Makefile index aca0d7f..1468a82 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -22,9 +22,9 @@ LDFLAGS= ASFLAGS= INCLUDES= -SDK=sdk-9.0.0 +SDK=../sdk-9.0.0 -BDADDR=FD:F9:62:4A:8A:C8 +#BDADDR=FD:F9:62:4A:8A:C8 SDKCSRCS= \ @@ -69,7 +69,7 @@ SD_REQ=0xFFFE LINKER_SCRIPT=dfu_gcc_nrf51.ld -INCLUDES += -Isdk-config -I${SDK} -I. +INCLUDES += -Isdk-config -I${SDK} -I. -I.. OOCD=openocd OOCD_CFG=openocd.cfg @@ -113,7 +113,7 @@ ASFLAGS += -x assembler-with-cpp CPPFLAGS=$(DEFINES) $(INCLUDES) -OBJS=${CSRCS:%.c=%.o} ${SDKCSRCS:%.c=${SDK}/sdk/%.o} ${SDKSSRCS:%.s=${SDK}/sdk/%.o} +OBJS=${CSRCS:%.c=%.o} ${SDKCSRCS:%.c=sdk-bin/%.o} ${SDKSSRCS:%.s=sdk-bin/%.o} default: ${PROG}.hex @@ -136,10 +136,18 @@ twongle.o:twongle.c %.o:%.c $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< -%.o:%.s +sdk-bin/%.o:${SDK}/sdk/%.s + @-mkdir -p $@ + @-rmdir $@ $(CC) $(CPPFLAGS) $(ASFLAGS) -c -o $@ $< +sdk-bin/%.o:${SDK}/sdk/%.c + @-mkdir -p $@ + @-rmdir $@ + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + + flash: ${PROG}.hex ${OOCD} -f ${OOCD_CFG} \ -c "init" -c "reset init" \ diff --git a/bootloader/sdk-9.0.0 b/bootloader/sdk-9.0.0 deleted file mode 160000 -Subproject d96e8db9d9a551fb861ca53c3a3ada99dd19c57 |