[PATCH] spl: Kconfig: Record proper dependency for SPL_ATF

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] spl: Kconfig: Record proper dependency for SPL_ATF

Michal Simek-3
ATF support was all the time based on FIT image support but this dependency
is not recorded anywhere.
For !SPL_FIT && SPL_ATF there is compilation error:
common/spl/spl.c: In function 'board_init_r':
common/spl/spl.c:689:26: error: 'struct spl_image_info' has no member named 'fdt_addr'
  689 |   spl_fixup_fdt(spl_image.fdt_addr);

Signed-off-by: Michal Simek <[hidden email]>
---

 common/spl/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index af8255a8d6ab..a7fabda969d4 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1271,7 +1271,7 @@ config SPL_YMODEM_SUPPORT
 
 config SPL_ATF
  bool "Support ARM Trusted Firmware"
- depends on ARM64
+ depends on ARM64 && SPL_FIT
  help
   ATF(ARM Trusted Firmware) is a component for ARM AArch64 which
   is loaded by SPL (which is considered as BL2 in ATF terminology).
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] spl: Kconfig: Record proper dependency for SPL_ATF

Simon Glass-3
On Thu, 3 Sep 2020 at 04:02, Michal Simek <[hidden email]> wrote:

>
> ATF support was all the time based on FIT image support but this dependency
> is not recorded anywhere.
> For !SPL_FIT && SPL_ATF there is compilation error:
> common/spl/spl.c: In function 'board_init_r':
> common/spl/spl.c:689:26: error: 'struct spl_image_info' has no member named 'fdt_addr'
>   689 |   spl_fixup_fdt(spl_image.fdt_addr);
>
> Signed-off-by: Michal Simek <[hidden email]>
> ---
>
>  common/spl/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <[hidden email]>
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] spl: Kconfig: Record proper dependency for SPL_ATF

Michal Simek-4
In reply to this post by Michal Simek-3
čt 3. 9. 2020 v 12:02 odesílatel Michal Simek <[hidden email]> napsal:

>
> ATF support was all the time based on FIT image support but this dependency
> is not recorded anywhere.
> For !SPL_FIT && SPL_ATF there is compilation error:
> common/spl/spl.c: In function 'board_init_r':
> common/spl/spl.c:689:26: error: 'struct spl_image_info' has no member named 'fdt_addr'
>   689 |   spl_fixup_fdt(spl_image.fdt_addr);
>
> Signed-off-by: Michal Simek <[hidden email]>
> ---
>
>  common/spl/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> index af8255a8d6ab..a7fabda969d4 100644
> --- a/common/spl/Kconfig
> +++ b/common/spl/Kconfig
> @@ -1271,7 +1271,7 @@ config SPL_YMODEM_SUPPORT
>
>  config SPL_ATF
>         bool "Support ARM Trusted Firmware"
> -       depends on ARM64
> +       depends on ARM64 && SPL_FIT
>         help
>           ATF(ARM Trusted Firmware) is a component for ARM AArch64 which
>           is loaded by SPL (which is considered as BL2 in ATF terminology).
> --
> 2.28.0
>

Applied.
M

--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs