]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arch: arm: fsl-layerscape: allow "opt-out" of fsl_setenv_bootcmd
authorMathew McBride <matt@traverse.com.au>
Fri, 21 Jul 2023 04:39:29 +0000 (04:39 +0000)
committerTom Rini <trini@konsulko.com>
Thu, 3 Aug 2023 13:40:50 +0000 (09:40 -0400)
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

Reviewed-by: Peng Fan <peng.fan@nxp.com>
arch/arm/cpu/armv8/fsl-layerscape/soc.c

index 359cbc0430970ff712aec4a7a67e38494886bd1d..577a0b60983c2e1323c7f930d77b0e5035b439eb 100644 (file)
@@ -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();