| Message ID | 428b9a306ba354b8956662e6077b6ead4122c5ca.1599127332.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 975bacc16ebe0a334767a84ad0a3e147422d6b71 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | spl: Kconfig: Record proper dependency for SPL_ATF | expand |
On Thu, 3 Sep 2020 at 04:02, Michal Simek <michal.simek@xilinx.com> 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 <michal.simek@xilinx.com> > --- > > common/spl/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org>
čt 3. 9. 2020 v 12:02 odesílatel Michal Simek <michal.simek@xilinx.com> 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 <michal.simek@xilinx.com> > --- > > 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
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).
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 <michal.simek@xilinx.com> --- common/spl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)