Changeset 12321

Timestamp:

06/19/09 15:16:14 (4 years ago)

Author:

BrainSlayer

Message:

AR5312/AR2313: nor flash support for erasing nvram on reset button long push (untested)

Location:

ar5315_microredboot/microredboot

Files:

• CHANGELOG (modified) (1 diff)
• boot/src/Makefile (modified) (1 diff)
• boot/src/misc_lzma.c (modified) (4 diffs)

ar5315_microredboot/microredboot/CHANGELOG

@@ -1 +1 @@
 19.6.09
+    * AR5312/AR2313: nor flash support for erasing nvram on reset button long push (untested)
     * AR5312/AR2313: add support for 32MB ram chips (auto detection)
     * most nor flash chips should be supported, but no guarantee. redboot will display the required ID's for implementation

ar5315_microredboot/microredboot/boot/src/Makefile

@@ -108 +108 @@
                 sed "$(SEDFLAGS)" < ld.script.in > $@
 
-clean:;         rm -f payload* ld.script *.o lib/*.o
+clean:;         rm -f payload* ld.script *.o *.c~ *.h~ lib/*.o
 
 .PHONY: clean

ar5315_microredboot/microredboot/boot/src/misc_lzma.c

@@ -651 +651 @@
                 return;
         }
-        printf("erasing nvram at [0x%08X]\n", flashbase + nvramdetect);
+        printf("erasing nvram at [0x%08X]\n", nvramdetect);
 
         ptr_opcode = &stm_opcodes[SPI_SECTOR_ERASE];
@@ -698 +698 @@
 
 }
+#else
+
+static int flash_erase_nvram(unsigned int flashsize, unsigned int blocksize)
+{
+        int i, ticks;
+        unsigned short val;
+        if (!nvramdetect) {
+                puts("nvram can and will not erased, since nvram was not detected on this device (maybe dd-wrt isnt installed)!\n");
+                return;
+        }
+        printf("erasing nvram at [0x%08X]\n", nvramdetect);
+        volatile unsigned short *block = (unsigned short *)nvramdetect;
+        volatile unsigned short *p555 =
+            (unsigned short *)((unsigned long)flashbase + 0x0aaa);
+        volatile unsigned short *p2aa =
+            (unsigned short *)((unsigned long)flashbase + 0x0554);
+
+        *block = 0xf0;          /* Make sure in read state */
+        *p555 = 0xaa;
+        *p2aa = 0x55;
+        *p555 = 0x80;
+        *p555 = 0xaa;
+        *p2aa = 0x55;
+        *block = 0x30;
+        for (ticks = 0, i = 0;; i++) {
+                val = *block;
+
+                /* When Erase operation is completed, DQ7 will produce 1 "1".
+                   and  DQ6 stops toggling. */
+                if ((val & 0x80) == 0x80) {
+
+                        // Check DQ6 toggle
+                        unsigned short s_val;
+
+                        // Read the second time.
+                        s_val = *block;
+                        if ((s_val & 0x80) && (s_val & 0x40) == (val & 0x40)) {
+                                *block = 0xf0;  /* Do reset */
+                                puts("erase successfull!\n");
+                                return 0;
+                        }
+                }
+
+                else {
+                        if (i >= 1024) {
+                                i = 0;
+                                if (++ticks > 7 * 100 * 10) {
+                                        break;
+                                }
+                        }
+                }
+        }
+        *block = 0xf0;          /* Do reset */
+        puts("erase failed!\n");
+        return -1;
+}
+
 #endif
 struct nvram_header {
@@ -795 +852 @@
         if (resetTouched() || (resetbutton && !strcmp(resetbutton, "1"))) {
                 puts("Reset Button triggered\nBooting Recovery RedBoot\n");
-#ifndef AR5312
+
                 int count = 5;
                 while (count--) {
@@ -804 +861 @@
                 if (count <= 0) {
                         puts("reset button 5 seconds pushed, erasing nvram\n");
+
+#ifndef AR5312
                         if (!flashdetect())
+#endif
                                 flash_erase_nvram(flashsize, sectorsize);
                 }
-#endif
 
                 bootoffset = 0x800004bc;