Remove memory island from cheshire (#148)

pulp-platform · Sep 27, 2024 · f9b9a10 · f9b9a10
1 parent f28e91b
commit f9b9a10
Show file tree

Hide file tree

Showing 14 changed files with 1,993 additions and 4,217 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -60,8 +60,8 @@ packages:
     dependencies:
     - common_cells
   axi_vga:
-    revision: 3718b9930f94a9eaad8ee50b4bccc71df0403084
-    version: 0.1.3
+    revision: 4d3e70d4f47bb74edc1ab68d99ffc02382e0fb9e
+    version: 0.1.4
     source:
       Git: https://github.com/pulp-platform/axi_vga.git
     dependencies:
@@ -84,13 +84,6 @@ packages:
     dependencies:
     - common_cells
     - register_interface
-  cluster_interconnect:
-    revision: 7d0a4f8acae71a583a6713cab5554e60b9bb8d27
-    version: 1.2.1
-    source:
-      Git: https://github.com/pulp-platform/cluster_interconnect.git
-    dependencies:
-    - common_cells
   common_cells:
     revision: c27bce39ebb2e6bae52f60960814a2afca7bd4cb
     version: 1.37.0
@@ -151,20 +144,9 @@ packages:
     - axi
     - common_cells
     - register_interface
-  memory_island:
-    revision: 64828cb7a9ccc1f1656ec92d06129072f445c319
-    version: null
-    source:
-      Git: https://github.com/pulp-platform/memory_island.git
-    dependencies:
-    - axi
-    - cluster_interconnect
-    - common_cells
-    - common_verification
-    - tech_cells_generic
   obi:
-    revision: c2141a653c755461ff44f61d12aeb5d99fc8e760
-    version: 0.1.3
+    revision: 5321106817e177d6c16ecc4daa922b96b1bc946b
+    version: 0.1.5
     source:
       Git: https://github.com/pulp-platform/obi.git
     dependencies:
@@ -180,14 +162,15 @@ packages:
     - register_interface
     - tech_cells_generic
   register_interface:
-    revision: 146501d80052b61475cdc333d3aab4cd769fd5dc
-    version: 0.3.9
+    revision: 5daa85d164cf6b54ad061ea1e4c6f3624556e467
+    version: 0.4.5
     source:
       Git: https://github.com/pulp-platform/register_interface.git
     dependencies:
     - apb
     - axi
     - common_cells
+    - common_verification
   riscv-dbg:
     revision: 358f90110220adf7a083f8b65d157e836d706236
     version: 0.8.1
@@ -197,8 +180,8 @@ packages:
     - common_cells
     - tech_cells_generic
   serial_link:
-    revision: 5a25f5a71074f1ebb6de7b5280f2b16924bcc666
-    version: 1.1.1
+    revision: c55df03a1da06b00e567cf968b1b1a5f40c9f802
+    version: 1.1.2
     source:
       Git: https://github.com/pulp-platform/serial_link.git
     dependencies:

diff --git a/Bender.yml b/Bender.yml
@@ -23,7 +23,6 @@ dependencies:
   common_cells:             { git: "https://github.com/pulp-platform/common_cells.git",           version: 1.33.0 }
   common_verification:      { git: "https://github.com/pulp-platform/common_verification.git",    version: 0.2.0  }
   cva6:                     { git: "https://github.com/Scheremo/cva6.git", rev: 630bd959c9cc69a35d461a2abc205310d2edacf8  }
-  memory_island:            { git: "https://github.com/pulp-platform/memory_island.git",          rev: 64828cb7a9ccc1f1656ec92d06129072f445c319 } # main branch
   iDMA:                     { git: "https://github.com/pulp-platform/iDMA.git",                   version: 0.6.2  }
   irq_router:               { git: "https://github.com/pulp-platform/irq_router.git",             version: 0.0.1-beta.1 }
   opentitan_peripherals:    { git: "https://github.com/pulp-platform/opentitan_peripherals.git",  version: 0.4.0  }

diff --git a/cheshire.mk b/cheshire.mk
@@ -133,6 +133,13 @@ $(CHS_ROOT)/hw/bootrom/cheshire_bootrom.sv: $(CHS_ROOT)/hw/bootrom/cheshire_boot
 
 CHS_BOOTROM_ALL += $(CHS_ROOT)/hw/bootrom/cheshire_bootrom.sv $(CHS_ROOT)/hw/bootrom/cheshire_bootrom.dump
 
+.PHONY: chs_bootrom_clean
+
+chs_bootrom_clean:
+	rm -f $(CHS_ROOT)/hw/bootrom/cheshire_bootrom.sv
+	rm -f $(CHS_ROOT)/hw/bootrom/cheshire_bootrom.elf
+	rm -f $(CHS_ROOT)/hw/bootrom/cheshire_bootrom.bin
+
 ##############
 # Simulation #
 ##############
@@ -182,6 +189,6 @@ CHS_ALL += $(CHS_SW_ALL) $(CHS_HW_ALL) $(CHS_SIM_ALL)
 chs-all:         $(CHS_ALL)
 chs-sw-all:      $(CHS_SW_ALL)
 chs-hw-all:      $(CHS_HW_ALL)
-chs-bootrom-all: $(CHS_BOOTROM_ALL)
+chs-bootrom-all: chs_bootrom_clean $(CHS_BOOTROM_ALL)
 chs-sim-all:     $(CHS_SIM_ALL)
 chs-xilinx-all:  $(CHS_XILINX_ALL)
diff --git a/hw/bootrom/cheshire_bootrom.ld b/hw/bootrom/cheshire_bootrom.ld
@@ -9,7 +9,7 @@
 INCLUDE common.ldh
 
 SECTIONS {
-  __stack_pointer$  = ORIGIN(memisl) + LENGTH(memisl) - 8;
+  __stack_pointer$  = __stack_start - 8;
 
   .text : {
     *(.text._start)