bubl: use all 4 SDRAM banks

jotego · Jun 30, 2023 · d840665 · d840665
1 parent 21bbbf4
commit d840665
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/cores/bubl/cfg/macros.def b/cores/bubl/cfg/macros.def
@@ -11,10 +11,10 @@ JTFRAME_JOY_UDRL
 JTFRAME_PXLCLK=6
 
 SUB_START=0x28000
-SND_START=0x30000
-MCU_START=0x38000
 # GFX_START=0x40000
-JTFRAME_BA1_START=0x40000
+JTFRAME_BA1_START=0x30000
+JTFRAME_BA2_START=0x38000
+JTFRAME_BA3_START=0x40000
 JTFRAME_PROM_START=0xc0000
 
 [mister]

diff --git a/cores/bubl/cfg/mame2mra.toml b/cores/bubl/cfg/mame2mra.toml
@@ -52,10 +52,10 @@ Rename = [
 regions = [
     { name="maincpu", No_offset=true },
     { name="subcpu", No_offset=true,   start="SUB_START" },
-    { name="audiocpu", No_offset=true, start="SND_START" },
-    { name="mcu", No_offset=true,      start="MCU_START" },
-    { name="gfx1", width=16, start="JTFRAME_BA1_START", sequence=[6,0,7,1,8,2,9,3,10,4,11,5] },
-    { name="gfx1", width=16, start="JTFRAME_BA1_START", setname="tokiob", sequence=[8,0,9,1,10,2,11,3,12,4,13,5,14,6,15,7] },
+    { name="audiocpu", No_offset=true, start="JTFRAME_BA1_START" },
+    { name="mcu", No_offset=true,      start="JTFRAME_BA2_START" },
+    { name="gfx1", width=16, start="JTFRAME_BA3_START", sequence=[6,0,7,1,8,2,9,3,10,4,11,5] },
+    { name="gfx1", width=16, start="JTFRAME_BA3_START", setname="tokiob", sequence=[8,0,9,1,10,2,11,3,12,4,13,5,14,6,15,7] },
     { name="proms", start="JTFRAME_PROM_START"},
     { name="plds", skip=true },
 ]

diff --git a/cores/bubl/cfg/mem.yaml b/cores/bubl/cfg/mem.yaml
@@ -1,7 +1,5 @@
 params:
   - { name: SUB_OFFSET, value: "22'h2_8000 >> 1" }
-  - { name: SND_OFFSET, value: "22'h3_0000 >> 1" }
-  - { name: MCU_OFFSET, value: "22'h3_8000 >> 1" }
 
 clocks:
   clk48:
@@ -27,16 +25,18 @@ sdram:
           addr_width: 15
           data_width: 8
           offset: SUB_OFFSET
-        -
-          name: mcu
-          addr_width: 12
-          data_width: 8
-          offset: MCU_OFFSET
+    -
+      buses:
         -
           name: snd
           addr_width: 15
           data_width: 8
-          offset: SND_OFFSET
+    -
+      buses:
+        -
+          name: mcu
+          addr_width: 12
+          data_width: 8
     -
       buses:
         -