configs: k2x_evm: Adds environment variables for secure devices

Updates the default u-boot environment variables to support secure
boot. On secure devices, a secure boot monitor (sec-bm) needs to
be installed by u-boot.

Signed-off-by: Madan Srinivas <madans@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 958090099a4659d646c92b9c3663ffb8c90bb6b1..132dc89ccc2c21a82c3009cd0a8c7a912ca4e6de 100644 (file)
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -52,11 +52,18 @@
        "get_mon_mmc=load mmc ${bootpart} ${addr_mon} ${bootdir}/${name_mon}\0"\
        "name_fs=arago-base-tisdk-image-k2g-evm.cpio\0"
 
+#ifndef CONFIG_TI_SECURE_DEVICE
 #define CONFIG_BOOTCOMMAND                                             \
        "run envboot; "                                                 \
        "run set_name_pmmc init_${boot} init_fw_rd_${boot} "            \
        "get_pmmc_${boot} run_pmmc get_mon_${boot} run_mon "            \
        "findfdt get_fdt_${boot} get_kern_${boot} run_kern"
+#else
+#define CONFIG_BOOTCOMMAND                                             \
+       "run envboot; run run_mon_hs set_name_pmmc init_${boot} "       \
+       "get_pmmc_${boot} run_pmmc findfdt get_fit_${boot};"            \
+       "bootm ${fit_loadaddr}#${name_fdt} "
+#endif
 
 /* SPL SPI Loader Configuration */
 #define CONFIG_SPL_TEXT_BASE           0x0c080000

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 03544af5d7ba9bbca228d762ae9b5be5e0aec659..0aad63fe03c656c112381bdf77d1aa6ada8da9ce 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -249,7 +249,11 @@
        "addr_secdb_key=0xc000000\0"                                    \
        "name_kern=zImage\0"                                            \
        "addr_mon=0x87000000\0"                                         \
+       "addr_non_sec_mon=0x0c087fc0\0"                                 \
+       "addr_load_sec_bm=0x0c08c000\0"                                 \
        "run_mon=mon_install ${addr_mon}\0"                             \
+       "run_mon_hs=mon_install ${addr_non_sec_mon} "                   \
+                       "${addr_load_sec_bm}\0"                         \
        "run_kern=bootz ${loadaddr} ${rd_spec} ${fdtaddr}\0"            \
        "init_net=run args_all args_net\0"                              \
        "init_nfs=setenv autoload no; dhcp; run args_all args_net\0"    \
@@ -301,9 +305,15 @@
                "1024k(bootloader)ro,512k(params)ro,-(ubifs)\0"
 
 #ifndef CONFIG_BOOTCOMMAND
+#ifndef CONFIG_TI_SECURE_DEVICE
 #define CONFIG_BOOTCOMMAND                                             \
        "run init_${boot} get_mon_${boot} run_mon init_fw_rd_${boot} "  \
        "get_fdt_${boot} get_kern_${boot} run_kern"
+#else
+#define CONFIG_BOOTCOMMAND                                             \
+       "run run_mon_hs init_${boot} init_fw_rd_${boot} "               \
+       "get_fit_${boot}; bootm ${fit_loadaddr}#${name_fdt}"
+#endif
 #endif
 
 #define CONFIG_BOOTARGS                                                        \