Browse Source

rv32: don't initialize the ABC memmap until we have configuration

We are holding WAIT# until the configuration is received, anyway...
H. Peter Anvin 1 year ago
parent
commit
933b8432fd

BIN
esp32/output/max80.ino.bin


+ 3 - 3
fpga/max80.qpf

@@ -19,15 +19,15 @@
 #
 # Quartus Prime
 # Version 22.1std.0 Build 915 10/25/2022 SC Lite Edition
-# Date created = 22:08:55  September 05, 2023
+# Date created = 22:13:31  September 05, 2023
 #
 # -------------------------------------------------------------------------- #
 
 QUARTUS_VERSION = "22.1"
-DATE = "22:08:55  September 05, 2023"
+DATE = "22:13:31  September 05, 2023"
 
 # Revisions
 
-PROJECT_REVISION = "v1"
 PROJECT_REVISION = "v2"
+PROJECT_REVISION = "v1"
 PROJECT_REVISION = "bypass"

BIN
fpga/output/bypass.jic


BIN
fpga/output/max80.fw


BIN
fpga/output/v1.fw


BIN
fpga/output/v1.jic


BIN
fpga/output/v1.sof


BIN
fpga/output/v2.fw


BIN
fpga/output/v2.jic


BIN
fpga/output/v2.sof


+ 1 - 1
rv32/checksum.h

@@ -1,4 +1,4 @@
 #ifndef CHECKSUM_H
 #define CHECKSUM_H
-#define SDRAM_SUM 0xc47b6d97
+#define SDRAM_SUM 0xb1adae41
 #endif

+ 4 - 8
rv32/system.c

@@ -172,12 +172,6 @@ volatile uint32_t __dram_bss test_dram[8];
 
 static void __noinline late_init(void)
 {
-    /* This needs to be done as early as possible!!! */
-    con_puts("Running abc_init_memmap: ");
-    con_flush();
-    abc_init_memmap();
-    con_puts("ok\n");
-
     if (SYS_MAGIC != SYS_MAGIC_MAX80) {
 	con_puts("Not a MAX80 board?!?!\n\n");
 	_die();
@@ -229,11 +223,13 @@ static void __noinline late_init(void)
 
     set_leds(3);
 
-    read_rtc();
-    rtc_abc_init();
+    abc_init_memmap();
 
     set_leds(2);
 
+    read_rtc();
+    rtc_abc_init();
+
     sdcard_reset();
     abcdisk_init();