diff mbox

[U-Boot,V3,3/3] imx: mx7: default enable non-secure mode

Message ID 1445517279-4534-3-git-send-email-Peng.Fan@freescale.com
State Superseded
Headers show

Commit Message

Peng Fan Oct. 22, 2015, 12:34 p.m. UTC
Support PSCI and switch to non-secure mode when booting linux.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
---

Changes V3:
 none

Changes V2:
 default no enable CONFIG_ARMV7_VIRT

 include/configs/mx7_common.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Fabio Estevam Oct. 22, 2015, 2:48 p.m. UTC | #1
On Thu, Oct 22, 2015 at 10:34 AM, Peng Fan <Peng.Fan@freescale.com> wrote:

> +/*
> + * Default boot linux kernel in no secure mode.
> + * If want to boot kernel in secure mode, please define CONFIG_MX7_SEC
> + */
> +#ifndef CONFIG_MX7_SEC
> +#define CONFIG_ARMV7_NONSEC            1
> +#define CONFIG_ARMV7_PSCI              1

These 1's are not required.
Peng Fan Oct. 22, 2015, 3:29 p.m. UTC | #2
On Thu, Oct 22, 2015 at 12:48:51PM -0200, Fabio Estevam wrote:
>On Thu, Oct 22, 2015 at 10:34 AM, Peng Fan <Peng.Fan@freescale.com> wrote:
>
>> +/*
>> + * Default boot linux kernel in no secure mode.
>> + * If want to boot kernel in secure mode, please define CONFIG_MX7_SEC
>> + */
>> +#ifndef CONFIG_MX7_SEC
>> +#define CONFIG_ARMV7_NONSEC            1
>> +#define CONFIG_ARMV7_PSCI              1
>
>These 1's are not required.

I saw sunxi also have 1. Does it hurt?
Fabio Estevam Oct. 22, 2015, 3:32 p.m. UTC | #3
On Thu, Oct 22, 2015 at 1:29 PM, Peng Fan <b51431@freescale.com> wrote:
> On Thu, Oct 22, 2015 at 12:48:51PM -0200, Fabio Estevam wrote:
>>On Thu, Oct 22, 2015 at 10:34 AM, Peng Fan <Peng.Fan@freescale.com> wrote:
>>
>>> +/*
>>> + * Default boot linux kernel in no secure mode.
>>> + * If want to boot kernel in secure mode, please define CONFIG_MX7_SEC
>>> + */
>>> +#ifndef CONFIG_MX7_SEC
>>> +#define CONFIG_ARMV7_NONSEC            1
>>> +#define CONFIG_ARMV7_PSCI              1
>>
>>These 1's are not required.
>
> I saw sunxi also have 1. Does it hurt?

It does not hurt, but is not needed. Please remove it from this patch.
diff mbox

Patch

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index ea2be49..e3a70b8 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -92,4 +92,15 @@ 
 #define CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 
+/*
+ * Default boot linux kernel in no secure mode.
+ * If want to boot kernel in secure mode, please define CONFIG_MX7_SEC
+ */
+#ifndef CONFIG_MX7_SEC
+#define CONFIG_ARMV7_NONSEC		1
+#define CONFIG_ARMV7_PSCI		1
+#define CONFIG_ARMV7_PSCI_NR_CPUS	2
+#define CONFIG_ARMV7_SECURE_BASE	0x00900000
+#endif
+
 #endif