Prepare merge of cva6/dev into master
Created by: zchamski
Resolve conflicts in VPTOOL caused by commits that occurred on both master
and cva6/dev
but do not share a common history. The end state of VPTOOL is the one on branch dev/cva6
.
Signed-off-by: Zbigniew Chamski zbigniew.chamski@thalesgroup.com