diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.fpga.yaml b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.fpga.yaml
index d9a98410b65d0737ed0dbf622a1490561b028af8..c9db53eee21d5d95387444fe9e17a93af102899d 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.fpga.yaml
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.fpga.yaml
@@ -9,51 +9,41 @@ fpga_description: |
"unb1_minimal system for sopc"
peripherals:
- - peripheral_name: unb1_board/rom_system
- slave_port_names:
- - rom_system_info
- lock_base_address: 0x1000
-
- peripheral_name: unb1_board/system
slave_port_names:
- - pio_system_info
- lock_base_address: 0x0
-
- - peripheral_name: unb1_board/ctrl_unb1_board
+ - pio_system_info
+ - peripheral_name: unb1_board/rom_system
slave_port_names:
- - pio_wdi
-
- - peripheral_name: unb1_board/unb1_board_wdi_reg
+ - rom_system_info
+ - peripheral_name: unb1_board/ctrl
slave_port_names:
- - reg_wdi
-
+ - pio_wdi
+ - peripheral_name: unb1_board/wdi
+ slave_port_names:
+ - reg_wdi
- peripheral_name: eth/eth1g
slave_port_names:
- - avs_eth_0_mms_tse
- - avs_eth_0_mms_reg
- - avs_eth_0_mms_ram
-
+ - avs_eth_0_tse
+ - avs_eth_0_reg
+ - avs_eth_0_ram
- peripheral_name: ppsh/ppsh
slave_port_names:
- - pio_pps
-
- - peripheral_name: epcs/epcs_reg
+ - pio_pps
+ - peripheral_name: epcs/epcs
slave_port_names:
- - reg_epcs
- - reg_mmdp_ctrl
- - reg_mmdp_data
- - reg_dpmm_ctrl
- - reg_dpmm_data
+ - reg_epcs
+ - reg_dpmm_ctrl
+ - reg_dpmm_data
+ - reg_mmdp_ctrl
+ - reg_mmdp_data
parameter_overrides:
- { name : g_sim_flash_model, value: FALSE }
-
- - peripheral_name: remu/remu_reg
+ - peripheral_name: remu/remu
slave_port_names:
- - reg_remu
-
- - peripheral_name: unb1_board/unb1_board_sens_reg
+ - reg_remu
+ - peripheral_name: unb1_board/sens
slave_port_names:
- - reg_unb_sens
+ - reg_unb_sens
parameter_overrides:
- { name : g_sim, value: FALSE }
- { name : g_clk_freq, value: 125E6 }
diff --git a/boards/uniboard1/libraries/unb1_board/unb1_board.peripheral.yaml b/boards/uniboard1/libraries/unb1_board/unb1_board.peripheral.yaml
index 1f54bec7be4d942edf0f1e800ecdf02c42888876..eb6ec2e24c49510c75a88a64aa6432fbab490f5d 100644
--- a/boards/uniboard1/libraries/unb1_board/unb1_board.peripheral.yaml
+++ b/boards/uniboard1/libraries/unb1_board/unb1_board.peripheral.yaml
@@ -43,11 +43,11 @@ peripherals:
" settings for reg_system_info register "
# peripheral, unb1_board_wdi_reg
- - peripheral_name: ctrl_unb1_board
+ - peripheral_name: ctrl
slave_ports:
# actual hdl name: unb1_board_wdi_reg
- - slave_name : UNB1_BOARD_PIO_WDI_REG
+ - slave_name : pio_wdi
slave_type : REG
fields:
- - field_name : nios_reset
@@ -62,11 +62,11 @@ peripherals:
peripheral_description: " "
# peripheral, unb1_board_wdi_reg
- - peripheral_name: unb1_board_wdi_reg
+ - peripheral_name: wdi
slave_ports:
# actual hdl name: unb1_board_wdi_reg
- - slave_name : UNB1_BOARD_WDI_REG
+ - slave_name : wdi
slave_type : REG
fields:
- - field_name : reset_word
@@ -79,7 +79,7 @@ peripherals:
peripheral_description: " "
# periheral, unb1_board_sens
- - peripheral_name: unb1_board_sens_reg
+ - peripheral_name: sens
parameters:
- { name: g_sim, value: FALSE }
@@ -88,7 +88,7 @@ peripherals:
slave_ports:
# actual hdl name: reg_unb1_sens
- - slave_name : UNB1_BOARD_SENS_REG
+ - slave_name : sens
slave_type : REG
fields:
- - field_name : sens_data
diff --git a/libraries/base/diag/diag.peripheral.yaml b/libraries/base/diag/diag.peripheral.yaml
index cd8c4446505f7292f7dd729c9b4fa0329b500561..139d78141f26d08793d8f00ae1eeff6bdd4ab2eb 100644
--- a/libraries/base/diag/diag.peripheral.yaml
+++ b/libraries/base/diag/diag.peripheral.yaml
@@ -7,7 +7,7 @@ hdl_library_description: " This is the description for the bf package "
peripherals:
-
- peripheral_name: diag_block_gen
+ peripheral_name: block_gen
parameters:
- { name: g_nof_streams, value: 1 }
@@ -16,7 +16,7 @@ peripherals:
slave_ports:
# actual hdl name: reg_diag_bg
- - slave_name : DIAG_BG_REG
+ - slave_name : ctrl
slave_type : REG
fields:
- - field_name : Enable
@@ -69,7 +69,7 @@ peripherals:
"This REG specifies the higher(MSB) 32 bits [63:32] of the initialization BSN"
# actual hdl name: ram_diag_bg
- - slave_name : DIAG_BG_RAM
+ - slave_name : wave_data
number_of_slaves: g_nof_streams
slave_type : RAM
fields:
@@ -81,7 +81,7 @@ peripherals:
peripheral_description: |
"Block generator"
- - peripheral_name: diag_data_buffer
+ - peripheral_name: data_buffer
parameters:
- { name: g_nof_streams , value: 1 }
@@ -90,7 +90,7 @@ peripherals:
slave_ports:
# actual hdl name: reg_diag_data_buffer
- - slave_name : DIAG_DATA_BUFFER_REG
+ - slave_name : status
slave_type : REG
fields:
- - field_name : Sync_cnt
@@ -126,7 +126,7 @@ peripherals:
"Version contains the version number of the databuffer peripheral."
slave_description: ""
# actual hdl name: ram_diag_data_buffer
- - slave_name : DIAG_DATA_BUFFER_RAM
+ - slave_name : data
number_of_slaves: g_nof_streams
slave_type : RAM
fields:
diff --git a/libraries/base/dp/dp.peripheral.yaml b/libraries/base/dp/dp.peripheral.yaml
index 6e7f2f874d8683cda8cdf490575db8518ba1e9a5..f015f5fcdb514a42c55bcf8e8bcd8ac4c0c5956d 100644
--- a/libraries/base/dp/dp.peripheral.yaml
+++ b/libraries/base/dp/dp.peripheral.yaml
@@ -6,14 +6,14 @@ hdl_library_name : dp
hdl_library_description: " This is the description for the dp package "
peripherals:
- - peripheral_name: dp_bsn_align
+ - peripheral_name: bsn
parameters:
- { name: g_nof_input, value : 2 }
slave_ports:
# actual hdl name: reg_dp_bsn_align
- - slave_name : DP_BSN_ALIGN_REG
+ - slave_name : ALIGN
number_of_slaves: g_nof_input
slave_type : REG
fields:
@@ -27,13 +27,13 @@ peripherals:
peripheral_description: "This is the BSN aligner"
- - peripheral_name: dp_fifo_fill
+ - peripheral_name: fifo
parameters:
- { name : g_nof_streams, value: 3 }
slave_ports:
# actual hdl name: reg_dp_fifo_fill
- - slave_name : DP_FIFO_FILL_REG
+ - slave_name : fill_status
number_of_slaves: g_nof_streams
slave_type : REG
fields:
diff --git a/libraries/dsp/bf/bf.peripheral.yaml b/libraries/dsp/bf/bf.peripheral.yaml
index 96cba5309fc5c4870eaf76315e89d5e80dfca06a..85987668999582e19448a14b902807b067f9e30e 100644
--- a/libraries/dsp/bf/bf.peripheral.yaml
+++ b/libraries/dsp/bf/bf.peripheral.yaml
@@ -6,7 +6,7 @@ hdl_library_name : bf
hdl_library_description: " This is the description for the bf package "
peripherals:
- - peripheral_name: bf_unit
+ - peripheral_name: bf
parameters:
- { name: g_bf.in_weights_w , value: 16 }
@@ -18,7 +18,7 @@ peripherals:
slave_ports:
# ram_bf_weights
- - slave_name : BF_WEIGHTS_RAM
+ - slave_name : WEIGHTS
number_of_slaves: g_bf.nof_weights
slave_type: RAM
fields:
@@ -33,7 +33,7 @@ peripherals:
" "
# ram_ss_ss_wide
- - slave_name : BF_SS_SS_WIDE_RAM
+ - slave_name : SS_SS_WIDE
number_of_slaves: g_bf.nof_weights
slave_type: RAM
fields:
@@ -46,7 +46,7 @@ peripherals:
" "
# ram_st_sst_bf
- - slave_name : BF_ST_SST_RAM
+ - slave_name : ST_SST
number_of_slaves: g_bf.nof_weights
slave_type: RAM
fields:
@@ -61,7 +61,7 @@ peripherals:
" "
# reg_st_sst_bf
- - slave_name : BF_ST_SST_REG
+ - slave_name : treshold
number_of_slaves: 1
slave_type: REG
fields:
diff --git a/libraries/dsp/fringe_stop/fringe_stop.peripheral.yaml b/libraries/dsp/fringe_stop/fringe_stop.peripheral.yaml
index aca95e8e629af60d872863c58d05c33614d4e819..04e707fbea28f020d5a47173567f77811cad3291 100644
--- a/libraries/dsp/fringe_stop/fringe_stop.peripheral.yaml
+++ b/libraries/dsp/fringe_stop/fringe_stop.peripheral.yaml
@@ -6,7 +6,7 @@ hdl_library_name : fringe_stop
hdl_library_description: " This is the description for the finge_stop library "
peripherals:
- - peripheral_name: fringe_stop_unit
+ - peripheral_name: fringe_stop
parameters:
- { name: g_nof_channels, value: 256 }
@@ -15,7 +15,7 @@ peripherals:
slave_ports:
# actual hdl name: ram_fringe_stop_step
- - slave_name : "FRINGE_STOP_STEP_RAM"
+ - slave_name : STEP
slave_type : RAM
fields:
- - field_name : fringe_stop_step
@@ -26,7 +26,7 @@ peripherals:
slave_discription: " "
# actual hdl name: fringe_stop_offset
- - slave_name : "FRINGE_STOP_OFFSET_RAM"
+ - slave_name : STOP_OFFSET
slave_type : RAM
fields:
- - field_name: fringe_stop_offset
diff --git a/libraries/io/epcs/epcs.peripheral.yaml b/libraries/io/epcs/epcs.peripheral.yaml
index 1b41c1ae6d1c7b8ad5a693665fd7d1fde9ee740f..f569cf6840f74fd0be8c15685287715a519a2f7f 100644
--- a/libraries/io/epcs/epcs.peripheral.yaml
+++ b/libraries/io/epcs/epcs.peripheral.yaml
@@ -9,14 +9,14 @@ peripherals:
# epcs_reg
-
- peripheral_name: epcs_reg
+ peripheral_name: epcs
parameters:
- {name: "g_sim_flash_model", value: TRUE}
slave_ports:
# actual hdl name: epcs_reg
- - slave_name : EPCS_REG
+ - slave_name : EPCS
slave_type : REG
fields:
- - field_name : addr
@@ -60,7 +60,7 @@ peripherals:
slave_description: " Read and write access to flash "
# actual hdl name: mms_dp_fifo_to_mm
- - slave_name : EPCS_DPMM_CTRL_REG
+ - slave_name : DPMM_CTRL
slave_type : REG
fields:
- - field_name : ctrl
@@ -69,7 +69,7 @@ peripherals:
address_offset: 0x0
field_description: " "
- - slave_name : EPCS_DPMM_DATA_REG
+ - slave_name : DPMM_DATA
slave_type : REG
fields:
- - field_name : data
@@ -79,7 +79,7 @@ peripherals:
field_description: " "
# actual hdl name: mms_dp_fifo_from_mm
- - slave_name : EPCS_MMDP_CTRL_REG
+ - slave_name : MMDP_CTRL
slave_type : REG
fields:
- - field_name : ctrl
@@ -88,7 +88,7 @@ peripherals:
address_offset: 0x0
field_description: " "
- - slave_name : EPCS_MMDP_DATA_REG
+ - slave_name : MMDP_DATA
slave_type : REG
fields:
- - field_name : data
diff --git a/libraries/io/eth/eth.peripheral.yaml b/libraries/io/eth/eth.peripheral.yaml
index 9656fb34fec8a60faefdf5d72fe3345186abf4dd..52cdc9dc3d091fa3c8f4088069adf61a7c81bc7f 100644
--- a/libraries/io/eth/eth.peripheral.yaml
+++ b/libraries/io/eth/eth.peripheral.yaml
@@ -16,7 +16,7 @@ peripherals:
slave_ports:
# actual hdl name: reg_tse
- - slave_name : ETH_TSE_REG
+ - slave_name : TSE
slave_type : REG
fields:
- - field_name : status
@@ -27,8 +27,8 @@ peripherals:
slave_description: " "
# actual hdl name: reg
- - slave_name : ETH_REG
- slave_type : REG
+ - slave_name : ETH
+ slave_type : REG
fields:
- - field_name : status
access_mode : RO
@@ -38,7 +38,7 @@ peripherals:
slave_description: " "
# actual hdl name: ram
- - slave_name : ETH_RAM
+ - slave_name : ETH
slave_type : RAM
fields:
- - field_name : ram
diff --git a/libraries/io/ppsh/ppsh.peripheral.yaml b/libraries/io/ppsh/ppsh.peripheral.yaml
index bbbf08cf25778a20107a099f25a0f526963477a1..c6af948356d4b093cc19e9d5eace4ccf7571eb51 100644
--- a/libraries/io/ppsh/ppsh.peripheral.yaml
+++ b/libraries/io/ppsh/ppsh.peripheral.yaml
@@ -14,7 +14,7 @@ peripherals:
slave_ports:
# actual hdl name: reg_ppsh
- - slave_name : PPSH_REG
+ - slave_name : PPSH
slave_type : REG
fields:
- - field_name : status
diff --git a/libraries/io/remu/remu.peripheral.yaml b/libraries/io/remu/remu.peripheral.yaml
index 136ae9f9a1ac2abdde390adba845845664a42321..34bcce2aab6ba0d5eab44eefc655261965f4e288 100644
--- a/libraries/io/remu/remu.peripheral.yaml
+++ b/libraries/io/remu/remu.peripheral.yaml
@@ -8,14 +8,14 @@ hdl_library_description: " This is the description for the remu package "
peripherals:
# peripheral, remu_reg
- - peripheral_name: remu_reg
+ - peripheral_name: remu
parameters:
- { name: g_data_w, value: 24 }
slave_ports:
# actual hdl name: reg_remu
- - slave_name : REMU_REG
+ - slave_name : REMU
slave_type : REG
fields:
- - field_name : reconfigure_key