vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

board: phytec: phycore-am62: select tifsstub via FIT config

Browse Source 
Use the k3_fit_config_match_security_state() helper introduced in the
earlier "arm: k3: select tifsstub via board_fit_config_name_match"
patch to pick the right tifsstub variant on phycore AM62x and AM62Ax
SoMs at FIT config selection time.

The k3-am625-phycore-som-binman.dtsi and
k3-am62a-phycore-som-binman.dtsi FIT images are split into
per-security-state configurations (conf-hs-se, conf-hs-fs), and
board_fit_config_name_match() in each phycore board file forwards to
the shared K3 helper.

Signed-off-by: Aristo Chen <aristo.chen@canonical.com>
This commit is contained in:
Aristo Chen
2026-07-16 12:03:40 -06:00
committed by Tom Rini
parent c85bf61b14
commit 857c2151ca
4 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/dts/k3-am625-phycore-som-binman.dtsi
+32 -10
View File
@@ -314,13 +314,24 @@
};
configurations {
default = "conf-0";
default = "conf-hs-fs";
conf-0 {
description = "k3-am625-phyboard-lyra-rdk";
conf-hs-fs {
description = "k3-am625-phyboard-lyra-rdk-hs-fs";
firmware = "atf";
loadables = "tee", "tifsstub-hs", "tifsstub-fs",
"tifsstub-gp", "dm", "spl";
loadables = "tee", "tifsstub-fs", "dm", "spl";
fdt = "fdt-0";
};
conf-hs-se {
description = "k3-am625-phyboard-lyra-rdk-hs-se";
firmware = "atf";
loadables = "tee", "tifsstub-hs", "dm", "spl";
fdt = "fdt-0";
};
conf-gp {
description = "k3-am625-phyboard-lyra-rdk-gp";
firmware = "atf";
loadables = "tee", "tifsstub-gp", "dm", "spl";
fdt = "fdt-0";
};
};
@@ -552,13 +563,24 @@
};
configurations {
default = "conf-0";
default = "conf-hs-fs";
conf-0 {
description = "k3-am625-phyboard-lyra-rdk";
conf-hs-fs {
description = "k3-am625-phyboard-lyra-rdk-hs-fs";
firmware = "atf";
loadables = "tee", "tifsstub-hs", "tifsstub-fs",
"tifsstub-gp", "dm", "spl";
loadables = "tee", "tifsstub-fs", "dm", "spl";
fdt = "fdt-0";
};
conf-hs-se {
description = "k3-am625-phyboard-lyra-rdk-hs-se";
firmware = "atf";
loadables = "tee", "tifsstub-hs", "dm", "spl";
fdt = "fdt-0";
};
conf-gp {
description = "k3-am625-phyboard-lyra-rdk-gp";
firmware = "atf";
loadables = "tee", "tifsstub-gp", "dm", "spl";
fdt = "fdt-0";
};
};
arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
+10 -5
View File
@@ -247,13 +247,18 @@
};
configurations {
default = "conf-0";
default = "conf-hs-fs";
conf-0 {
description = "k3-am62a7-phyboard-lyra-rdk";
conf-hs-fs {
description = "k3-am62a7-phyboard-lyra-rdk-hs-fs";
firmware = "atf";
loadables = "tee", "dm", "spl",
"tifsstub-hs", "tifsstub-fs";
loadables = "tee", "dm", "spl", "tifsstub-fs";
fdt = "fdt-0";
};
conf-hs-se {
description = "k3-am62a7-phyboard-lyra-rdk-hs-se";
firmware = "atf";
loadables = "tee", "dm", "spl", "tifsstub-hs";
fdt = "fdt-0";
};
};
board/phytec/phycore_am62ax/phycore-am62ax.c
+6
View File
@@ -8,6 +8,7 @@
#include <asm/io.h>
#include <spl.h>
#include <fdt_support.h>
#include <image.h>
#include "../common/am6_som_detection.h"
@@ -57,3 +58,8 @@ void spl_board_init(void)
dram_init_banksize();
}
#endif
int board_fit_config_name_match(const char *name)
{
return k3_fit_config_match_security_state(name);
}
board/phytec/phycore_am62x/phycore-am62x.c
+6
View File
@@ -9,6 +9,7 @@
#include <spl.h>
#include <asm/arch/k3-ddr.h>
#include <fdt_support.h>
#include <image.h>
#include "phycore-ddr-data.h"
#include "../common/k3/k3_ddrss_patch.h"
@@ -237,3 +238,8 @@ void spl_board_init(void)
MCU_CTRL_DEVICE_CLKOUT_32K_CTRL);
}
#endif
int board_fit_config_name_match(const char *name)
{
return k3_fit_config_match_security_state(name);
}