[vivado_ip] update boot configuration

stnolting · Nov 1, 2024 · 6961782 · 6961782
1 parent 70f0c4b
commit 6961782
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/rtl/system_integration/neorv32_vivado_ip.tcl b/rtl/system_integration/neorv32_vivado_ip.tcl
@@ -64,6 +64,9 @@ set_property vendor_display_name "Stephan Nolting" [ipx::current_core]
 set_property company_url https://github.com/stnolting/neorv32 [ipx::current_core]
 set_property description "The NEORV32 RISC-V Processor" [ipx::current_core]
 
+# **************************************************************
+# Setup configuration GUI
+# **************************************************************
 proc setup_ip_gui {} {
   proc set_param_properties {name {display_name ""} {tooltip ""} {enablement_expr ""} {value_expr ""}} {
     set param_spec [ipgui::get_guiparamspec -name $name -component [ipx::current_core]]
@@ -127,6 +130,9 @@ proc setup_ip_gui {} {
   set_property enablement_dependency {$IO_MTIME_EN}    [ipx::get_ports mtime_time_o     -of_objects [ipx::current_core]]
   set_property enablement_dependency {!$IO_MTIME_EN}   [ipx::get_ports mtime_irq_i      -of_objects [ipx::current_core]]
 
+  # **************************************************************
+  # Configuration pages
+  # **************************************************************
   # Remove default page
   set page [ipgui::get_pagespec -name "Page 0" -component [ipx::current_core]]
   if {$page ne ""} {
@@ -140,7 +146,20 @@ proc setup_ip_gui {} {
 
   # { param_name {display_name} {tooltip} {enablement_expr} {value_expr} }
   add_params $page {
-    { CLOCK_FREQUENCY       {Clock Frequency (Hz)}  {Frequency of the clk signal in Hz} }
+    { CLOCK_FREQUENCY       {Clock Frequency (Hz)}  {Frequency of the clk input signal in Hz} }
+  }
+
+  set group [add_group $page {Boot Configuration}]
+  add_params $group {
+    { BOOT_MODE_SELECT      {Boot mode select}      {CPU boot configuration} }
+    { BOOT_ADDR_CUSTOM      {Custom boot address}   {Available if BOOT_MODE_SELECT = 1; has to be 4-byte aligned}   {$BOOT_MODE_SELECT == 1}}
+  }
+  set_property widget {comboBox} [ipgui::get_guiparamspec -name "BOOT_MODE_SELECT" -component [ipx::current_core] ]
+  set_property value_validation_type pairs [ipx::get_user_parameters BOOT_MODE_SELECT -of_objects [ipx::current_core]]
+  set_property value_validation_pairs {{Internal bootloader} 0 {Custom address} 1} [ipx::get_user_parameters BOOT_MODE_SELECT -of_objects [ipx::current_core]]
+
+  set group [add_group $page {Core Identification}]
+  add_params $group {
     { HART_ID               {HART ID}               {The hart thread ID of the CPU (passed to mhartid CSR)} }
     { JEDEC_ID              {JEDEC ID}              {For JTAG tap identification and mvendorid CSR} }
   }
@@ -261,11 +280,6 @@ proc setup_ip_gui {} {
     { XIP_CACHE_BLOCK_SIZE {Cache Block Size} {In bytes (use a power of two)} {$XIP_CACHE_EN} }
   }
 
-  set group [add_group $page {Internal Bootloader}]
-  add_params $group {
-    { INT_BOOTLOADER_EN    {Enable Bootloader} {Start interactive bootloader console after reset} }
-  }
-
 
   # **************************************************************
   # GUI Page: Peripherals

diff --git a/rtl/system_integration/neorv32_vivado_ip.vhd b/rtl/system_integration/neorv32_vivado_ip.vhd
@@ -27,11 +27,14 @@ entity neorv32_vivado_ip is
     -- ------------------------------------------------------------
     -- AXI-Stream Interfaces --
     AXI4_STREAM_EN        : boolean                       := false;
-    -- General --
+    -- Clocking --
     CLOCK_FREQUENCY       : natural                       := 100_000_000;
+    -- Identification --
     HART_ID               : std_logic_vector(31 downto 0) := x"00000000";
     JEDEC_ID              : std_logic_vector(10 downto 0) := "00000000000";
-    INT_BOOTLOADER_EN     : boolean                       := false;
+    -- Boot Configuration --
+    BOOT_MODE_SELECT      : natural range 0 to 1          := 0;
+    BOOT_ADDR_CUSTOM      : std_ulogic_vector(31 downto 0) := x"00000000";
     -- On-Chip Debugger (OCD) --
     OCD_EN                : boolean                       := false;
     OCD_AUTHENTICATION    : boolean                       := false;
@@ -351,12 +354,15 @@ begin
   -- -------------------------------------------------------------------------------------------
   neorv32_top_inst: neorv32_top
   generic map (
-    -- General --
+    -- Clocking --
     CLOCK_FREQUENCY       => CLOCK_FREQUENCY,
     CLOCK_GATING_EN       => false, -- clock gating is not supported here
+    -- Identification --
     HART_ID               => std_ulogic_vector(HART_ID),
     JEDEC_ID              => std_ulogic_vector(JEDEC_ID),
-    INT_BOOTLOADER_EN     => INT_BOOTLOADER_EN,
+    -- Boot Configuration --
+    BOOT_MODE_SELECT      => BOOT_MODE_SELECT,
+    BOOT_ADDR_CUSTOM      => BOOT_ADDR_CUSTOM,
     -- On-Chip Debugger --
     OCD_EN                => OCD_EN,
     OCD_AUTHENTICATION    => OCD_AUTHENTICATION,