Merge branch 'Revert-SRAM'

budude2 · Aug 20, 2024 · 9dd4638 · 9dd4638
2 parents fe3d6f2 + 14721e4
commit 9dd4638
Show file tree

Hide file tree

Showing 11 changed files with 706 additions and 113 deletions.
diff --git a/pkg/gb/Cores/budude2.GB/core.json b/pkg/gb/Cores/budude2.GB/core.json
@@ -7,13 +7,13 @@
       "description": "Game Boy",
       "author": "budude2",
       "url": "https://github.com/budude2/openfpga-GBC",
-      "version": "1.2.3",
-      "date_release": "2024-08-13"
+      "version": "1.3.0",
+      "date_release": "2024-08-20"
     },
     "framework": {
       "target_product": "Analogue Pocket",
       "version_required": "1.1",
-      "sleep_supported": false,
+      "sleep_supported": true,
       "dock": {
         "supported": true,
         "analog_output": false

diff --git a/pkg/gb/Cores/budude2.GB/gb.rbf_r b/pkg/gb/Cores/budude2.GB/gb.rbf_r
diff --git a/pkg/gbc/Cores/budude2.GBC/core.json b/pkg/gbc/Cores/budude2.GBC/core.json
@@ -7,13 +7,13 @@
       "description": "Game Boy Color",
       "author": "budude2",
       "url": "https://github.com/budude2/openfpga-GBC",
-      "version": "1.2.3",
-      "date_release": "2024-08-13"
+      "version": "1.3.0",
+      "date_release": "2024-08-20"
     },
     "framework": {
       "target_product": "Analogue Pocket",
       "version_required": "1.1",
-      "sleep_supported": false,
+      "sleep_supported": true,
       "dock": {
         "supported": true,
         "analog_output": false

diff --git a/pkg/gbc/Cores/budude2.GBC/gbc.rbf_r b/pkg/gbc/Cores/budude2.GBC/gbc.rbf_r
diff --git a/src/ap_core.qsf b/src/ap_core.qsf
@@ -312,7 +312,7 @@ set_global_assignment -name PHYSICAL_SYNTHESIS_COMBO_LOGIC ON
 set_global_assignment -name PHYSICAL_SYNTHESIS_REGISTER_DUPLICATION ON
 set_global_assignment -name PHYSICAL_SYNTHESIS_REGISTER_RETIMING ON
 set_global_assignment -name PHYSICAL_SYNTHESIS_ASYNCHRONOUS_SIGNAL_PIPELINING ON
-set_global_assignment -name FITTER_EFFORT "AUTO FIT"
+set_global_assignment -name FITTER_EFFORT "FAST FIT"
 set_global_assignment -name ROUTER_LCELL_INSERTION_AND_LOGIC_DUPLICATION ON
 
 # Assembler Assignments
@@ -324,7 +324,6 @@ set_global_assignment -name GENERATE_RBF_FILE ON
 # Signal Tap Assignments
 # ======================
 set_global_assignment -name ENABLE_SIGNALTAP OFF
-set_global_assignment -name USE_SIGNALTAP_FILE stp1.stp
 
 # Power Estimation Assignments
 # ============================
@@ -741,6 +740,9 @@ set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to bridge_1wire
 set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to bridge_spiclk
 set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to bridge_spimiso
 set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to bridge_spimosi
+set_global_assignment -name NUM_PARALLEL_PROCESSORS ALL
+set_global_assignment -name SYSTEMVERILOG_FILE gb/sram_128k_x1_x16.sv
+set_global_assignment -name SYSTEMVERILOG_FILE gb/save_state_controller.sv
 set_global_assignment -name SYSTEMVERILOG_FILE gb/rtc_loader.sv
 set_global_assignment -name SYSTEMVERILOG_FILE gb/rumbler.sv
 set_global_assignment -name SYSTEMVERILOG_FILE gb/save_handler.sv
@@ -809,11 +811,10 @@ set_global_assignment -name QIP_FILE apf/apf.qip
 set_global_assignment -name QIP_FILE apf/mf_ddio_bidir_12.qip
 set_global_assignment -name VERILOG_FILE core/core_bridge_cmd.v
 set_global_assignment -name SDC_FILE core/core_constraints.sdc
-set_global_assignment -name SIGNALTAP_FILE core/stp1.stp
 set_global_assignment -name QIP_FILE core/mf_pllbase.qip
 set_global_assignment -name SIP_FILE core/mf_pllbase.sip
 set_global_assignment -name SOURCE_FILE db/ap_core.cmp.rdb
-set_global_assignment -name SIGNALTAP_FILE stp1.stp
 set_global_assignment -name QIP_FILE gb/rtc_ram/rtc_ram.qip
-set_global_assignment -name NUM_PARALLEL_PROCESSORS ALL
-set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
+set_global_assignment -name ALM_REGISTER_PACKING_EFFORT MEDIUM
+set_global_assignment -name FINAL_PLACEMENT_OPTIMIZATION NEVER
+set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
diff --git a/src/apf/build_id.mif b/src/apf/build_id.mif
@@ -9,8 +9,8 @@ DATA_RADIX = HEX;
 CONTENT
 BEGIN
 
-   0E0 : 20240813;
-   0E1 : 00212410;
-   0E2 : ea0c04f8;
+   0E0 : 20240725;
+   0E1 : 00214947;
+   0E2 : 55079a6c;
 
 END;