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

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

diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 9bacfa49c430b3f3550e4a27f33770a19b005add..d8bcbde8430aeac161dce0f6a32212b5f11031c4 100644 (file)
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -10,26 +10,33 @@
 #ifndef __CONFIG_K2L_EVM_H
 #define __CONFIG_K2L_EVM_H
 
+#include <environment/ti/spi.h>
+
 /* Platform type */
 #define CONFIG_SOC_K2L
-#define CONFIG_K2L_EVM
 
 /* U-Boot general configuration */
 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                            \
-       "addr_mon=0x0c140000\0"                                         \
+       DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
+       "boot=ubi\0"                                                    \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0"       \
-       "name_fdt=k2l-evm.dtb\0"                                        \
+       "name_fdt=keystone-k2l-evm.dtb\0"                               \
        "name_mon=skern-k2l.bin\0"                                      \
        "name_ubi=k2l-evm-ubifs.ubi\0"                                  \
        "name_uboot=u-boot-spi-k2l-evm.gph\0"                           \
        "name_fs=arago-console-image-k2l-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           0x0c100000
 
+#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
+
 /* NAND Configuration */
 #define CONFIG_SYS_NAND_PAGE_4K