| Message ID | 1493407738-27921-1-git-send-email-sumit.garg@nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | York Sun |
| Headers | show |
On 04/28/2017 01:01 AM, Sumit Garg wrote: > Unify memory map for Layerscape based platforms as per DASH SDK Do not mention internal project code name. > memory map. This patch includes changes in bootscript, bootscript > header and PPA header addresses change as per unified memory map. > > Signed-off-by: Sumit Garg <sumit.garg@nxp.com> > Tested-by: Vinitha Pillai <vinitha.pillai@nxp.com> > --- > arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 12 +++---- > arch/arm/include/asm/fsl_secure_boot.h | 54 +++++++++++++------------------ > 2 files changed, 28 insertions(+), 38 deletions(-) > Please work with board maintainers to put the locations into README file. York
> -----Original Message----- > From: York Sun [mailto:york.sun@nxp.com] > Sent: Friday, April 28, 2017 9:27 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>; Udit > Agarwal <udit.agarwal@nxp.com> > Subject: Re: [PATCH] SECURE_BOOT: Unify memory map for Layerscape based > platforms > > On 04/28/2017 01:01 AM, Sumit Garg wrote: > > Unify memory map for Layerscape based platforms as per DASH SDK > > Do not mention internal project code name. > Sure, I will remove the internal project code name. > > memory map. This patch includes changes in bootscript, bootscript > > header and PPA header addresses change as per unified memory map. > > > > Signed-off-by: Sumit Garg <sumit.garg@nxp.com> > > Tested-by: Vinitha Pillai <vinitha.pillai@nxp.com> > > --- > > arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 12 +++---- > > arch/arm/include/asm/fsl_secure_boot.h | 54 +++++++++++++-------------- > ---- > > 2 files changed, 28 insertions(+), 38 deletions(-) > > > > Please work with board maintainers to put the locations into README file. > > York Ok, I will work out with board maintainers. Shall I send that README file update as separate patch? Sumit
On 05/01/2017 01:26 AM, Sumit Garg wrote: >> -----Original Message----- >> From: York Sun [mailto:york.sun@nxp.com] >> Sent: Friday, April 28, 2017 9:27 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>; Udit >> Agarwal <udit.agarwal@nxp.com> >> Subject: Re: [PATCH] SECURE_BOOT: Unify memory map for Layerscape based >> platforms >> >> On 04/28/2017 01:01 AM, Sumit Garg wrote: >>> Unify memory map for Layerscape based platforms as per DASH SDK >> >> Do not mention internal project code name. >> > > Sure, I will remove the internal project code name. > >>> memory map. This patch includes changes in bootscript, bootscript >>> header and PPA header addresses change as per unified memory map. >>> >>> Signed-off-by: Sumit Garg <sumit.garg@nxp.com> >>> Tested-by: Vinitha Pillai <vinitha.pillai@nxp.com> >>> --- >>> arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 12 +++---- >>> arch/arm/include/asm/fsl_secure_boot.h | 54 +++++++++++++-------------- >> ---- >>> 2 files changed, 28 insertions(+), 38 deletions(-) >>> >> >> Please work with board maintainers to put the locations into README file. >> >> York > > Ok, I will work out with board maintainers. Shall I send that README file update as separate patch? > That's up to you and the board maintainers. Keep Alison in the loop. She is making a similar change for some boards. York
On 05/01/2017 01:26 AM, Sumit Garg wrote: >> -----Original Message----- >> From: York Sun [mailto:york.sun@nxp.com] >> Sent: Friday, April 28, 2017 9:27 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>; Udit >> Agarwal <udit.agarwal@nxp.com> >> Subject: Re: [PATCH] SECURE_BOOT: Unify memory map for Layerscape based >> platforms >> >> On 04/28/2017 01:01 AM, Sumit Garg wrote: >>> Unify memory map for Layerscape based platforms as per DASH SDK >> >> Do not mention internal project code name. >> > > Sure, I will remove the internal project code name. > >>> memory map. This patch includes changes in bootscript, bootscript >>> header and PPA header addresses change as per unified memory map. >>> >>> Signed-off-by: Sumit Garg <sumit.garg@nxp.com> >>> Tested-by: Vinitha Pillai <vinitha.pillai@nxp.com> >>> --- >>> arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 12 +++---- >>> arch/arm/include/asm/fsl_secure_boot.h | 54 +++++++++++++-------------- >> ---- >>> 2 files changed, 28 insertions(+), 38 deletions(-) >>> >> >> Please work with board maintainers to put the locations into README file. >> >> York > > Ok, I will work out with board maintainers. Shall I send that README file update as separate patch? > Sumit, Please refresh your patch on top of the latest master branch. York
> -----Original Message----- > From: York Sun > Sent: Wednesday, June 14, 2017 1:55 AM > 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>; Udit > Agarwal <udit.agarwal@nxp.com> > Subject: Re: [PATCH] SECURE_BOOT: Unify memory map for Layerscape based > platforms > > On 05/01/2017 01:26 AM, Sumit Garg wrote: > >> -----Original Message----- > >> From: York Sun [mailto:york.sun@nxp.com] > >> Sent: Friday, April 28, 2017 9:27 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>; > >> Udit Agarwal <udit.agarwal@nxp.com> > >> Subject: Re: [PATCH] SECURE_BOOT: Unify memory map for Layerscape > >> based platforms > >> > >> On 04/28/2017 01:01 AM, Sumit Garg wrote: > >>> Unify memory map for Layerscape based platforms as per DASH SDK > >> > >> Do not mention internal project code name. > >> > > > > Sure, I will remove the internal project code name. > > > >>> memory map. This patch includes changes in bootscript, bootscript > >>> header and PPA header addresses change as per unified memory map. > >>> > >>> Signed-off-by: Sumit Garg <sumit.garg@nxp.com> > >>> Tested-by: Vinitha Pillai <vinitha.pillai@nxp.com> > >>> --- > >>> arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 12 +++---- > >>> arch/arm/include/asm/fsl_secure_boot.h | 54 +++++++++++++---------- > ---- > >> ---- > >>> 2 files changed, 28 insertions(+), 38 deletions(-) > >>> > >> > >> Please work with board maintainers to put the locations into README file. > >> > >> York > > > > Ok, I will work out with board maintainers. Shall I send that README file > update as separate patch? > > > > Sumit, > > Please refresh your patch on top of the latest master branch. > > York Sure I will rebase this patch. Sumit
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 8270431..c849c05 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -206,12 +206,12 @@ config SYS_LS_PPA_FW_ADDR config SYS_LS_PPA_ESBC_ADDR hex "hdr address of PPA firmware loading from" 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 - default 0x580c40000 if SYS_LS_PPA_FW_IN_XIP && FSL_LSCH3 - default 0x700000 if SYS_LS_PPA_FW_IN_MMC - default 0x700000 if SYS_LS_PPA_FW_IN_NAND + default 0x60680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A + default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A + default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A + default 0x580680000 if SYS_LS_PPA_FW_IN_XIP && FSL_LSCH3 + default 0x680000 if SYS_LS_PPA_FW_IN_MMC + default 0x680000 if SYS_LS_PPA_FW_IN_NAND 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/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 7bff8b7..42ae4e2 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -1,5 +1,6 @@ /* * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2017 NXP * * SPDX-License-Identifier: GPL-2.0+ */ @@ -77,55 +78,44 @@ * DDR memory map */ #ifdef CONFIG_FSL_LSCH3 -#define CONFIG_BS_HDR_ADDR_DEVICE 0x580d00000 -#define CONFIG_BS_ADDR_DEVICE 0x580e00000 -#define CONFIG_BS_HDR_ADDR_RAM 0xa0d00000 -#define CONFIG_BS_ADDR_RAM 0xa0e00000 -#define CONFIG_BS_HDR_SIZE 0x00002000 +#define CONFIG_BS_ADDR_DEVICE 0x580600000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x580640000 #define CONFIG_BS_SIZE 0x00001000 +#define CONFIG_BS_HDR_SIZE 0x00004000 +#define CONFIG_BS_ADDR_RAM 0xa0600000 +#define CONFIG_BS_HDR_ADDR_RAM 0xa0640000 #else #ifdef CONFIG_SD_BOOT /* For SD boot address and size are assigned in terms of sector * offset and no. of sectors respectively. */ -#if defined(CONFIG_LS1043A) || defined(CONFIG_ARCH_LS1046A) -#define CONFIG_BS_HDR_ADDR_DEVICE 0x00000920 -#else -#define CONFIG_BS_HDR_ADDR_DEVICE 0x00000900 -#endif -#define CONFIG_BS_ADDR_DEVICE 0x00000940 -#define CONFIG_BS_HDR_SIZE 0x00000010 +#define CONFIG_BS_ADDR_DEVICE 0x00003000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00003200 #define CONFIG_BS_SIZE 0x00000008 +#define CONFIG_BS_HDR_SIZE 0x00000010 #elif defined(CONFIG_NAND_BOOT) -#define CONFIG_BS_HDR_ADDR_DEVICE 0x00800000 -#define CONFIG_BS_ADDR_DEVICE 0x00802000 -#define CONFIG_BS_HDR_SIZE 0x00002000 -#define CONFIG_BS_SIZE 0x00001000 -#elif defined(CONFIG_QSPI_BOOT) -#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 +#define CONFIG_BS_ADDR_DEVICE 0x00600000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00640000 +#define CONFIG_BS_SIZE 0x00001000 #define CONFIG_BS_HDR_SIZE 0x00002000 +#elif defined(CONFIG_QSPI_BOOT) +#define CONFIG_BS_ADDR_DEVICE 0x40600000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x40640000 #define CONFIG_BS_SIZE 0x00001000 -#else /* Default NOR Boot */ -#define CONFIG_BS_HDR_ADDR_DEVICE 0x600a0000 -#define CONFIG_BS_ADDR_DEVICE 0x60060000 #define CONFIG_BS_HDR_SIZE 0x00002000 +#else /* Default NOR Boot */ +#define CONFIG_BS_ADDR_DEVICE 0x60600000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x60640000 #define CONFIG_BS_SIZE 0x00001000 +#define CONFIG_BS_HDR_SIZE 0x00002000 #endif -#define CONFIG_BS_HDR_ADDR_RAM 0x81000000 -#define CONFIG_BS_ADDR_RAM 0x81020000 +#define CONFIG_BS_ADDR_RAM 0x81000000 +#define CONFIG_BS_HDR_ADDR_RAM 0x81020000 #endif #ifdef CONFIG_BOOTSCRIPT_COPY_RAM -#define CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BS_HDR_ADDR_RAM #define CONFIG_BOOTSCRIPT_ADDR CONFIG_BS_ADDR_RAM +#define CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BS_HDR_ADDR_RAM #else #define CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BS_HDR_ADDR_DEVICE /* BOOTSCRIPT_ADDR is not required */