Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / configs / k2hk_evm.h

diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index a031ae40af63c600c34b86a49f1631e9de4d1ad0..dc0ac7d8bc84fcc885ec247f52a3d131efb9a36a 100644 (file)
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -10,27 +10,42 @@
 #ifndef __CONFIG_K2HK_EVM_H
 #define __CONFIG_K2HK_EVM_H
 
+#include <environment/ti/spi.h>
+
 /* Platform type */
 #define CONFIG_SOC_K2HK
-#define CONFIG_K2HK_EVM
+
+#ifdef CONFIG_TI_SECURE_DEVICE
+#define DEFAULT_SEC_BOOT_ENV                                           \
+       DEFAULT_FIT_TI_ARGS                                             \
+       "findfdt=setenv fdtfile ${name_fdt}\0"
+#else
+#define DEFAULT_SEC_BOOT_ENV
+#endif
 
 /* U-Boot general configuration */
 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                            \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
-       "addr_mon=0x0c5f0000\0"                                         \
+       DEFAULT_SEC_BOOT_ENV                                            \
+       "boot=ubi\0"                                                    \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0"       \
-       "name_fdt=k2hk-evm.dtb\0"                               \
+       "name_fdt=keystone-k2hk-evm.dtb\0"                              \
        "name_mon=skern-k2hk.bin\0"                                     \
        "name_ubi=k2hk-evm-ubifs.ubi\0"                                 \
        "name_uboot=u-boot-spi-k2hk-evm.gph\0"                          \
        "name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
 
+#define CONFIG_ENV_SIZE                                (256 << 10)  /* 256 KiB */
+#define CONFIG_ENV_OFFSET                      0x100000
+
 #include <configs/ti_armv7_keystone2.h>
 
 /* SPL SPI Loader Configuration */
 #define CONFIG_SPL_TEXT_BASE           0x0c200000
 
+#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
+
 /* NAND Configuration */
 #define CONFIG_SYS_NAND_PAGE_2K