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 https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
k2l_evm.h
diff --git
a/include/configs/k2l_evm.h
b/include/configs/k2l_evm.h
index
805164a
..
152cea0
100644
(file)
--- a/
include/configs/k2l_evm.h
+++ b/
include/configs/k2l_evm.h
@@
-1,36
+1,43
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration header file for TI's k2l-evm
*
* (C) Copyright 2012-2014
* Texas Instruments Incorporated, <www.ti.com>
/*
* Configuration header file for TI's k2l-evm
*
* (C) Copyright 2012-2014
* Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_K2L_EVM_H
#define __CONFIG_K2L_EVM_H
*/
#ifndef __CONFIG_K2L_EVM_H
#define __CONFIG_K2L_EVM_H
+#include <environment/ti/spi.h>
+
/* Platform type */
#define CONFIG_SOC_K2L
/* Platform type */
#define CONFIG_SOC_K2L
-#define CONFIG_K2L_EVM
-/* U-Boot general configuration */
-#define CONFIG_SYS_PROMPT "K2L EVM # "
+#ifdef CONFIG_TI_SECURE_DEVICE
+#define DEFAULT_SEC_BOOT_ENV \
+ DEFAULT_FIT_TI_ARGS \
+ "findfdt=setenv fdtfile ${name_fdt}\0"
+#else
+#define DEFAULT_SEC_BOOT_ENV
+#endif
+/* U-Boot general configuration */
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
- "addr_mon=0x0c140000\0" \
+ DEFAULT_FW_INITRAMFS_BOOT_ENV \
+ DEFAULT_SEC_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,4096\0"
\
- "name_fdt=
uImage-k2l-evm.dtb\0"
\
- "name_mon=skern-k2l
-evm.bin\0"
\
+ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=
ubifs,4096\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"
"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"
-#include <configs/
ks2_evm
.h>
+#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
/* NAND Configuration */
#define CONFIG_SYS_NAND_PAGE_4K