From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Date: Wed, 22 Oct 2014 19:57:15 +0100 Subject: [U-Boot] [PATCH] sun7i: Set CONFIG_ARMV7_SEC_BY_DEFAULT when CONFIG_OLD_KERNEL_COMPAT is set In-Reply-To: <1413985523-19303-1-git-send-email-hdegoede@redhat.com> References: <1413985523-19303-1-git-send-email-hdegoede@redhat.com> Message-ID: <1414004235.20604.74.camel@hellion.org.uk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wed, 2014-10-22 at 15:45 +0200, Hans de Goede wrote: > Old kernels cannot handle booting in non-secure (hyp) mode, so when > CONFIG_OLD_KERNEL_COMPAT is set, also set CONFIG_ARMV7_SEC_BY_DEFAULT. > > Note that whether to booting secure or non-secure can always be overriden nits: "boot" (not booting, or s/whether to/ perhaps) and "overridden" > using the bootm_boot_mode environment variable. > > Signed-off-by: Hans de Goede > --- > include/configs/sun7i.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h > index 966cbd8..4a864b2 100644 > --- a/include/configs/sun7i.h > +++ b/include/configs/sun7i.h > @@ -35,6 +35,10 @@ > #define CONFIG_ARMV7_PSCI 1 > #define CONFIG_ARMV7_PSCI_NR_CPUS 2 > #define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE > +#ifdef CONFIG_OLD_KERNEL_COMPAT > +#define CONFIG_ARMV7_SEC_BY_DEFAULT 1 > +#endif I think this would be better right after the NONSEC+VIRT defines just above the context here, since they are related. Ian.