Update dependencies

pulp-platform · May 23, 2024 · e609453 · e609453
1 parent 60da23a
commit e609453
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -26,8 +26,8 @@ packages:
     dependencies:
     - tech_cells_generic
   apb_fll_if:
-    revision: 1acbb0f9485f903a60417ab4c455067fc9ebe766
-    version: 0.2.0
+    revision: ce34d65007e05da1f788fcdf7cc1849b5aedaf67
+    version: 0.2.1
     source:
       Git: https://github.com/pulp-platform/apb_fll_if.git
     dependencies:
@@ -166,7 +166,7 @@ packages:
     - udma_sdio
     - udma_uart
   pulp_soc:
-    revision: f6081c6da0c1455e44b0be630fbb23b4b7e97bd2
+    revision: 470e10f9b917efc79beee20af53a77adbf8f3954
     version: null
     source:
       Git: https://github.com/pulp-platform/pulp_soc.git
@@ -175,14 +175,12 @@ packages:
     - apb
     - apb2per
     - apb_adv_timer
-    - apb_fll_if
     - apb_interrupt_cntrl
     - axi
     - cluster_interconnect
     - common_cells
     - cv32e40p
     - fpnew
-    - generic_fll
     - hwpe-mac-engine
     - ibex
     - jtag_pulp

diff --git a/Bender.yml b/Bender.yml
@@ -16,14 +16,14 @@ dependencies:
   common_cells:                { git: "https://github.com/pulp-platform/common_cells.git",       version: 1.21.0 }
   apb:                         { git: "https://github.com/pulp-platform/apb.git",                version: 0.2.4 }
   jtag_pulp:                   { git: "https://github.com/pulp-platform/jtag_pulp.git",          version: 0.2.0 }
-  pulp_soc:                    { git: "https://github.com/pulp-platform/pulp_soc.git",           rev: f6081c6da0c1455e44b0be630fbb23b4b7e97bd2 }
+  pulp_soc:                    { git: "https://github.com/pulp-platform/pulp_soc.git",           rev: 470e10f9b917efc79beee20af53a77adbf8f3954 }
   tbtools:                     { git: "https://github.com/pulp-platform/tbtools.git",            version: 0.2.1 }
   tech_cells_generic:          { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.3 }
   pulpissimo_padframe_rtl_sim: { path: "hw/padframe/pulpissimo_padframe_rtl_sim_autogen" }
   pulpissimo_padframe_fpga:    { path: "hw/padframe/pulpissimo_padframe_fpga_autogen" }
   register_interface:          { git: "https://github.com/pulp-platform/register_interface.git", version: 0.4.1 }
   generic_FLL:                 { git: "https://github.com/pulp-platform/generic_FLL.git",        version: 0.2.0 }
-  apb_fll_if:                  { git: "https://github.com/pulp-platform/apb_fll_if.git",         version: 0.2.0 }
+  apb_fll_if:                  { git: "https://github.com/pulp-platform/apb_fll_if.git",         version: 0.2.1 }
 
 
   # Target Specific Dependencies

diff --git a/hw/clock_gen_generic.sv b/hw/clock_gen_generic.sv
@@ -80,7 +80,10 @@ module clock_gen #(
   // Convert APB interface to FLL native interface
   FLL_BUS fll_bus[2](.clk_i(cfg_clk_i));
 
-  apb_to_fll #(.APB_ADDR_WIDTH(APB_ADDR_WIDTH), .NR_FLLS(2)) apb2fll_if_i (
+  apb_to_fll #(
+    .APB_ADDR_WIDTH(APB_ADDR_WIDTH),
+    .NR_FLLS(2)
+  ) apb2fll_if_i (
     .clk_i    ( cfg_clk_i     ),
     .rst_ni,
     .apb      ( cfg_bus_slave ),

diff --git a/hw/pulpissimo.sv b/hw/pulpissimo.sv
@@ -174,7 +174,7 @@ module pulpissimo #(
 
   // Config. Interfaces
   APB #(.ADDR_WIDTH(32), .DATA_WIDTH(32)) s_apb_chip_ctrl_bus();
-  APB #(.ADDR_WIDTH(10), .DATA_WIDTH(32)) s_apb_fll_ctrl_bus();
+  APB #(.ADDR_WIDTH(6), .DATA_WIDTH(32)) s_apb_fll_ctrl_bus();
   APB #(.ADDR_WIDTH(32), .DATA_WIDTH(32)) s_apb_pads_ctrl_bus();
 
   ////////////////////////////
@@ -194,7 +194,7 @@ module pulpissimo #(
   //////////////////////////////
 `ifndef EXTERNAL_CLOCK
   clock_gen #(
-    .APB_ADDR_WIDTH(8)
+    .APB_ADDR_WIDTH(6)
   ) i_clock_gen(
     .ref_clk_i         ( s_ref_clk                                                              ),
     .rst_ni            ( s_global_rst_n                                                         ),

diff --git a/sw/pulp-runtime b/sw/pulp-runtime