All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 2/2] LS2080A: Add validation of MC & DPC images.
  2017-01-04 18:14 ` [U-Boot] [PATCH 2/2] LS2080A: Add validation of MC & DPC images Udit Agarwal
@ 2017-01-04 15:50   ` york sun
  0 siblings, 0 replies; 4+ messages in thread
From: york sun @ 2017-01-04 15:50 UTC (permalink / raw)
  To: u-boot

On 01/04/2017 04:16 AM, Udit Agarwal wrote:
> Add secure boot validation of MC, DPC images using
> esbc_validate command.
>
> Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
> Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
> ---
>  include/configs/ls2080aqds.h | 19 +++++++++++++++++++
>  include/configs/ls2080ardb.h | 26 ++++++++++++++++++++++++++
>  2 files changed, 45 insertions(+)
>
> diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
> index 838568f..02ad2e8 100644
> --- a/include/configs/ls2080aqds.h
> +++ b/include/configs/ls2080aqds.h
> @@ -365,6 +365,7 @@ unsigned long get_board_ddr_clk(void);
>
>  /* Initial environment variables */
>  #undef CONFIG_EXTRA_ENV_SETTINGS
> +#ifndef CONFIG_SECURE_BOOT
>  #define CONFIG_EXTRA_ENV_SETTINGS		\
>  	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
>  	"loadaddr=0x80100000\0"			\
> @@ -378,6 +379,24 @@ unsigned long get_board_ddr_clk(void);
>  	"kernel_size=0x2800000\0"		\
>  	"mcinitcmd=fsl_mc start mc 0x580300000"	\
>  	" 0x580800000 \0"
> +#else
> +#define CONFIG_EXTRA_ENV_SETTINGS		\
> +	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
> +	"loadaddr=0x80100000\0"			\
> +	"kernel_addr=0x100000\0"		\
> +	"ramdisk_addr=0x800000\0"		\
> +	"ramdisk_size=0x2000000\0"		\
> +	"fdt_high=0xa0000000\0"			\
> +	"initrd_high=0xffffffffffffffff\0"	\
> +	"kernel_start=0x581100000\0"		\
> +	"kernel_load=0xa0000000\0"		\
> +	"kernel_size=0x2800000\0"		\
> +	"mcinitcmd=esbc_validate 0x580c80000;"	\
> +	"esbc_validate 0x580cc0000;"		\
> +	"fsl_mc start mc 0x580300000"		\
> +	" 0x580800000 \0"
> +#endif /* CONFIG_SECURE_BOOT */
> +
>
>  #ifdef CONFIG_FSL_MC_ENET
>  #define CONFIG_FSL_MEMAC
> diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
> index 32fa0eb..d3e34ae 100644
> --- a/include/configs/ls2080ardb.h
> +++ b/include/configs/ls2080ardb.h
> @@ -328,6 +328,7 @@ unsigned long get_board_sys_clk(void);
>
>  /* Initial environment variables */
>  #undef CONFIG_EXTRA_ENV_SETTINGS
> +#ifndef CONFIG_SECURE_BOOT
>  #define CONFIG_EXTRA_ENV_SETTINGS		\
>  	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
>  	"scriptaddr=0x80800000\0"		\
> @@ -348,6 +349,31 @@ unsigned long get_board_sys_clk(void);
>  	"mcinitcmd=fsl_mc start mc 0x580300000"	\
>  	" 0x580800000 \0"			\
>  	BOOTENV
> +#else
> +#define CONFIG_EXTRA_ENV_SETTINGS		\
> +	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
> +	"scriptaddr=0x80800000\0"		\
> +	"kernel_addr_r=0x81000000\0"		\
> +	"pxefile_addr_r=0x81000000\0"		\
> +	"fdt_addr_r=0x88000000\0"		\
> +	"ramdisk_addr_r=0x89000000\0"		\
> +	"loadaddr=0x80100000\0"			\
> +	"kernel_addr=0x100000\0"		\
> +	"ramdisk_addr=0x800000\0"		\
> +	"ramdisk_size=0x2000000\0"		\
> +	"fdt_high=0xa0000000\0"			\
> +	"initrd_high=0xffffffffffffffff\0"	\
> +	"kernel_start=0x581100000\0"		\
> +	"kernel_load=0xa0000000\0"		\
> +	"kernel_size=0x2800000\0"		\
> +	"fdtfile=fsl-ls2080a-rdb.dtb\0"		\
> +	"mcinitcmd=esbc_validate 0x580c80000;"	\
> +	"esbc_validate 0x580cc0000;"		\
> +	"fsl_mc start mc 0x580300000"		\
> +	" 0x580800000 \0"			\
> +	BOOTENV
> +#endif
> +
>
>  #undef CONFIG_BOOTARGS
>  #define CONFIG_BOOTARGS		"console=ttyS1,115200 root=/dev/ram0 " \
>

I would prefer positive logic, #ifdef instead of #ifndef.

York

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 1/2] SECURE_BOOT: Update bootscript and its address for LS Chasis 3
  2017-01-04 18:14 [U-Boot] [PATCH 1/2] SECURE_BOOT: Update bootscript and its address for LS Chasis 3 Udit Agarwal
@ 2017-01-04 16:09 ` york sun
  2017-01-04 18:14 ` [U-Boot] [PATCH 2/2] LS2080A: Add validation of MC & DPC images Udit Agarwal
  1 sibling, 0 replies; 4+ messages in thread
From: york sun @ 2017-01-04 16:09 UTC (permalink / raw)
  To: u-boot

On 01/04/2017 04:16 AM, Udit Agarwal wrote:
> Update bootscript and its  addresses for Layerscape Chasis 3
> based platforms instead of individual SoCs.
>
> Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
> Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
> ---
>  arch/arm/include/asm/fsl_secure_boot.h | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

Please spell out Layerscape in the subject. It is not obvious to people 
outside of NXP.

York

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 1/2] SECURE_BOOT: Update bootscript and its address for LS Chasis 3
@ 2017-01-04 18:14 Udit Agarwal
  2017-01-04 16:09 ` york sun
  2017-01-04 18:14 ` [U-Boot] [PATCH 2/2] LS2080A: Add validation of MC & DPC images Udit Agarwal
  0 siblings, 2 replies; 4+ messages in thread
From: Udit Agarwal @ 2017-01-04 18:14 UTC (permalink / raw)
  To: u-boot

Update bootscript and its  addresses for Layerscape Chasis 3
based platforms instead of individual SoCs.

Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
---
 arch/arm/include/asm/fsl_secure_boot.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h
index 933e09c..f34ffc7 100644
--- a/arch/arm/include/asm/fsl_secure_boot.h
+++ b/arch/arm/include/asm/fsl_secure_boot.h
@@ -84,7 +84,7 @@
  * Copying Bootscript and Header to DDR from NOR for LS2 and for rest, from
  * Non-XIP Memory (Nand/SD)
  */
-#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_LS2080A) || \
+#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_FSL_LSCH3) || \
 	defined(CONFIG_SD_BOOT)
 #define CONFIG_BOOTSCRIPT_COPY_RAM
 #endif
@@ -92,11 +92,11 @@
  * The address needs to be modified according to NOR, NAND, SD and
  * DDR memory map
  */
-#ifdef CONFIG_LS2080A
-#define CONFIG_BS_HDR_ADDR_DEVICE	0x583920000
-#define CONFIG_BS_ADDR_DEVICE		0x583900000
-#define CONFIG_BS_HDR_ADDR_RAM		0xa3920000
-#define CONFIG_BS_ADDR_RAM		0xa3900000
+#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_SIZE			0x00001000
 #else
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/2] LS2080A: Add validation of MC & DPC images.
  2017-01-04 18:14 [U-Boot] [PATCH 1/2] SECURE_BOOT: Update bootscript and its address for LS Chasis 3 Udit Agarwal
  2017-01-04 16:09 ` york sun
@ 2017-01-04 18:14 ` Udit Agarwal
  2017-01-04 15:50   ` york sun
  1 sibling, 1 reply; 4+ messages in thread
From: Udit Agarwal @ 2017-01-04 18:14 UTC (permalink / raw)
  To: u-boot

Add secure boot validation of MC, DPC images using
esbc_validate command.

Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
---
 include/configs/ls2080aqds.h | 19 +++++++++++++++++++
 include/configs/ls2080ardb.h | 26 ++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 838568f..02ad2e8 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -365,6 +365,7 @@ unsigned long get_board_ddr_clk(void);
 
 /* Initial environment variables */
 #undef CONFIG_EXTRA_ENV_SETTINGS
+#ifndef CONFIG_SECURE_BOOT
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
@@ -378,6 +379,24 @@ unsigned long get_board_ddr_clk(void);
 	"kernel_size=0x2800000\0"		\
 	"mcinitcmd=fsl_mc start mc 0x580300000"	\
 	" 0x580800000 \0"
+#else
+#define CONFIG_EXTRA_ENV_SETTINGS		\
+	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
+	"loadaddr=0x80100000\0"			\
+	"kernel_addr=0x100000\0"		\
+	"ramdisk_addr=0x800000\0"		\
+	"ramdisk_size=0x2000000\0"		\
+	"fdt_high=0xa0000000\0"			\
+	"initrd_high=0xffffffffffffffff\0"	\
+	"kernel_start=0x581100000\0"		\
+	"kernel_load=0xa0000000\0"		\
+	"kernel_size=0x2800000\0"		\
+	"mcinitcmd=esbc_validate 0x580c80000;"	\
+	"esbc_validate 0x580cc0000;"		\
+	"fsl_mc start mc 0x580300000"		\
+	" 0x580800000 \0"
+#endif /* CONFIG_SECURE_BOOT */
+
 
 #ifdef CONFIG_FSL_MC_ENET
 #define CONFIG_FSL_MEMAC
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 32fa0eb..d3e34ae 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -328,6 +328,7 @@ unsigned long get_board_sys_clk(void);
 
 /* Initial environment variables */
 #undef CONFIG_EXTRA_ENV_SETTINGS
+#ifndef CONFIG_SECURE_BOOT
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"scriptaddr=0x80800000\0"		\
@@ -348,6 +349,31 @@ unsigned long get_board_sys_clk(void);
 	"mcinitcmd=fsl_mc start mc 0x580300000"	\
 	" 0x580800000 \0"			\
 	BOOTENV
+#else
+#define CONFIG_EXTRA_ENV_SETTINGS		\
+	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
+	"scriptaddr=0x80800000\0"		\
+	"kernel_addr_r=0x81000000\0"		\
+	"pxefile_addr_r=0x81000000\0"		\
+	"fdt_addr_r=0x88000000\0"		\
+	"ramdisk_addr_r=0x89000000\0"		\
+	"loadaddr=0x80100000\0"			\
+	"kernel_addr=0x100000\0"		\
+	"ramdisk_addr=0x800000\0"		\
+	"ramdisk_size=0x2000000\0"		\
+	"fdt_high=0xa0000000\0"			\
+	"initrd_high=0xffffffffffffffff\0"	\
+	"kernel_start=0x581100000\0"		\
+	"kernel_load=0xa0000000\0"		\
+	"kernel_size=0x2800000\0"		\
+	"fdtfile=fsl-ls2080a-rdb.dtb\0"		\
+	"mcinitcmd=esbc_validate 0x580c80000;"	\
+	"esbc_validate 0x580cc0000;"		\
+	"fsl_mc start mc 0x580300000"		\
+	" 0x580800000 \0"			\
+	BOOTENV
+#endif
+
 
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTARGS		"console=ttyS1,115200 root=/dev/ram0 " \
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-04 18:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-04 18:14 [U-Boot] [PATCH 1/2] SECURE_BOOT: Update bootscript and its address for LS Chasis 3 Udit Agarwal
2017-01-04 16:09 ` york sun
2017-01-04 18:14 ` [U-Boot] [PATCH 2/2] LS2080A: Add validation of MC & DPC images Udit Agarwal
2017-01-04 15:50   ` york sun

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.