diff options
| -rw-r--r-- | cc3200/application.mk | 2 | ||||
| -rw-r--r-- | cc3200/appsign.sh | 10 | ||||
| -rw-r--r-- | cc3200/bootmgr/bootgen.sh | 12 | ||||
| -rw-r--r-- | cc3200/bootmgr/bootloader.mk | 2 |
4 files changed, 10 insertions, 16 deletions
diff --git a/cc3200/application.mk b/cc3200/application.mk index 9d1db6134..600d21d5d 100644 --- a/cc3200/application.mk +++ b/cc3200/application.mk @@ -239,7 +239,7 @@ $(BUILD)/application.bin: $(BUILD)/application.axf $(BUILD)/mcuimg.bin: $(BUILD)/application.bin $(ECHO) "Create $@" - $(Q)$(SHELL) $(APP_SIGN) $(BOARD) $(BTYPE) + $(Q)$(SHELL) $(APP_SIGN) $(BUILD) MAKE_PINS = boards/make-pins.py BOARD_PINS = boards/$(BOARD)/pins.csv diff --git a/cc3200/appsign.sh b/cc3200/appsign.sh index 39db708b5..3906433e8 100644 --- a/cc3200/appsign.sh +++ b/cc3200/appsign.sh @@ -1,16 +1,12 @@ #!/bin/bash -if [ "$#" -ne 2 ]; then - echo "Usage: appsign.sh *board type* *build type*" +if [ "$#" -ne 1 ]; then + echo "Usage: appsign.sh *build dir*" exit 1 fi -BOARD=$1 -BTYPE=$2 - # Build location -# Based on build type and board type -BUILD=build/${BOARD}/${BTYPE} +BUILD=$1 # Generate the MD5 hash echo -n `md5sum --binary $BUILD/application.bin | awk '{ print $1 }'` > __md5hash.bin 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) |