Message ID | 1504850035-24931-1-git-send-email-sumit.garg@nxp.com |
---|---|
State | Superseded |
Delegated to: | York Sun |
Headers | show |
Series | [U-Boot] arm64: ls1012ardb: Add distro secure boot support | expand |
On 09/07/2017 10:54 PM, Sumit Garg wrote: > Enable validation of boot.scr script prior to its execution dependent > on "secureboot" flag in environment. Enable fall back option to > qspi boot in case of secure boot. > > Signed-off-by: Sumit Garg <sumit.garg@nxp.com> > Tested-by: Vinitha Pillai <vinitha.pillai@nxp.com> > --- > configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 1 + > include/configs/ls1012ardb.h | 20 ++++++++++++++++++-- > 2 files changed, 19 insertions(+), 2 deletions(-) > This patch doesn't apply at all. Please rebase. York
> -----Original Message----- > From: York Sun > Sent: Tuesday, October 31, 2017 3:51 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> > Subject: Re: [PATCH] arm64: ls1012ardb: Add distro secure boot support > > On 09/07/2017 10:54 PM, Sumit Garg wrote: > > Enable validation of boot.scr script prior to its execution dependent > > on "secureboot" flag in environment. Enable fall back option to qspi > > boot in case of secure boot. > > > > Signed-off-by: Sumit Garg <sumit.garg@nxp.com> > > Tested-by: Vinitha Pillai <vinitha.pillai@nxp.com> > > --- > > configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 1 + > > include/configs/ls1012ardb.h | 20 ++++++++++++++++++-- > > 2 files changed, 19 insertions(+), 2 deletions(-) > > > > This patch doesn't apply at all. Please rebase. > > York Sure let me rebase this patch. Sumit
diff --git a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig index ec6ed37..09fc624 100644 --- a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig @@ -45,3 +45,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y +CONFIG_DISTRO_DEFAULTS=y diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index dbfc540..5fe3218 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -80,16 +80,20 @@ "initrd_high=0xffffffffffffffff\0" \ "fdt_addr=0x00f00000\0" \ "kernel_addr=0x01000000\0" \ + "kernelheader_addr=0x800000\0" \ "scriptaddr=0x80000000\0" \ + "scripthdraddr=0x80080000\0" \ "fdtheader_addr_r=0x80100000\0" \ "kernelheader_addr_r=0x80200000\0" \ "kernel_addr_r=0x81000000\0" \ "fdt_addr_r=0x90000000\0" \ "load_addr=0xa0000000\0" \ "kernel_size=0x2800000\0" \ + "kernelheader_size=0x40000\0" \ "console=ttyS0,115200\0" \ BOOTENV \ "boot_scripts=ls1012ardb_boot.scr\0" \ + "boot_script_hdr=hdr_ls1012ardb_bs.out\0" \ "scan_dev_for_boot_part=" \ "part list ${devtype} ${devnum} devplist; " \ "env exists devplist || setenv devplist 1; " \ @@ -107,16 +111,28 @@ "run scan_dev_for_scripts; " \ "done;" \ "\0" \ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "env exists secureboot && load ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "&& esbc_validate ${scripthdraddr};" \ + "source ${scriptaddr}\0" \ "installer=load mmc 0:2 $load_addr " \ "/flex_installer_arm64.itb; " \ "bootm $load_addr#$board\0" \ "qspi_bootcmd=echo Trying load from qspi..;" \ "sf probe && sf read $load_addr " \ - "$kernel_addr $kernel_size && bootm $load_addr#$board\0" \ + "$kernel_addr $kernel_size; env exists secureboot " \ + "&& sf read $kernelheader_addr_r $kernelheader_addr " \ + "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \ + "bootm $load_addr#$board\0" #undef CONFIG_BOOTCOMMAND #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) -#define CONFIG_BOOTCOMMAND "run distro_bootcmd;run qspi_bootcmd" +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ + "env exists secureboot && esbc_halt;" #endif #include <asm/fsl_secure_boot.h>