diff options
| author | hathach <thach@tinyusb.org> | 2018-06-27 15:11:50 +0700 |
|---|---|---|
| committer | hathach <thach@tinyusb.org> | 2018-06-27 15:13:20 +0700 |
| commit | 8fbe1d73e9b65611c64aa01443ec5db692049cf8 (patch) | |
| tree | c2b33395a1275f804298cbee48d073b290b3223a | |
| parent | 4920cc47caa4ec254a54189200715fb3c369046e (diff) | |
clean up makefile
| -rw-r--r-- | ports/nrf/Makefile | 14 | ||||
| -rw-r--r-- | ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld (renamed from ports/nrf/boards/feather52840/bluefruit_nrf52840_s140_6.0.0.ld) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52840/mpconfigboard.mk | 4 | ||||
| -rw-r--r-- | ports/nrf/boards/pca10056/mpconfigboard.mk | 8 |
4 files changed, 12 insertions, 14 deletions
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 58c4afb10..6affbfbc1 100644 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -307,27 +307,27 @@ __check_defined = \ $(if $(value $1),, \ $(error Undefined make flag: $1$(if $2, ($2)))) -dfu-gen: - $(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip +dfu-gen: $(BUILD)/$(OUTPUT_FILENAME).hex + $(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $^ $(BUILD)/dfu-package.zip -dfu-flash: +dfu-flash: $(BUILD)/dfu-package.zip @:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0) - $(NRFUTIL) --verbose dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200 --singlebank + $(NRFUTIL) --verbose dfu serial --package $^ -p $(SERIAL) -b 115200 --singlebank dfu-bootloader: @:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyACM0) $(NRFUTIL) --verbose dfu serial --package $(BOOT_FILE).zip -p $(SERIAL) -b 115200 -uf2: +uf2: $(BUILD)/$(OUTPUT_FILENAME).hex $(ECHO) "Create $(OUTPUT_FILENAME).uf2" - $(PYTHON2) $(TOP)/tools/uf2/utils/uf2conv.py -c -o "$(BUILD)/$(OUTPUT_FILENAME).uf2" "$(BUILD)/$(OUTPUT_FILENAME).hex" + $(PYTHON2) $(TOP)/tools/uf2/utils/uf2conv.py -c -o "$(BUILD)/$(OUTPUT_FILENAME).uf2" $^ # Flash bootloader with Jlink bootloader: nrfjprog --program $(BOOT_FILE).hex -f nrf52 --chiperase --reset - +$(BUILD)/dfu-package.zip: dfu-gen $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ) $(ECHO) "LINK $@" diff --git a/ports/nrf/boards/feather52840/bluefruit_nrf52840_s140_6.0.0.ld b/ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld index 186509285..186509285 100644 --- a/ports/nrf/boards/feather52840/bluefruit_nrf52840_s140_6.0.0.ld +++ b/ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld diff --git a/ports/nrf/boards/feather52840/mpconfigboard.mk b/ports/nrf/boards/feather52840/mpconfigboard.mk index e779ae4af..87f3a407f 100644 --- a/ports/nrf/boards/feather52840/mpconfigboard.mk +++ b/ports/nrf/boards/feather52840/mpconfigboard.mk @@ -3,8 +3,8 @@ MCU_VARIANT = nrf52 MCU_SUB_VARIANT = nrf52840 SOFTDEV_VERSION ?= 6.0.0 -LD_FILE = boards/feather52840/bluefruit_nrf52840_s140_$(SOFTDEV_VERSION).ld -BOOT_FILE = boards/feather52840/bootloader/$(SOFTDEV_VERSION)/feather52840_bootloader_$(SOFTDEV_VERSION)_s140 +LD_FILE = boards/bluefruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_$(SOFTDEV_VERSION).ld +BOOT_FILE = boards/$(BOARD)/bootloader/$(SOFTDEV_VERSION)/$(BOARD)_bootloader_$(SOFTDEV_VERSION)_s140 NRF_DEFINES += -DNRF52840_XXAA NRF_DEFINES += -DADAFRUIT_FEATHER52840 diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/pca10056/mpconfigboard.mk index 931b351a2..87f3a407f 100644 --- a/ports/nrf/boards/pca10056/mpconfigboard.mk +++ b/ports/nrf/boards/pca10056/mpconfigboard.mk @@ -3,10 +3,8 @@ MCU_VARIANT = nrf52 MCU_SUB_VARIANT = nrf52840 SOFTDEV_VERSION ?= 6.0.0 -ifeq ($(SD),) - LD_FILE = boards/nrf52840_1M_256k.ld -else - LD_FILE = boards/nrf52840_1M_256k_s140_$(SOFTDEV_VERSION).ld -endif +LD_FILE = boards/bluefruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_$(SOFTDEV_VERSION).ld +BOOT_FILE = boards/$(BOARD)/bootloader/$(SOFTDEV_VERSION)/$(BOARD)_bootloader_$(SOFTDEV_VERSION)_s140 NRF_DEFINES += -DNRF52840_XXAA +NRF_DEFINES += -DADAFRUIT_FEATHER52840 |