Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / include / configs / k2e_evm.h

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index f1e650141ae1334b728b00f1c37ab93571dc7570..3a7993e8290c9135b73167064490a6e4073ad3c5 100644 (file)
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -10,17 +10,19 @@
 #ifndef __CONFIG_K2E_EVM_H
 #define __CONFIG_K2E_EVM_H
 
+#include <environment/ti/spi.h>
+
 /* Platform type */
 #define CONFIG_SOC_K2E
-#define CONFIG_K2E_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,2048\0"       \
-       "name_fdt=uImage-k2e-evm.dtb\0"                                 \
-       "name_mon=skern-k2e-evm.bin\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"
@@ -30,6 +32,9 @@
 /* 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
 
@@ -38,4 +43,6 @@
 #define CONFIG_KSNET_CPSW_NUM_PORTS    9
 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
+#define CONFIG_DDR_SPD
+
 #endif /* __CONFIG_K2E_EVM_H */