add -r option that will update user row to update smarteeprom

Signed-off-by: Alexandre d'Alton <alex@alexdalton.org>
daltona · Aug 13, 2019 · 0aaf775 · 0aaf775
1 parent caa03ed
commit 0aaf775
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 2 deletions.
diff --git a/mdloader_common.c b/mdloader_common.c
@@ -352,6 +352,49 @@ int test_mcu(char silent)
     return 1;
 }
 
+int write_user_row(uint32_t *data)
+{
+    uint16_t status = read_half_word(0x2 + 0x41002000);
+    printf("dsu statusb: %08x\n", status);
+    write_word(0x41004010, status);
+    uint32_t cfg = read_word(0x41004000);
+    printf("nvm config: %08x\n", cfg);
+    cfg &= ~(0xf0);
+    write_word(0x41004000, cfg);
+
+    write_word(0x41004014,0x804000);
+    write_half_word(0x41004004,0xa500);
+    slp(100);
+    write_half_word(0x41004004,0xa515);
+    slp(100);
+    for(int i = 0; i < 4; i++) {
+        write_word(0x804000 + i * 4, data[i]);
+    }
+    write_word(0x41004014,0x804000);
+    write_half_word(0x41004004,0xa504);
+    slp(100);
+    return 0;
+}
+
+int read_user_row(void)
+{
+    uint32_t user_row[4];
+    printf("user row: ");
+    for (int i = 0; i < 4; i++) {
+        user_row[i] = read_word(0x804000 + i * 4);
+        printf("0x%08x ", user_row[i]);
+    }
+    printf("\n");
+    if ((user_row[1] & 0x7f) != 0x12) {
+        printf("SmartEEPROM not configured, proceed\n");
+        user_row[1] |= (0x12);
+        write_user_row(user_row);
+    } else {
+        printf("SmartEEPROM already configured\n");
+    }
+    return 0;
+}
+
 //Upper case any lower case characters in a string
 void strlower(char *str)
 {
@@ -490,6 +533,7 @@ struct option long_options[] = {
     { "addr",           required_argument,  0,  'a' },
     { "size",           required_argument,  0,  's' },
     { "test",           no_argument,        0,  't' },
+    { "user",           no_argument,        0,  'r' },
     { "cols",           required_argument,  0,  SW_COLS },
     { "colw",           required_argument,  0,  SW_COLW },
     { 0, 0, 0, 0 }
@@ -521,7 +565,7 @@ int main(int argc, char *argv[])
         int option_index = 0;
         int base;
 
-        c = getopt_long(argc, argv, "hvVlftp:D:U:a:s:", long_options, &option_index);
+        c = getopt_long(argc, argv, "hvVlftrp:D:U:a:s:", long_options, &option_index);
 
         if (c == -1)
             break;
@@ -603,6 +647,10 @@ int main(int argc, char *argv[])
                 testmode = 1;
                 break;
 
+            case 'r':
+                command = CMD_READ_USER_ROW;
+                break;
+
             case SW_COLS:
                 hex_cols = atoi(optarg);
                 if (hex_cols < 1)
@@ -726,6 +774,14 @@ int main(int argc, char *argv[])
     print_bootloader_version();
     if (verbose) printf("Device ID: %08X\n", mcu->cidr);
 
+    if (command == CMD_READ_USER_ROW)
+    {
+        read_user_row();
+        goto exitProgram;
+    }
+
+
+
     //Load applet
     FILE *fIn;
     char appletfname[128] = "";

diff --git a/mdloader_common.h b/mdloader_common.h
@@ -142,7 +142,8 @@ enum command {
     CMD_DOWNLOAD,
     CMD_UPLOAD,
     CMD_TEST,
-    CMD_ABORT
+    CMD_ABORT,
+    CMD_READ_USER_ROW
 };
 
 extern struct option long_options[];
@@ -181,6 +182,7 @@ int write_data(int addr, int writesize, int data);
 void list_devices(char *first);
 void strupper(char *str);
 void strlower(char *str);
+int read_user_row(void);
 
 #endif //_MDLOADER_COMMON_H