automate building cbor

This commit is contained in:
yparitcher 2019-01-06 23:41:12 -05:00
parent 6c6f0a0068
commit ee817ea8bb
No known key found for this signature in database
GPG Key ID: FC78BE8055D48472
2 changed files with 3 additions and 10 deletions

View File

@ -24,12 +24,6 @@ Enter the `stm32l4xx` target directory.
cd targets/stm32l432 cd targets/stm32l432
``` ```
Build the cbor library.
```bash
make cbor
```
Now build Solo. Now build Solo.
``` ```

View File

@ -30,14 +30,14 @@ boot-sig-checking:
boot-no-sig: boot-no-sig:
$(MAKE) -f $(BOOTMAKE) -j8 bootloader.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DSOLO_HACKER' DEBUG=0 $(MAKE) -f $(BOOTMAKE) -j8 bootloader.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DSOLO_HACKER' DEBUG=0
build-release-locked: clean2 boot-sig-checking clean all-locked build-release-locked: cbor clean2 boot-sig-checking clean all-locked
$(merge_hex) solo.hex bootloader.hex all.hex $(merge_hex) solo.hex bootloader.hex all.hex
rm -f solo.hex bootloader.hex # don't program solo.hex ... rm -f solo.hex bootloader.hex # don't program solo.hex ...
build-release: clean2 boot-sig-checking clean all build-release: cbor clean2 boot-sig-checking clean all
$(merge_hex) solo.hex bootloader.hex all.hex $(merge_hex) solo.hex bootloader.hex all.hex
build-hacker: clean2 boot-no-sig clean all-hacker build-hacker: cbor clean2 boot-no-sig clean all-hacker
$(merge_hex) solo.hex bootloader.hex all.hex $(merge_hex) solo.hex bootloader.hex all.hex
build-debugboot: clean2 debugboot-boot clean debugboot-app build-debugboot: clean2 debugboot-boot clean debugboot-app
@ -81,7 +81,6 @@ cbor:
$(MAKE) -f application.mk -j8 cbor $(MAKE) -f application.mk -j8 cbor
test: test:
$(MAKE) cbor
$(VENV) $(MAKE) build-release-locked $(VENV) $(MAKE) build-release-locked
$(VENV) $(MAKE) build-release $(VENV) $(MAKE) build-release
$(VENV) $(MAKE) build-hacker $(VENV) $(MAKE) build-hacker