Move scripts to scripts/

7 years ago · 728aef1e5f
4 changed files with 7 additions and 6 deletions
--- a/6
+++ b/6
@ -35,11 +35,11 @@ $(PROGNAME).hex: $(PROGNAME).elf
				@@ -35,11 +35,11 @@ $(PROGNAME).hex: $(PROGNAME).elf
 fuse:

 flash: $(HEXFILE)
-	./enter_bootloader.sh
-	./wait_then_flash.sh $(CPU) $(HEXFILE)
+	- ./scripts/enter_bootloader.sh
+	./scripts/wait_then_flash.sh $(CPU) $(HEXFILE)

 justflash: $(HEXFILE)
-	./wait_then_flash.sh $(CPU) $(HEXFILE)
+	./scripts/wait_then_flash.sh $(CPU) $(HEXFILE)

 chip_erase:
 	dfu-programmer atmega32u2 erase
--- a/Makefile.stk525
+++ b/Makefile.stk525
@ -39,11 +39,11 @@ clean:
				@@ -39,11 +39,11 @@ clean:
 fuse:

 flash: $(HEXFILE)
-	./enter_bootloader.sh
-	./wait_then_flash.sh $(CPU) $(HEXFILE)
+	- ./scripts/enter_bootloader.sh
+	./scripts/wait_then_flash.sh $(CPU) $(HEXFILE)

 justflash: $(HEXFILE)
-	./wait_then_flash.sh $(CPU) $(HEXFILE)
+	./scripts/wait_then_flash.sh $(CPU) $(HEXFILE)

 chip_erase:
 	dfu-programmer atmega32u2 erase
--- a/scripts/enter_bootloader.sh
+++ b/scripts/enter_bootloader.sh
@ -4,6 +4,7 @@ TOOL=./tool/gcn64ctl
				@@ -4,6 +4,7 @@ TOOL=./tool/gcn64ctl

 if [ -x $TOOL ]; then
 	$TOOL -f --bootloader
+	exit 0 # The tool fails, but we should continue
 else
 	echo $TOOL not found. Please compile it to enter bootloader automatically.
 fi
--- a/scripts/wait_then_flash.sh
+++ b/scripts/wait_then_flash.sh