| Message ID | 20230721043931.14188-15-matt@traverse.com.au |
|---|---|
| State | Accepted |
| Commit | 07164d0ef1d2371582e7b561f4e4ae95cc66c0e6 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Ten64 updates 2023-07 | expand |
On 7/21/2023 12:39 PM, Mathew McBride wrote: > Allow individual Layerscape boards to opt-out of fsl_setenv_bootcmd > by declaring the original function as weak. > > fsl_setenv_bootcmd is used to change the bootcmd based on the > TF-A boot source (e.g QSPI vs SD/MMC) for reasons including > secure boot / integrity measurements and DPAA2 configuration loading. > See previous discussion at [1]. > > On the Ten64 board, our bootcmd is the same across > all TF-A boot sources so we don't want this behaviour. > > Signed-off-by: Mathew McBride<matt@traverse.com.au> Reviewed-by: Peng Fan <peng.fan@nxp.com>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 359cbc0430..577a0b6098 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -810,7 +810,7 @@ int qspi_ahb_init(void) #ifdef CONFIG_TFABOOT #define MAX_BOOTCMD_SIZE 512 -int fsl_setenv_bootcmd(void) +__weak int fsl_setenv_bootcmd(void) { int ret; enum boot_src src = get_boot_src();
Allow individual Layerscape boards to opt-out of fsl_setenv_bootcmd by declaring the original function as weak. fsl_setenv_bootcmd is used to change the bootcmd based on the TF-A boot source (e.g QSPI vs SD/MMC) for reasons including secure boot / integrity measurements and DPAA2 configuration loading. See previous discussion at [1]. On the Ten64 board, our bootcmd is the same across all TF-A boot sources so we don't want this behaviour. Signed-off-by: Mathew McBride <matt@traverse.com.au> [1] https://patchwork.ozlabs.org/project/uboot/patch/20211110044639.7070-3-matt@traverse.com.au/#2790037 --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)