Skip to content

Commit 1fac639

Browse files
committed
Fix whitespace
1 parent f22e19e commit 1fac639

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

Makefile

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -398,12 +398,11 @@ __check_defined = \
398398
$(if $(value $1),, \
399399
$(error Undefined make flag: $1$(if $2, ($2))))
400400

401-
402401
#------------------- Flash with NRFUTIL -------------------
403402
ifeq ($(FLASHER),nrf)
404403

405-
# Flash the compiled
406-
flash: $(BUILD)/$(OUT_FILE)-nosd.hex
404+
# Flash the compiled
405+
flash: $(BUILD)/$(OUT_FILE)-nosd.hex
407406
@echo Flashing: $(notdir $<)
408407
$(NRFJPROG) --program $< --sectoranduicrerase -f nrf52 --reset
409408

@@ -412,25 +411,25 @@ ifeq ($(FLASHER),nrf)
412411
@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyACM0)
413412
$(NRFUTIL) --verbose dfu serial --package $< -p $(SERIAL) -b 115200 --singlebank --touch 1200
414413

415-
erase:
414+
erase:
416415
@echo Erasing flash
417416
$(NRFJPROG) -f nrf52 --eraseall
418417

419-
# flash SD only
420-
sd:
418+
# flash SD only
419+
sd:
421420
@echo Flashing: $(SD_HEX)
422421
$(NRFJPROG) --program $(SD_HEX) -f nrf52 --sectorerase --reset
423422

424-
# flash MBR only
425-
mbr:
423+
# flash MBR only
424+
mbr:
426425
@echo Flashing: $(MBR_HEX)
427426
$(NRFJPROG) --program $(MBR_HEX) -f nrf52 --sectorerase --reset
428427

429428
#------------------- Flash with PYOCD -------------------
430429
else ifeq ($(FLASHER),pyocd)
431430

432-
# Flash the compiled
433-
flash: $(BUILD)/$(OUT_FILE)-nosd.hex
431+
# Flash the compiled
432+
flash: $(BUILD)/$(OUT_FILE)-nosd.hex
434433
@echo Flashing: $(notdir $<)
435434
$(PYOCD) flash -t $(MCU_SUB_VARIANT) $<
436435

@@ -442,13 +441,13 @@ else ifeq ($(FLASHER),pyocd)
442441
@echo Erasing flash
443442
$(PYOCD) erase -t $(MCU_SUB_VARIANT) --chip
444443

445-
# flash SD only
446-
sd:
444+
# flash SD only
445+
sd:
447446
@echo Flashing: $(SD_HEX)
448447
$(PYOCD) flash -t $(MCU_SUB_VARIANT) $(SD_HEX)
449448

450-
# flash MBR only
451-
mbr:
449+
# flash MBR only
450+
mbr:
452451
@echo Flashing: $(MBR_HEX)
453452
$(PYOCD) flash -t $(MCU_SUB_VARIANT) $(MBR_HEX)
454453

@@ -457,7 +456,7 @@ endif
457456
#------------------- Debugging -------------------
458457

459458
gdbflash: $(BUILD)/$(MERGED_FILE).hex
460-
@echo Flashing: $<
459+
@echo Flashing: $<
461460
@$(GDB_BMP) -nx --batch -ex 'load $<' -ex 'compare-sections' -ex 'kill'
462461

463462
gdb: $(BUILD)/$(OUT_FILE).out

0 commit comments

Comments
 (0)