Re: [U-Boot] [PATCH 2/2] LS2080A: Add validation of MC & DPC images.

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