Message ID | 20230331085813.321590-1-peter.hoyes@arm.com |
---|---|
State | Accepted |
Commit | 3635df6bdf29cf22ce7378a50276cf71a6b3dc52 |
Delegated to: | Tom Rini |
Headers | show |
Series | [1/3] vexpress64: Use OF_HAS_PRIOR_STAGE for BASE_FVP variant | expand |
On Fri, 31 Mar 2023 09:58:11 +0100 Peter Hoyes <peter.hoyes@arm.com> wrote: > From: Peter Hoyes <Peter.Hoyes@arm.com> > > BASE_FVP now typically uses a devicetree provided by a prior boot stage > (typically Arm TF-A), so imply this option by default when > TARGET_VEXPRESS64_BASE_FVP is selected. > > OF_HAS_PRIOR_STAGE selects OF_BOARD so this change is minor, but aligns > TARGET_VEXPRESS64_BASE_FVP with TARGET_VEXPRESS64_BASER_FVP. Yeah, makes sense. Both secure firmware implementations commonly used (boot-wrapper and TF-A) provide a DTB. > Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre > --- > board/armltd/vexpress64/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig > index 5616e223a9..bd15cbeb7e 100644 > --- a/board/armltd/vexpress64/Kconfig > +++ b/board/armltd/vexpress64/Kconfig > @@ -23,7 +23,7 @@ choice > config TARGET_VEXPRESS64_BASE_FVP > bool "Support Versatile Express ARMv8a FVP BASE model" > select VEXPRESS64_BASE_MODEL > - select OF_BOARD > + imply OF_HAS_PRIOR_STAGE > > config TARGET_VEXPRESS64_BASER_FVP > bool "Support Versatile Express ARMv8r64 FVP BASE model"
On Fri, Mar 31, 2023 at 09:58:11AM +0100, Peter Hoyes wrote: > From: Peter Hoyes <Peter.Hoyes@arm.com> > > BASE_FVP now typically uses a devicetree provided by a prior boot stage > (typically Arm TF-A), so imply this option by default when > TARGET_VEXPRESS64_BASE_FVP is selected. > > OF_HAS_PRIOR_STAGE selects OF_BOARD so this change is minor, but aligns > TARGET_VEXPRESS64_BASE_FVP with TARGET_VEXPRESS64_BASER_FVP. > > Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com> > Reviewed-by: Andre Przywara <andre.przywara@arm.com> Applied to u-boot/master, thanks!
diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig index 5616e223a9..bd15cbeb7e 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -23,7 +23,7 @@ choice config TARGET_VEXPRESS64_BASE_FVP bool "Support Versatile Express ARMv8a FVP BASE model" select VEXPRESS64_BASE_MODEL - select OF_BOARD + imply OF_HAS_PRIOR_STAGE config TARGET_VEXPRESS64_BASER_FVP bool "Support Versatile Express ARMv8r64 FVP BASE model"