Message ID | 1490257100-16483-7-git-send-email-sumit.garg@nxp.com |
---|---|
State | Accepted |
Delegated to: | York Sun |
Headers | show |
On 03/23/2017 01:19 AM, Sumit Garg wrote: > From: Vinitha Pillai-B57223 <vinitha.pillai@nxp.com> > > Define bootscript and its header addresses for QSPI target > Also add PPA header address in Kconfig > > Signed-off-by: Vinitha Pillai <vinitha.pillai@nxp.com> > Signed-off-by: Sumit Garg <sumit.garg@nxp.com> > --- > arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 + > arch/arm/include/asm/arch-fsl-layerscape/config.h | 7 ++++++- > arch/arm/include/asm/fsl_secure_boot.h | 3 +++ > 3 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > index fbb6642..03bc9ea 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > @@ -160,6 +160,7 @@ config SYS_LS_PPA_ESBC_ADDR > depends on FSL_LS_PPA && CHAIN_OF_TRUST > default 0x600c0000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A > default 0x40740000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A > + default 0x40480000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A This one has another different offset. Why? York
> -----Original Message----- > From: york sun > Sent: Wednesday, March 29, 2017 10:20 PM > To: Sumit Garg <sumit.garg@nxp.com>; u-boot@lists.denx.de > Cc: Ruchika Gupta <ruchika.gupta@nxp.com>; Prabhakar Kushwaha > <prabhakar.kushwaha@nxp.com>; Vini Pillai <vinitha.pillai@nxp.com> > Subject: Re: [PATCH 6/7] SECURE_BOOT: Enable chain of trust on LS1012A > platform > > On 03/23/2017 01:19 AM, Sumit Garg wrote: > > From: Vinitha Pillai-B57223 <vinitha.pillai@nxp.com> > > > > Define bootscript and its header addresses for QSPI target Also add > > PPA header address in Kconfig > > > > Signed-off-by: Vinitha Pillai <vinitha.pillai@nxp.com> > > Signed-off-by: Sumit Garg <sumit.garg@nxp.com> > > --- > > arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 + > > arch/arm/include/asm/arch-fsl-layerscape/config.h | 7 ++++++- > > arch/arm/include/asm/fsl_secure_boot.h | 3 +++ > > 3 files changed, 10 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > > b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > > index fbb6642..03bc9ea 100644 > > --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > > +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > > @@ -160,6 +160,7 @@ config SYS_LS_PPA_ESBC_ADDR > > depends on FSL_LS_PPA && CHAIN_OF_TRUST > > default 0x600c0000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A > > default 0x40740000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A > > + default 0x40480000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A > > This one has another different offset. Why? > > York This is due to difference in memory map for LS1012A and LS1046A in SDK. Sumit
On 03/29/2017 10:01 AM, Sumit Garg wrote: >> -----Original Message----- >> From: york sun >> Sent: Wednesday, March 29, 2017 10:20 PM >> To: Sumit Garg <sumit.garg@nxp.com>; u-boot@lists.denx.de >> Cc: Ruchika Gupta <ruchika.gupta@nxp.com>; Prabhakar Kushwaha >> <prabhakar.kushwaha@nxp.com>; Vini Pillai <vinitha.pillai@nxp.com> >> Subject: Re: [PATCH 6/7] SECURE_BOOT: Enable chain of trust on LS1012A >> platform >> >> On 03/23/2017 01:19 AM, Sumit Garg wrote: >>> From: Vinitha Pillai-B57223 <vinitha.pillai@nxp.com> >>> >>> Define bootscript and its header addresses for QSPI target Also add >>> PPA header address in Kconfig >>> >>> Signed-off-by: Vinitha Pillai <vinitha.pillai@nxp.com> >>> Signed-off-by: Sumit Garg <sumit.garg@nxp.com> >>> --- >>> arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 + >>> arch/arm/include/asm/arch-fsl-layerscape/config.h | 7 ++++++- >>> arch/arm/include/asm/fsl_secure_boot.h | 3 +++ >>> 3 files changed, 10 insertions(+), 1 deletion(-) >>> >>> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig >>> b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig >>> index fbb6642..03bc9ea 100644 >>> --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig >>> +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig >>> @@ -160,6 +160,7 @@ config SYS_LS_PPA_ESBC_ADDR >>> depends on FSL_LS_PPA && CHAIN_OF_TRUST >>> default 0x600c0000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A >>> default 0x40740000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A >>> + default 0x40480000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A >> >> This one has another different offset. Why? >> >> York > > This is due to difference in memory map for LS1012A and LS1046A in SDK. I can take it for now. Please consider to consolidate the memory map down the road. York
> -----Original Message----- > From: york sun > Sent: Wednesday, March 29, 2017 10:33 PM > To: Sumit Garg <sumit.garg@nxp.com>; u-boot@lists.denx.de > Cc: Ruchika Gupta <ruchika.gupta@nxp.com>; Prabhakar Kushwaha > <prabhakar.kushwaha@nxp.com>; Vini Pillai <vinitha.pillai@nxp.com> > Subject: Re: [PATCH 6/7] SECURE_BOOT: Enable chain of trust on LS1012A > platform > > On 03/29/2017 10:01 AM, Sumit Garg wrote: > >> -----Original Message----- > >> From: york sun > >> Sent: Wednesday, March 29, 2017 10:20 PM > >> To: Sumit Garg <sumit.garg@nxp.com>; u-boot@lists.denx.de > >> Cc: Ruchika Gupta <ruchika.gupta@nxp.com>; Prabhakar Kushwaha > >> <prabhakar.kushwaha@nxp.com>; Vini Pillai <vinitha.pillai@nxp.com> > >> Subject: Re: [PATCH 6/7] SECURE_BOOT: Enable chain of trust on > >> LS1012A platform > >> > >> On 03/23/2017 01:19 AM, Sumit Garg wrote: > >>> From: Vinitha Pillai-B57223 <vinitha.pillai@nxp.com> > >>> > >>> Define bootscript and its header addresses for QSPI target Also add > >>> PPA header address in Kconfig > >>> > >>> Signed-off-by: Vinitha Pillai <vinitha.pillai@nxp.com> > >>> Signed-off-by: Sumit Garg <sumit.garg@nxp.com> > >>> --- > >>> arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 + > >>> arch/arm/include/asm/arch-fsl-layerscape/config.h | 7 ++++++- > >>> arch/arm/include/asm/fsl_secure_boot.h | 3 +++ > >>> 3 files changed, 10 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > >>> b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > >>> index fbb6642..03bc9ea 100644 > >>> --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > >>> +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > >>> @@ -160,6 +160,7 @@ config SYS_LS_PPA_ESBC_ADDR > >>> depends on FSL_LS_PPA && CHAIN_OF_TRUST > >>> default 0x600c0000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A > >>> default 0x40740000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A > >>> + default 0x40480000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A > >> > >> This one has another different offset. Why? > >> > >> York > > > > This is due to difference in memory map for LS1012A and LS1046A in SDK. > > I can take it for now. Please consider to consolidate the memory map down the > road. > > York Going forward in DASH or LSDK, memory maps will be consolidated. Then we will remove this difference. Sumit
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index fbb6642..03bc9ea 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -160,6 +160,7 @@ config SYS_LS_PPA_ESBC_ADDR depends on FSL_LS_PPA && CHAIN_OF_TRUST default 0x600c0000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A default 0x40740000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A + default 0x40480000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A help If the PPA header firmware locate at XIP flash, such as NOR or QSPI flash, this address is a directly memory-mapped. diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index 1f22afd..4db11b6 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -185,7 +185,12 @@ #elif defined(CONFIG_ARCH_LS1012A) #define GICD_BASE 0x01401000 #define GICC_BASE 0x01402000 - +#define CONFIG_SYS_FSL_SFP_VER_3_2 +#define CONFIG_SYS_FSL_SEC_MON_BE +#define CONFIG_SYS_FSL_SFP_BE +#define CONFIG_SYS_FSL_SRK_LE +#define CONFIG_KEY_REVOCATION +#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 #define CONFIG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) #define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_DDR_BLOCK1_SIZE diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 423c2c4..69cd35d 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -95,6 +95,9 @@ #ifdef CONFIG_ARCH_LS1046A #define CONFIG_BS_HDR_ADDR_DEVICE 0x40780000 #define CONFIG_BS_ADDR_DEVICE 0x40800000 +#elif defined(CONFIG_ARCH_LS1012A) +#define CONFIG_BS_HDR_ADDR_DEVICE 0x400c0000 +#define CONFIG_BS_ADDR_DEVICE 0x40060000 #else #error "Platform not supported" #endif