configs: fsl-layerscape: secure_boot: Enable setexpr command.
PATCH v2 1/2 configs: fsl-layerscape: secure_boot: Enable setexpr command.
setexpr command is used while running secure boot (chain of trust with confidentiality) feature.
So, Enable CONFIG_CMD_SETEXPR to enable setexpr command.
---
Changes in V2:
Corrects commit message.
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1012ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + 14 files changed, 14 insertions(+), 4 deletions(-)
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig +1 -0
@@ -50,4 +50,5 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y +CONFIG_CMD_SETEXPR=y CONFIG_RSA_SOFTWARE_EXP=y
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig +1 -1
@@ -30,7 +30,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_DEFAULT_SPI_BUS=1 CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_SETEXPR=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_OF_CONTROL=y
configs/ls1012ardb_tfa_SECURE_BOOT_defconfig +1 -1
@@ -27,7 +27,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_SETEXPR=y CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
configs/ls1028aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -59,4 +59,5 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_WDT=y CONFIG_WDT_SP805=y CONFIG_RSA=y +CONFIG_CMD_SETEXPR=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
configs/ls1028ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -59,4 +59,5 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_WDT=y CONFIG_WDT_SP805=y CONFIG_RSA=y +CONFIG_CMD_SETEXPR=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -58,4 +58,5 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y +CONFIG_CMD_SETEXPR=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -52,3 +52,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_SETEXPR=y
configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig +1 -0
@@ -53,3 +53,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y +CONFIG_CMD_SETEXPR=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -59,3 +59,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_SETEXPR=y
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -52,3 +52,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_SETEXPR=y
configs/ls1088ardb_tfa_SECURE_BOOT_defconfig +1 -1
@@ -27,7 +27,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_SETEXPR=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb"
configs/ls2088ardb_tfa_SECURE_BOOT_defconfig +1 -1
@@ -28,7 +28,7 @@ CONFIG_CMD_NAND=y CONFIG_CMD_PCI=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_SETEXPR=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_MP=y
configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -61,3 +61,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_SETEXPR=y
configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -58,3 +58,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_CMD_SETEXPR=y
Signature · 1 line
2.17.1
PATCH v2 2/2 armv8: fsl-layerscape: Increase mmc read size for secure-boot headers
Maximum size of secure boot header to be read from MMC is 12KB which spans across 0x20 blocks.
Hence increase the mmc read size for secure boot
headers from MMC to 0x20 blocks.
---
Changes in V2:
Modifications in the subject line and commit
message.
include/configs/ls1088ardb.h | 18 +++++++++--------- include/configs/ls2080ardb.h | 8 ++++---- include/configs/lx2160a_common.h | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-)
include/configs/ls1088ardb.h +9 -9
@@ -320,8 +320,8 @@"mmcinfo;mmc read 0x80000000 0x5000 0x800;" \"mmc read 0x80100000 0x7000 0x800;" \"env exists secureboot && " \ -"mmc read 0x80700000 0x3800 0x10 && " \ -"mmc read 0x80740000 0x3A00 0x10 && " \ +"mmc read 0x80700000 0x3800 0x20 && " \ +"mmc read 0x80740000 0x3A00 0x20 && " \"esbc_validate 0x80700000 && " \"esbc_validate 0x80740000 ;" \"fsl_mc start mc 0x80000000 0x80100000\0"
@@ -342,8 +342,8 @@"mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;" \"mmc read 0x80100000 0x7000 0x800;" \"env exists secureboot && " \ -"mmc read 0x80700000 0x3800 0x10 && " \ -"mmc read 0x80740000 0x3A00 0x10 && " \ +"mmc read 0x80700000 0x3800 0x20 && " \ +"mmc read 0x80740000 0x3A00 0x20 && " \"esbc_validate 0x80700000 && " \"esbc_validate 0x80740000 ;" \"fsl_mc start mc 0x80000000 0x80100000\0" \
@@ -377,7 +377,7 @@"load_addr=0xa0000000\0" \"kernel_size=0x2800000\0" \"kernel_size_sd=0x14000\0" \ -"kernelhdr_size_sd=0x10\0" \ +"kernelhdr_size_sd=0x20\0" \QSPI_MC_INIT_CMD \"mcmemsize=0x70000000\0" \BOOTENV \
@@ -446,7 +446,7 @@"load_addr=0xa0000000\0" \"kernel_size=0x2800000\0" \"kernel_size_sd=0x14000\0" \ -"kernelhdr_size_sd=0x10\0" \ +"kernelhdr_size_sd=0x20\0" \MC_INIT_CMD \BOOTENV \"boot_scripts=ls1088ardb_boot.scr\0" \
@@ -493,7 +493,7 @@#undef CONFIG_BOOTCOMMAND#ifdef CONFIG_TFABOOT #define QSPI_NOR_BOOTCOMMAND \ - "sf read 0x80001000 0xd00000 0x100000;" \ + "sf read 0x80001000 0xd00000 0x100000;" \ "env exists mcinitcmd && env exists secureboot " \ " && sf read 0x80780000 0x780000 0x100000 " \ "&& esbc_validate 0x80780000;env exists mcinitcmd " \
@@ -504,7 +504,7 @@"env exists mcinitcmd && mmcinfo; " \"mmc read 0x80001000 0x6800 0x800; " \"env exists mcinitcmd && env exists secureboot " \ -" && mmc read 0x80780000 0x3C00 0x10 " \ +" && mmc read 0x80780000 0x3C00 0x20 " \"&& esbc_validate 0x80780000;env exists mcinitcmd " \"&& fsl_mc lazyapply dpl 0x80001000;" \"run distro_bootcmd;run sd_bootcmd;" \
@@ -527,7 +527,7 @@"env exists mcinitcmd && mmcinfo; " \"mmc read 0x80001000 0x6800 0x800; " \"env exists mcinitcmd && env exists secureboot " \ -" && mmc read 0x80780000 0x3C00 0x10 " \ +" && mmc read 0x80780000 0x3C00 0x20 " \"&& esbc_validate 0x80780000;env exists mcinitcmd " \"&& fsl_mc lazyapply dpl 0x80001000;" \"run distro_bootcmd;run sd_bootcmd;" \
include/configs/ls2080ardb.h +4 -4
@@ -345,8 +345,8 @@ unsigned long get_board_sys_clk(void);"mmcinfo;mmc read 0x80000000 0x5000 0x800;" \"mmc read 0x80100000 0x7000 0x800;" \"env exists secureboot && " \ -"mmc read 0x80700000 0x3800 0x10 && " \ -"mmc read 0x80740000 0x3A00 0x10 && " \ +"mmc read 0x80700000 0x3800 0x20 && " \ +"mmc read 0x80740000 0x3A00 0x20 && " \"esbc_validate 0x80700000 && " \"esbc_validate 0x80740000 ;" \"fsl_mc start mc 0x80000000 0x80100000\0"
@@ -367,8 +367,8 @@ unsigned long get_board_sys_clk(void);"mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;" \"mmc read 0x80100000 0x7000 0x800;" \"env exists secureboot && " \ -"mmc read 0x80700000 0x3800 0x10 && " \ -"mmc read 0x80740000 0x3A00 0x10 && " \ +"mmc read 0x80700000 0x3800 0x20 && " \ +"mmc read 0x80740000 0x3A00 0x20 && " \"esbc_validate 0x80700000 && " \"esbc_validate 0x80740000 ;" \"fsl_mc start mc 0x80000000 0x80100000\0" \
include/configs/lx2160a_common.h +4 -4
@@ -216,8 +216,8 @@ int select_i2c_ch_pca9547_sec(unsigned char ch);"mmc read 0x80a00000 0x5000 0x1200;" \"mmc read 0x80e00000 0x7000 0x800;" \"env exists secureboot && " \ -"mmc read 0x80700000 0x3800 0x10 && " \ -"mmc read 0x80740000 0x3A00 0x10 && " \ +"mmc read 0x80700000 0x3800 0x20 && " \ +"mmc read 0x80740000 0x3A00 0x20 && " \"esbc_validate 0x80700000 && " \"esbc_validate 0x80740000 ;" \"fsl_mc start mc 0x80a00000 0x80e00000\0"
@@ -243,7 +243,7 @@ int select_i2c_ch_pca9547_sec(unsigned char ch);"kernel_addr_sd=0x8000\0" \"kernelhdr_addr_sd=0x3E00\0" \"kernel_size_sd=0x1d000\0" \ -"kernelhdr_size_sd=0x10\0" \ +"kernelhdr_size_sd=0x20\0" \"console=ttyAMA0,38400n8\0" \BOOTENV \"mcmemsize=0x70000000\0" \
@@ -281,7 +281,7 @@ int select_i2c_ch_pca9547_sec(unsigned char ch);"env exists mcinitcmd && mmcinfo; " \"mmc read 0x80d00000 0x6800 0x800; " \"env exists mcinitcmd && env exists secureboot " \ -" && mmc read 0x80780000 0x3C00 0x10 " \ +" && mmc read 0x80780000 0x3C00 0x20 " \"&& esbc_validate 0x80780000;env exists mcinitcmd " \"&& fsl_mc lazyapply dpl 0x80d00000;" \"run distro_bootcmd;run sd_bootcmd;" \
Signature · 1 line
2.17.1
PATCH v2 2/2 armv8: fsl-layerscape: Increase mmc read size for secure-boot headers
Quoted 12 lines
-----Original Message-----
From: Udit Agarwal
Sent: Thursday, June 13, 2019 1:39 PM
To: u-boot at lists.denx.de
Cc: Ruchika Gupta <[email protected]>; Arun Pathak <[email protected]>; Prabhakar Kushwaha <[email protected]>; Jagdish Gediya <[email protected]>; Udit Agarwal <[email protected]>
Subject: [PATCH v2 2/2] armv8: fsl-layerscape: Increase mmc read size for secure-boot headers
Quoted 8 lines
Maximum size of secure boot header to be read from MMC is 12KB which spans across
0x20blocks.Hence increase the mmc read size for secure boot headers from MMC to
0x20blocks.Signed-off-by Udit Agarwal <[email protected]>---
Please resend this patch as first patch of this patch series having review comments
--pk
PATCH v2 1/2 configs: fsl-layerscape: secure_boot: Enable setexpr command.
In reply to Udit AgarwalDear Udit,
Quoted 21 lines
-----Original Message-----
From: Udit Agarwal
Sent: Thursday, June 13, 2019 1:39 PM
To: u-boot at lists.denx.de
Cc: Ruchika Gupta <[email protected]>; Arun Pathak <[email protected]>; Prabhakar Kushwaha <[email protected]>; Jagdish Gediya <[email protected]>; Udit Agarwal <[email protected]>
Subject: [PATCH v2 1/2] configs: fsl-layerscape:secure_boot: Enable setexpr command.setexpr command is used while running secure boot (chain of trust with confidentiality) feature.
So, Enable
CONFIG_CMD_SETEXPRto enable setexpr command.Signed-off-by Udit Agarwal <[email protected]>---
Changes in V2:
Corrects commit message.
Quoted 16 lines
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1012ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + 14 files changed, 14 insertions(+), 4 deletions(-)
Have you run savedefconfig before sending this patch.
Note: savedefconfig removing your changes (as it may be enabled in-directly)
--pk