projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-dm
[platform/kernel/u-boot.git]
/
include
/
configs
/
k2hk_evm.h
diff --git
a/include/configs/k2hk_evm.h
b/include/configs/k2hk_evm.h
index
ffddf13
..
9598bc6
100644
(file)
--- a/
include/configs/k2hk_evm.h
+++ b/
include/configs/k2hk_evm.h
@@
-10,28
+10,34
@@
#ifndef __CONFIG_K2HK_EVM_H
#define __CONFIG_K2HK_EVM_H
#ifndef __CONFIG_K2HK_EVM_H
#define __CONFIG_K2HK_EVM_H
+#include <environment/ti/spi.h>
+
/* Platform type */
#define CONFIG_SOC_K2HK
/* Platform type */
#define CONFIG_SOC_K2HK
-#define CONFIG_K2HK_EVM
/* U-Boot general configuration */
/* U-Boot general configuration */
-#define CONFIG_SYS_PROMPT "K2HK EVM # "
-
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
- "addr_mon=0x0c5f0000\0" \
+ DEFAULT_FW_INITRAMFS_BOOT_ENV \
+ "boot=ubi\0" \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
- "root=ubi0:rootfs rootflags=sync rw ubi.mtd=
2,2048\0"
\
- "name_fdt=
uImage-k2hk-evm.dtb\0"
\
- "name_mon=skern-k2hk
-evm.bin\0"
\
+ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=
ubifs,2048\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"
"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"
-#include <configs/ks2_evm.h>
+#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OFFSET 0x100000
+
+#include <configs/ti_armv7_keystone2.h>
/* SPL SPI Loader Configuration */
#define CONFIG_SPL_TEXT_BASE 0x0c200000
/* 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
/* NAND Configuration */
#define CONFIG_SYS_NAND_PAGE_2K
@@
-39,4
+45,6
@@
#define CONFIG_KSNET_NETCP_V1_0
#define CONFIG_KSNET_CPSW_NUM_PORTS 5
#define CONFIG_KSNET_NETCP_V1_0
#define CONFIG_KSNET_CPSW_NUM_PORTS 5
+#define CONFIG_DDR_SPD
+
#endif /* __CONFIG_K2HK_EVM_H */
#endif /* __CONFIG_K2HK_EVM_H */