aboutsummaryrefslogtreecommitdiff
path: root/cc3200/bootmgr
diff options
context:
space:
mode:
authorJohan Hendriks2015-02-28 12:20:04 +0100
committerdanicampora2015-02-28 19:03:17 +0100
commit6a41bf99bdd2e19d6922864bf6845a91b3ab6b99 (patch)
treea67a6e927f6f989743f99204d33ab46443f7cdea /cc3200/bootmgr
parent7711afbb4a0bb4f250ec550591cbfa685af6ff9c (diff)
cc3200: Create separate release/debug build directories
Diffstat (limited to 'cc3200/bootmgr')
-rw-r--r--cc3200/bootmgr/bootgen.sh10
-rw-r--r--cc3200/bootmgr/bootloader.mk4
2 files changed, 11 insertions, 3 deletions
diff --git a/cc3200/bootmgr/bootgen.sh b/cc3200/bootmgr/bootgen.sh
index be495b374..cab5d2087 100644
--- a/cc3200/bootmgr/bootgen.sh
+++ b/cc3200/bootmgr/bootgen.sh
@@ -1,11 +1,19 @@
#!/bin/bash
+if [ "$#" -ne 2 ]; then
+ echo "Usage: bootgen.sh *board type* *build type*"
+ exit 1
+fi
+
+BOARD=$1
+BTYPE=$2
+
# Re-locator Path
RELOCATOR=bootmgr/relocator
# Boot Manager Path
# First parameter passed is the board type
-BOOTMGR=bootmgr/build/$1
+BOOTMGR=bootmgr/build/${BOARD}/${BTYPE}
# Check for re-locator binary
if [ ! -f $RELOCATOR/relocator.bin ]; then
diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk
index 1f687d9b8..143cafa98 100644
--- a/cc3200/bootmgr/bootloader.mk
+++ b/cc3200/bootmgr/bootloader.mk
@@ -1,4 +1,4 @@
-BUILD = bootmgr/build/$(BOARD)
+BUILD = bootmgr/build/$(BOARD)/$(BTYPE)
BOOT_INC = -Ibootmgr
BOOT_INC += -Ibootmgr/sl
@@ -122,7 +122,7 @@ $(BUILD)/bootmgr.bin: $(BUILD)/bootmgr.axf
$(BUILD)/bootloader.bin: $(BUILD)/bootmgr.bin
$(ECHO) "Create $@"
- $(Q)$(SHELL) $(BOOT_GEN) $(BOARD)
+ $(Q)$(SHELL) $(BOOT_GEN) $(BOARD) $(BTYPE)
# Create an empty "qstrdefs.generated.h" needed by py/mkrules.mk
$(HEADER_BUILD)/qstrdefs.generated.h: | $(HEADER_BUILD)