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 branch 'master' of git://git.denx.de/u-boot-coldfire
[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
dc0ac7d
..
05b4a3c
100644
(file)
--- a/
include/configs/k2hk_evm.h
+++ b/
include/configs/k2hk_evm.h
@@
-1,10
+1,9
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration header file for TI's k2hk-evm
*
* (C) Copyright 2012-2014
* Texas Instruments Incorporated, <www.ti.com>
/*
* Configuration header file for TI's k2hk-evm
*
* (C) Copyright 2012-2014
* Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_K2HK_EVM_H
*/
#ifndef __CONFIG_K2HK_EVM_H
@@
-12,9
+11,6
@@
#include <environment/ti/spi.h>
#include <environment/ti/spi.h>
-/* Platform type */
-#define CONFIG_SOC_K2HK
-
#ifdef CONFIG_TI_SECURE_DEVICE
#define DEFAULT_SEC_BOOT_ENV \
DEFAULT_FIT_TI_ARGS \
#ifdef CONFIG_TI_SECURE_DEVICE
#define DEFAULT_SEC_BOOT_ENV \
DEFAULT_FIT_TI_ARGS \
@@
-24,7
+20,7
@@
#endif
/* U-Boot general configuration */
#endif
/* U-Boot general configuration */
-#define
CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS
\
+#define
ENV_KS2_BOARD_SETTINGS
\
DEFAULT_FW_INITRAMFS_BOOT_ENV \
DEFAULT_SEC_BOOT_ENV \
"boot=ubi\0" \
DEFAULT_FW_INITRAMFS_BOOT_ENV \
DEFAULT_SEC_BOOT_ENV \
"boot=ubi\0" \
@@
-36,23
+32,11
@@
"name_uboot=u-boot-spi-k2hk-evm.gph\0" \
"name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
"name_uboot=u-boot-spi-k2hk-evm.gph\0" \
"name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
-#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
-#define CONFIG_ENV_OFFSET 0x100000
-
#include <configs/ti_armv7_keystone2.h>
#include <configs/ti_armv7_keystone2.h>
-/* SPL SPI Loader Configuration */
-#define CONFIG_SPL_TEXT_BASE 0x0c200000
-
#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
-/* NAND Configuration */
-#define CONFIG_SYS_NAND_PAGE_2K
-
/* Network */
/* Network */
-#define CONFIG_KSNET_NETCP_V1_0
-#define CONFIG_KSNET_CPSW_NUM_PORTS 5
-
-#define CONFIG_DDR_SPD
+#define CFG_KSNET_CPSW_NUM_PORTS 5
#endif /* __CONFIG_K2HK_EVM_H */
#endif /* __CONFIG_K2HK_EVM_H */