diff options
| author | Tom Rini <trini@ti.com> | 2014-11-07 16:18:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-07 16:18:35 -0500 |
| commit | cfa1bd0774eafcba4791bad4d66f01b8f0dc6f94 (patch) | |
| tree | 13740fe096447814d65871bc9c15bbac26b0e854 /include/configs/k2hk_evm.h | |
| parent | 11ada9225a16ed2d8ddbf0715a2416245a777cbc (diff) | |
| parent | 40bbd52a79bdf2175a2e44272bead2bc194a3293 (diff) | |
| download | u-boot-imx-cfa1bd0774eafcba4791bad4d66f01b8f0dc6f94.zip u-boot-imx-cfa1bd0774eafcba4791bad4d66f01b8f0dc6f94.tar.gz u-boot-imx-cfa1bd0774eafcba4791bad4d66f01b8f0dc6f94.tar.bz2 | |
Merge git://git.denx.de/u-boot-ti
Diffstat (limited to 'include/configs/k2hk_evm.h')
| -rw-r--r-- | include/configs/k2hk_evm.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 034cbfd..ffddf13 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -17,14 +17,15 @@ /* U-Boot general configuration */ #define CONFIG_SYS_PROMPT "K2HK EVM # " -#define KS2_ARGS_UBI "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "\ - "root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0" - -#define KS2_FDT_NAME "name_fdt=k2hk-evm.dtb\0" -#define KS2_ADDR_MON "addr_mon=0x0c5f0000\0" -#define KS2_NAME_MON "name_mon=skern-k2hk-evm.bin\0" -#define NAME_UBOOT "name_uboot=u-boot-spi-k2hk-evm.gph\0" -#define NAME_UBI "name_ubi=k2hk-evm-ubifs.ubi\0" +#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ + "addr_mon=0x0c5f0000\0" \ + "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" \ + "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> @@ -35,13 +36,7 @@ #define CONFIG_SYS_NAND_PAGE_2K /* Network */ -#define CONFIG_DRIVER_TI_KEYSTONE_NET -#define CONFIG_TI_KSNAV -#define CONFIG_KSNAV_PKTDMA_NETCP #define CONFIG_KSNET_NETCP_V1_0 #define CONFIG_KSNET_CPSW_NUM_PORTS 5 -/* SerDes */ -#define CONFIG_TI_KEYSTONE_SERDES - #endif /* __CONFIG_K2HK_EVM_H */ |