Commit 710519b5 authored by David Volz's avatar David Volz
Browse files

simplified replacing (vlnv kid)

parent bf136442
Pipeline #2549 passed with stages
in 157 minutes and 8 seconds
......@@ -84,9 +84,9 @@ namespace eval arch {
set offset [next_valid_address $offset $range]
::platform::addressmap::add_processing_element [llength [dict keys $ret]] $offset $range
if { $usage == "register" } {
dict set ret $intf "interface $intf [format "offset 0x%08x range 0x%08x" $offset $range] kind register subintf $i"
dict set ret $intf "interface $intf [format "offset 0x%08x range 0x%08x" $offset $range] kind register"
} else {
dict set ret $intf "interface $intf [format "offset 0x%08x range 0x%08x" $offset $range] kind memory subintf $i"
dict set ret $intf "interface $intf [format "offset 0x%08x range 0x%08x" $offset $range] kind memory"
}
incr offset $range
}
......
......@@ -540,14 +540,13 @@ namespace eval ::tapasco::ip {
set kid [dict get [::tapasco::get_composition] $kind id]
set vlnv [dict get [::tapasco::get_composition] $kind vlnv]
if {[tapasco::is_feature_enabled "IPEC"]} {
set feature [tapasco::get_feature "IPEC"]
if {[dict exists $feature $vlnv]} {
set subintf [dict get $addr $intf "subintf"]
set kid [lindex [dict get $feature $vlnv "kid"] $subintf]
set kid [expr int($kid)]
set vlnv [lindex [dict get $feature $vlnv "vlnv"] $subintf]
}
set ipecfeature [tapasco::get_feature "IPEC"]
set intfname [lindex [split $intf /] end]
if {[dict exists $ipecfeature $vlnv $intfname]} {
set kid [dict get $ipecfeature $vlnv $intfname "kid"]
set kid [expr int($kid)]
set vlnv [dict get $ipecfeature $vlnv $intfname "vlnv"]
puts " replaced vlnv $vlnv kid $kid"
}
lappend slots [json::write object "Type" [json::write string "Kernel"] "SlotId" $slot_id "Kernel" $kid \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment