diff options
| author | danicampora | 2015-10-28 11:09:45 +0100 |
|---|---|---|
| committer | danicampora | 2015-10-28 11:09:45 +0100 |
| commit | f3b1a933fc148454e00188b46292f85d5fadafd5 (patch) | |
| tree | f4374c341e802c19aa8ee96982f6bc603f0135b4 /cc3200/bootmgr | |
| parent | a0fb7a76cd335ad4cae118a0fec731d748ec94c6 (diff) | |
cc3200: Actually allow to specify a custom build directory.
Diffstat (limited to 'cc3200/bootmgr')
| -rw-r--r-- | cc3200/bootmgr/bootgen.sh | 12 | ||||
| -rw-r--r-- | cc3200/bootmgr/bootloader.mk | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/cc3200/bootmgr/bootgen.sh b/cc3200/bootmgr/bootgen.sh index cab5d2087..f4bf32540 100644 --- a/cc3200/bootmgr/bootgen.sh +++ b/cc3200/bootmgr/bootgen.sh @@ -1,19 +1,17 @@ #!/bin/bash -if [ "$#" -ne 2 ]; then - echo "Usage: bootgen.sh *board type* *build type*" +if [ "$#" -ne 1 ]; then + echo "Usage: bootgen.sh *build dir*" exit 1 fi -BOARD=$1 -BTYPE=$2 +BUILD=$1 # Re-locator Path RELOCATOR=bootmgr/relocator -# Boot Manager Path -# First parameter passed is the board type -BOOTMGR=bootmgr/build/${BOARD}/${BTYPE} +# Build location +BOOTMGR=${BUILD} # Check for re-locator binary if [ ! -f $RELOCATOR/relocator.bin ]; then diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk index 3105d6666..a97f888ed 100644 --- a/cc3200/bootmgr/bootloader.mk +++ b/cc3200/bootmgr/bootloader.mk @@ -124,7 +124,7 @@ $(BUILD)/bootmgr.bin: $(BUILD)/bootmgr.axf $(BUILD)/bootloader.bin: $(BUILD)/bootmgr.bin $(ECHO) "Create $@" - $(Q)$(SHELL) $(BOOT_GEN) $(BOARD) $(BTYPE) + $(Q)$(SHELL) $(BOOT_GEN) $(BUILD) # Create an empty "qstrdefs.generated.h" needed by py/mkrules.mk $(HEADER_BUILD)/qstrdefs.generated.h: | $(HEADER_BUILD) |