X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.bsl;h=b51fce2581676314872ef0c36e16e231bb15fa70;hp=4765128c5f19c3a00ea730ae3bb39bfd5f25c6d2;hb=00468511c745e7923221cc688e705d28fc5d5e5c;hpb=4b0950b844184735582dfaa8c293dea2ade925af

diff --git a/client/goodfet.bsl b/client/goodfet.bsl
index 4765128..b51fce2 100755
--- a/client/goodfet.bsl
+++ b/client/goodfet.bsl
@@ -1225,19 +1225,29 @@ class BootStrapLoader(LowLevel):
             raise BSLException, "programming without data not possible"
     def actionFromweb(self):
         """Grab GoodFET firmware from the web, then flash it."""
-        print "Grabbing %x firmware." % self.dev_id;
-        print "%s" % firmware[self.dev_id];
-        fn="/tmp/.goodfet.hex"
-        os.system("curl %s >%s" % (firmware[self.dev_id],fn))
+        # print "Grabbing %x firmware." % self.dev_id;
+        # print "%s" % firmware[self.dev_id];
+        # fn="/tmp/.goodfet.hex"
+        # os.system("curl %s >%s" % (firmware[self.dev_id],fn))
         
-        fw=Memory(fn);
-        #fw.loadIhex(open(fn,"rb"));
+        # fw=Memory(fn);
+        # #fw.loadIhex(open(fn,"rb"));
+        
+        # sys.stderr.write("Program ...\n")
+        # sys.stderr.flush()
+        # self.programData(fw, self.ACTION_PROGRAM | self.ACTION_VERIFY)
+        # sys.stderr.write("%i bytes programmed.\n" % self.byteCtr)
+        # sys.stderr.flush()
+        
+        
+        print """
+The --fromweb feature is temporarily disabled, pending a rewrite.
+Please grab a copy of the appropriate .hex from
+http://goodfet.sf.net/dist/ and flash it like so:
+
+goodfet.bsl -e -p foo.hex        
+"""
         
-        sys.stderr.write("Program ...\n")
-        sys.stderr.flush()
-        self.programData(fw, self.ACTION_PROGRAM | self.ACTION_VERIFY)
-        sys.stderr.write("%i bytes programmed.\n" % self.byteCtr)
-        sys.stderr.flush()
         
     def actionVerify(self):
         """Verify programmed data"""
@@ -1485,7 +1495,7 @@ def main(itest=1):
     if(os.environ.get("board")=='z1' or 
        os.environ.get("board")=='zolertiaz1'):
         bsl.z1 = 1
-    if(os.environ.get("board")=='apimote'):
+    if(os.environ.get("board")=='apimote' or os.environ.get("board")=='apimote1'):
         bsl.swapRSTTEST = 1;