| Message ID | 20211012235457.24615-1-samuel@sholland.org |
|---|---|
| State | Accepted |
| Commit | 00f82fcfba6ceff501bfd8e4fc2adb368f2905ac |
| Delegated to: | Andre Przywara |
| Headers | show |
| Series | sunxi: A23/A33/H3: Actually move the secure monitor | expand |
On Tue, 12 Oct 2021 18:54:56 -0500 Samuel Holland <samuel@sholland.org> wrote: > commit 1ebfc0c631e3 ("sunxi: A23/A33/H3: Move sun8i secure monitor to > SRAM A2") attempted to move the secure monitor to SRAM A2. But not all > sun8i SoCs have SRAM A2, so a check was put in for SUNXI_SRAM_A2_SIZE to > avoid breaking the other SoCs. > > However, because the header providing SUNXI_SRAM_A2_SIZE was not > included, this unintentionally skipped the new definitions on all SoCs. > Fix this by including the right header. > > Fixes: 1ebfc0c631e3 ("sunxi: A23/A33/H3: Move sun8i secure monitor to SRAM A2") > Signed-off-by: Samuel Holland <samuel@sholland.org> Indeed. Weird, I thought I checked the readelf output. Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre > --- > > include/configs/sun8i.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h > index 27c9808a49..5636356366 100644 > --- a/include/configs/sun8i.h > +++ b/include/configs/sun8i.h > @@ -12,6 +12,8 @@ > * A23 specific configuration > */ > > +#include <asm/arch/cpu.h> > + > #ifdef SUNXI_SRAM_A2_SIZE > /* > * If the SoC has enough SRAM A2, use that for the secure monitor.
diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index 27c9808a49..5636356366 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -12,6 +12,8 @@ * A23 specific configuration */ +#include <asm/arch/cpu.h> + #ifdef SUNXI_SRAM_A2_SIZE /* * If the SoC has enough SRAM A2, use that for the secure monitor.
commit 1ebfc0c631e3 ("sunxi: A23/A33/H3: Move sun8i secure monitor to SRAM A2") attempted to move the secure monitor to SRAM A2. But not all sun8i SoCs have SRAM A2, so a check was put in for SUNXI_SRAM_A2_SIZE to avoid breaking the other SoCs. However, because the header providing SUNXI_SRAM_A2_SIZE was not included, this unintentionally skipped the new definitions on all SoCs. Fix this by including the right header. Fixes: 1ebfc0c631e3 ("sunxi: A23/A33/H3: Move sun8i secure monitor to SRAM A2") Signed-off-by: Samuel Holland <samuel@sholland.org> --- include/configs/sun8i.h | 2 ++ 1 file changed, 2 insertions(+)