minor fixes

wendlers · Nov 6, 2012 · 4692ad9 · 4692ad9
1 parent f5a0002
commit 4692ad9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 59 deletions.
diff --git a/install-propeller-toolchain.sh b/install-propeller-toolchain.sh
@@ -149,6 +149,8 @@ setup() {
 
 	rm -fr $DL_DIR/* 2> /dev/null 
 	rm -fr propgcc 2> /dev/null 
+	rm -fr spin2cpp 2> /dev/null 
+	rm -fr open-source-spin-compiler 2> /dev/null
 
 	sudo rm -fr $INST_DIR 2> /dev/null	
 	sudo mkdir $INST_DIR

diff --git a/s2cpptest/.Makefile.swp b/s2cpptest/.Makefile.swp
diff --git a/s2cpptest/Makefile b/s2cpptest/Makefile
@@ -1,15 +1,15 @@
 CC = propeller-elf-gcc
+LDR = propeller-load
 CFLAGS = -O -mfcache
 SPIN2CPP = spin2cpp
-SPINL = spinloader
 
 all: blink.elf
 
 blink.elf: blink.spin 
 	$(SPIN2CPP) --elf -o blink.elf $(CFLAGS) blink.spin
 
-load: blink.binary 
-	$(SPINL) $< 
+load: blink.elf
+	$(LDR) -r -t blink.elf -b c3
 
 clean:
-	rm -rf *.elf
+	rm -rf *.h *.cpp *.elf
diff --git a/s2cpptest/blink.cpp b/s2cpptest/blink.cpp
diff --git a/s2cpptest/blink.h b/s2cpptest/blink.h