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.

Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index b082d8549ab057996dbf43b5087b698d8e310f95..d02ad083e86092ae066f3fcf2104b4e1b2bace28 100644 (file)
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -305,8 +305,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"
@@ -327,8 +327,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"       \
@@ -362,7 +362,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                                 \
@@ -431,7 +431,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"    \
@@ -478,7 +478,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 "     \
@@ -489,7 +489,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;"            \
@@ -512,7 +512,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;"            \

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index b251c795b0f1198ec367e37c9aed66e93a2c56c6..de14fb4ac82e34f5047e57647cbba1fee4dc6eab 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -330,8 +330,8 @@ unsigned long get_board_sys_clk(void);
        "mmcinfo;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"
@@ -352,8 +352,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" \

diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index cfb20d3fb03584253bc991d6b78131138380367a..cd3e2c4c8546c4125581c312d0fa371dc2e0ff2d 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -197,8 +197,8 @@ unsigned long get_board_ddr_clk(void);
        "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"
@@ -224,7 +224,7 @@ unsigned long get_board_ddr_clk(void);
        "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"                \
@@ -262,7 +262,7 @@ unsigned long get_board_ddr_clk(void);
                "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;"            \