From 4188f58a6a66e01bd8c28547a04cd5a59d90f2e1 Mon Sep 17 00:00:00 2001
From: Michal Simek <michal.simek@amd.com>
Date: Thu, 13 Feb 2025 15:30:32 +0100
Subject: [PATCH] boards: amd: kv260_r5: add support for fsbl and bitstream

Some tests requires to also run fsbl and load bitstream before loading
Zephyr.

Currently only --elf-file and --fsbl are suported.
But there could be also bitstream loaded via --bistream parameter but
xsdb script is missing it.
Tricky part on it is when only fsbl or bitstream are loaded they are
sharing the same argument location that's why detect if second parameter is
bitstream by matching "*.bit" in it to support all combinations.

And also switch board to jtag boot mode all the time. The reason is that
starter kits with SOM have preloaded SW already and starting in QSPI boot
mode that's why with using XSDB make sure that board is running in jtag
boot mode all the time no matter if any SW runs on it.

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
---
 boards/amd/kv260_r5/support/xsdb.cfg | 81 ++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 9 deletions(-)

diff --git a/boards/amd/kv260_r5/support/xsdb.cfg b/boards/amd/kv260_r5/support/xsdb.cfg
index 2976c9e763f..8639d93b2ab 100644
--- a/boards/amd/kv260_r5/support/xsdb.cfg
+++ b/boards/amd/kv260_r5/support/xsdb.cfg
@@ -2,23 +2,86 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+proc boot_jtag { } {
+	# switch to JTAG boot mode #
+	targets -set -filter {name =~ "PSU*"}
+	stop
+	# update multiboot to ZERO
+	mwr 0xffca0010 0x0
+	# change boot mode to JTAG
+	mwr 0xff5e0200 0x0100
+	# reset
+	rst -system
+}
+
 proc load_image args  {
 	set elf_file [lindex $args 0]
-	set fsblelf_file [lindex $args 1]
-	connect -url 127.0.0.1:3121
+	set bitfile [lindex $args 1]
+	set fsblelf_file [lindex $args 2]
+
+	if { [info exists ::env(HW_SERVER_URL)] } {
+		connect -url $::env(HW_SERVER_URL)
+	} else {
+		connect
+	}
+
 	after 2000
+
+	# setup jtag boot mode
+	boot_jtag
+	after 2000
+
 	targets -set -nocase -filter {name =~ "*R5*#0"}
+
+	# load bitstream if passed
+	if { [string length $bitfile] != 0 } {
+		fpga -f $bitfile -no-revision-check
+	}
+
 	rst -proc
-	dow $fsblelf_file
-	after 1000
-	con
-	after 1000
-	stop
-	targets -set -nocase -filter {name =~ "*R5*#0"}
+
+	# load FSBL if passed
+	if { [string length $fsblelf_file] != 0 } {
+		dow $fsblelf_file
+		after 1000
+		con
+		after 1000
+		stop
+	}
+
 	after 2000
 	dow $elf_file
 	con
 	exit
 }
 
-load_image {*}$argv
+switch $argc {
+	"1" {
+		set zephyr_elf [lindex $argv 0]
+		set bitstream ""
+		set fsbl_elf ""
+	}
+	"2" {
+		set par [lindex $argv 1]
+		set substring "*.bit"
+		if { [string match -nocase $substring $par] == 0 } {
+			set bitstream ""
+			set fsbl_elf $par
+		} else {
+			set bitstream $par
+			set fsbl_elf ""
+		}
+		set zephyr_elf [lindex $argv 0]
+	}
+	"3" {
+		set zephyr_elf [lindex $argv 0]
+		set bitstream [lindex $argv 1]
+		set fsbl_elf [lindex $argv 2]
+	}
+	default {
+		puts "Unsifficient number for args"
+		exit -1
+	}
+}
+
+load_image "$zephyr_elf" "$bitstream" "$fsbl_elf"