| Message ID | 1476264373-2966-4-git-send-email-Zhiqiang.Hou@nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | York Sun |
| Headers | show |
> -----Original Message----- > From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Zhiqiang > Hou > Sent: Wednesday, October 12, 2016 2:56 PM > To: u-boot@lists.denx.de; albert.u.boot@aribaud.net; york sun > <york.sun@nxp.com>; sjg@chromium.org; bmeng.cn@gmail.com; > hs@denx.de; yamada.masahiro@socionext.com; Ruchika Gupta > <ruchika.gupta@nxp.com>; eddy.petrisor@gmail.com; > s.temerkhanov@gmail.com; Prabhakar Kushwaha > <prabhakar.kushwaha@nxp.com>; sr@denx.de; van.freenix@gmail.com; > fgretief@spaceteq.co.za; rpjday@crashcourse.ca; trini@konsulko.com; > Mingkai Hu <mingkai.hu@nxp.com> > Cc: Z.Q. Hou <zhiqiang.hou@nxp.com> > Subject: [U-Boot] [PATCH 4/5] kconfig: fsl PPA: move CONFIG_* to Kconfig > > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > --- > arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 29 > +++++++++++++++++++++++++++++ arch/arm/cpu/armv8/fsl- > layerscape/Makefile | 2 +- > include/configs/ls1043ardb.h | 7 ------- > include/configs/ls1046ardb.h | 7 ------- > 4 files changed, 30 insertions(+), 15 deletions(-) > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > index 94ec8d5..952db19 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > @@ -44,6 +44,35 @@ config FSL_LSCH3 > menu "Layerscape architecture" > depends on FSL_LSCH2 || FSL_LSCH3 > > +menu "Layerscape PPA" > +config FSL_LS_PPA > + bool "FSL Layerscape PPA firmware support" > + depends on ARCH_LS1043A || ARCH_LS1046A > + select ARMV8_PSCI > + select ARMV8_SEC_FIRMWARE_SUPPORT > + select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT ' ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT' macro is not required for chassis 3 platforms like LS2088A. So there should be separate CONFIG_.. option for this. > + help > + The FSL Primary Protected Application (PPA) is a software > component > + loaded during boot which runs in TrustZone and remains resident > + after boot. > +choice > + prompt "FSL Layerscape PPA firmware storage select" > + depends on FSL_LS_PPA > + default SYS_LS_PPA_FW_IN_XIP > + > +config SYS_LS_PPA_FW_IN_XIP > + bool "XIP" > + > +endchoice > + > +config SYS_LS_PPA_FW_ADDR > + hex "Address of PPA firmware" > + depends on FSL_LS_PPA > + default 0x60500000 if SYS_LS_PPA_FW_IN_XIP && NOR_BOOT > + default 0x40500000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT > + > +endmenu > + > config SYS_FSL_MMDC > bool > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Makefile > b/arch/arm/cpu/armv8/fsl-layerscape/Makefile > index 51c1cee..150eb7a 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/Makefile > +++ b/arch/arm/cpu/armv8/fsl-layerscape/Makefile > @@ -10,7 +10,7 @@ obj-y += soc.o > obj-$(CONFIG_MP) += mp.o > obj-$(CONFIG_OF_LIBFDT) += fdt.o > obj-$(CONFIG_SPL) += spl.o > -obj-$(CONFIG_FSL_LS_PPA) += ppa.o > +obj-$(CONFIG_$(SPL_)FSL_LS_PPA) += ppa.o > > ifneq ($(CONFIG_FSL_LSCH3),) > obj-y += fsl_lsch3_speed.o > diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h > index 4b4d090..3023c48 100644 > --- a/include/configs/ls1043ardb.h > +++ b/include/configs/ls1043ardb.h > @@ -9,13 +9,6 @@ > > #include "ls1043a_common.h" > > -#if defined(CONFIG_FSL_LS_PPA) > -#define CONFIG_SYS_LS_PPA_FW_IN_XIP > -#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP > -#define CONFIG_SYS_LS_PPA_FW_ADDR 0x60500000 > -#endif > -#endif > - > #define CONFIG_DISPLAY_CPUINFO > #define CONFIG_DISPLAY_BOARDINFO > > diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h > index 85a58b0..3ea02f0 100644 > --- a/include/configs/ls1046ardb.h > +++ b/include/configs/ls1046ardb.h > @@ -9,13 +9,6 @@ > > #include "ls1046a_common.h" > > -#if defined(CONFIG_FSL_LS_PPA) > -#define CONFIG_SYS_LS_PPA_FW_IN_XIP > -#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP > -#define CONFIG_SYS_LS_PPA_FW_ADDR 0x40500000 > -#endif > -#endif > - > #define CONFIG_DISPLAY_CPUINFO > #define CONFIG_DISPLAY_BOARDINFO > > -- > 2.1.0.27.g96db324 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
On 10/24/2016 12:40 AM, Priyanka Jain wrote: > > >> -----Original Message----- >> From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Zhiqiang >> Hou >> Sent: Wednesday, October 12, 2016 2:56 PM >> To: u-boot@lists.denx.de; albert.u.boot@aribaud.net; york sun >> <york.sun@nxp.com>; sjg@chromium.org; bmeng.cn@gmail.com; >> hs@denx.de; yamada.masahiro@socionext.com; Ruchika Gupta >> <ruchika.gupta@nxp.com>; eddy.petrisor@gmail.com; >> s.temerkhanov@gmail.com; Prabhakar Kushwaha >> <prabhakar.kushwaha@nxp.com>; sr@denx.de; van.freenix@gmail.com; >> fgretief@spaceteq.co.za; rpjday@crashcourse.ca; trini@konsulko.com; >> Mingkai Hu <mingkai.hu@nxp.com> >> Cc: Z.Q. Hou <zhiqiang.hou@nxp.com> >> Subject: [U-Boot] [PATCH 4/5] kconfig: fsl PPA: move CONFIG_* to Kconfig >> >> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> >> >> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> >> --- >> arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 29 >> +++++++++++++++++++++++++++++ arch/arm/cpu/armv8/fsl- >> layerscape/Makefile | 2 +- >> include/configs/ls1043ardb.h | 7 ------- >> include/configs/ls1046ardb.h | 7 ------- >> 4 files changed, 30 insertions(+), 15 deletions(-) >> >> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig >> b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig >> index 94ec8d5..952db19 100644 >> --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig >> +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig >> @@ -44,6 +44,35 @@ config FSL_LSCH3 >> menu "Layerscape architecture" >> depends on FSL_LSCH2 || FSL_LSCH3 >> >> +menu "Layerscape PPA" >> +config FSL_LS_PPA >> + bool "FSL Layerscape PPA firmware support" >> + depends on ARCH_LS1043A || ARCH_LS1046A >> + select ARMV8_PSCI >> + select ARMV8_SEC_FIRMWARE_SUPPORT >> + select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT > ' ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT' macro is not required for chassis 3 platforms like LS2088A. > So there should be separate CONFIG_.. option for this. Zhiqiang, How will you handle lsch3? York
Hi York, Thanks for your comments! > -----Original Message----- > From: york sun > Sent: 2016年11月8日 2:33 > To: Priyanka Jain <priyanka.jain@nxp.com>; Z.Q. Hou > <zhiqiang.hou@nxp.com>; u-boot@lists.denx.de; albert.u.boot@aribaud.net; > sjg@chromium.org; bmeng.cn@gmail.com; hs@denx.de; > yamada.masahiro@socionext.com; Ruchika Gupta <ruchika.gupta@nxp.com>; > eddy.petrisor@gmail.com; s.temerkhanov@gmail.com; Prabhakar Kushwaha > <prabhakar.kushwaha@nxp.com>; sr@denx.de; van.freenix@gmail.com; > fgretief@spaceteq.co.za; rpjday@crashcourse.ca; trini@konsulko.com; > Mingkai Hu <mingkai.hu@nxp.com> > Subject: Re: [U-Boot] [PATCH 4/5] kconfig: fsl PPA: move CONFIG_* to Kconfig > > On 10/24/2016 12:40 AM, Priyanka Jain wrote: > > > > > >> -----Original Message----- > >> From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of > >> Zhiqiang Hou > >> Sent: Wednesday, October 12, 2016 2:56 PM > >> To: u-boot@lists.denx.de; albert.u.boot@aribaud.net; york sun > >> <york.sun@nxp.com>; sjg@chromium.org; bmeng.cn@gmail.com; > hs@denx.de; > >> yamada.masahiro@socionext.com; Ruchika Gupta > <ruchika.gupta@nxp.com>; > >> eddy.petrisor@gmail.com; s.temerkhanov@gmail.com; Prabhakar > Kushwaha > >> <prabhakar.kushwaha@nxp.com>; sr@denx.de; van.freenix@gmail.com; > >> fgretief@spaceteq.co.za; rpjday@crashcourse.ca; trini@konsulko.com; > >> Mingkai Hu <mingkai.hu@nxp.com> > >> Cc: Z.Q. Hou <zhiqiang.hou@nxp.com> > >> Subject: [U-Boot] [PATCH 4/5] kconfig: fsl PPA: move CONFIG_* to > >> Kconfig > >> > >> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > >> > >> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > >> --- > >> arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 29 > >> +++++++++++++++++++++++++++++ arch/arm/cpu/armv8/fsl- > >> layerscape/Makefile | 2 +- > >> include/configs/ls1043ardb.h | 7 ------- > >> include/configs/ls1046ardb.h | 7 ------- > >> 4 files changed, 30 insertions(+), 15 deletions(-) > >> > >> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > >> b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > >> index 94ec8d5..952db19 100644 > >> --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > >> +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > >> @@ -44,6 +44,35 @@ config FSL_LSCH3 > >> menu "Layerscape architecture" > >> depends on FSL_LSCH2 || FSL_LSCH3 > >> > >> +menu "Layerscape PPA" > >> +config FSL_LS_PPA > >> + bool "FSL Layerscape PPA firmware support" > >> + depends on ARCH_LS1043A || ARCH_LS1046A > >> + select ARMV8_PSCI > >> + select ARMV8_SEC_FIRMWARE_SUPPORT > >> + select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT > > ' ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT' macro is not required for > chassis 3 platforms like LS2088A. > > So there should be separate CONFIG_.. option for this. > > Zhiqiang, > > How will you handle lsch3? > Will change it to 'select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT if FSL_LSCH2', since SCFG is big-endian on FSL_LSCH2 but little-endian on FSL_LSCH3. Thanks, Zhiqiang
On 11/07/2016 06:39 PM, Z.Q. Hou wrote: >> Zhiqiang, >> >> How will you handle lsch3? >> > Will change it to 'select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT if FSL_LSCH2', since SCFG is big-endian on FSL_LSCH2 but little-endian on FSL_LSCH3. > Zhiqiang, Have you sent out an update? If not, please rebase your code before sending it. York
Hi York, Thanks for your comments! > -----Original Message----- > From: york sun > Sent: 2017年1月5日 2:49 > To: Z.Q. Hou <zhiqiang.hou@nxp.com>; Priyanka Jain > <priyanka.jain@nxp.com>; u-boot@lists.denx.de; albert.u.boot@aribaud.net; > sjg@chromium.org; bmeng.cn@gmail.com; hs@denx.de; > yamada.masahiro@socionext.com; Ruchika Gupta <ruchika.gupta@nxp.com>; > eddy.petrisor@gmail.com; s.temerkhanov@gmail.com; Prabhakar Kushwaha > <prabhakar.kushwaha@nxp.com>; sr@denx.de; van.freenix@gmail.com; > fgretief@spaceteq.co.za; rpjday@crashcourse.ca; trini@konsulko.com; > Mingkai Hu <mingkai.hu@nxp.com> > Subject: Re: [U-Boot] [PATCH 4/5] kconfig: fsl PPA: move CONFIG_* to Kconfig > > On 11/07/2016 06:39 PM, Z.Q. Hou wrote: > >> Zhiqiang, > >> > >> How will you handle lsch3? > >> > > Will change it to 'select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT if > FSL_LSCH2', since SCFG is big-endian on FSL_LSCH2 but little-endian on > FSL_LSCH3. > > > > Zhiqiang, > > Have you sent out an update? If not, please rebase your code before sending > it. No, I haven't. This task has not been arranged to this sprint, will add it to next sprint. Thanks, Zhiqiang
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 94ec8d5..952db19 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -44,6 +44,35 @@ config FSL_LSCH3 menu "Layerscape architecture" depends on FSL_LSCH2 || FSL_LSCH3 +menu "Layerscape PPA" +config FSL_LS_PPA + bool "FSL Layerscape PPA firmware support" + depends on ARCH_LS1043A || ARCH_LS1046A + select ARMV8_PSCI + select ARMV8_SEC_FIRMWARE_SUPPORT + select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT + help + The FSL Primary Protected Application (PPA) is a software component + loaded during boot which runs in TrustZone and remains resident + after boot. +choice + prompt "FSL Layerscape PPA firmware storage select" + depends on FSL_LS_PPA + default SYS_LS_PPA_FW_IN_XIP + +config SYS_LS_PPA_FW_IN_XIP + bool "XIP" + +endchoice + +config SYS_LS_PPA_FW_ADDR + hex "Address of PPA firmware" + depends on FSL_LS_PPA + default 0x60500000 if SYS_LS_PPA_FW_IN_XIP && NOR_BOOT + default 0x40500000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + +endmenu + config SYS_FSL_MMDC bool diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Makefile b/arch/arm/cpu/armv8/fsl-layerscape/Makefile index 51c1cee..150eb7a 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Makefile +++ b/arch/arm/cpu/armv8/fsl-layerscape/Makefile @@ -10,7 +10,7 @@ obj-y += soc.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_OF_LIBFDT) += fdt.o obj-$(CONFIG_SPL) += spl.o -obj-$(CONFIG_FSL_LS_PPA) += ppa.o +obj-$(CONFIG_$(SPL_)FSL_LS_PPA) += ppa.o ifneq ($(CONFIG_FSL_LSCH3),) obj-y += fsl_lsch3_speed.o diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 4b4d090..3023c48 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -9,13 +9,6 @@ #include "ls1043a_common.h" -#if defined(CONFIG_FSL_LS_PPA) -#define CONFIG_SYS_LS_PPA_FW_IN_XIP -#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP -#define CONFIG_SYS_LS_PPA_FW_ADDR 0x60500000 -#endif -#endif - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 85a58b0..3ea02f0 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -9,13 +9,6 @@ #include "ls1046a_common.h" -#if defined(CONFIG_FSL_LS_PPA) -#define CONFIG_SYS_LS_PPA_FW_IN_XIP -#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP -#define CONFIG_SYS_LS_PPA_FW_ADDR 0x40500000 -#endif -#endif - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO