X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fk2e_evm.h;h=9b25c34982235f96752d802b2b1820e5f00ee766;hb=2f57139c211d193debddd25f45c02b738cefd871;hp=d83e07e24238bcd1d124c9ddf07371bef6d38171;hpb=6393c43c18a1aadcdcdd8551826eef15f50353d5;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index d83e07e..9b25c34 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -1,36 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Configuration header file for TI's k2e-evm
  *
  * (C) Copyright 2012-2014
  *     Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef __CONFIG_K2E_EVM_H
 #define __CONFIG_K2E_EVM_H
 
-/* Platform type */
-#define CONFIG_SOC_K2E
-#define CONFIG_K2E_EVM
+#include <environment/ti/spi.h>
 
-/* U-Boot general configuration */
-#define CONFIG_SYS_PROMPT               "K2E 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
 
-#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS				\
-	"addr_mon=0x0c140000\0"						\
+/* U-Boot general configuration */
+#define ENV_KS2_BOARD_SETTINGS						\
+	DEFAULT_FW_INITRAMFS_BOOT_ENV					\
+	DEFAULT_SEC_BOOT_ENV						\
+	"boot=ubi\0"							\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
-	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0"		\
-	"name_fdt=uImage-k2e-evm.dtb\0"					\
-	"name_mon=skern-k2e-evm.bin\0"					\
+	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0"	\
+	"name_fdt=keystone-k2e-evm.dtb\0"				\
+	"name_mon=skern-k2e.bin\0"					\
 	"name_ubi=k2e-evm-ubifs.ubi\0"					\
 	"name_uboot=u-boot-spi-k2e-evm.gph\0"				\
 	"name_fs=arago-console-image-k2e-evm.cpio.gz\0"
 
-#include <configs/ks2_evm.h>
+#include <configs/ti_armv7_keystone2.h>
 
-/* SPL SPI Loader Configuration */
-#define CONFIG_SPL_TEXT_BASE           0x0c100000
+#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* NAND Configuration */
 #define CONFIG_SYS_NAND_PAGE_2K