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 tag 'efi-2019-07-rc5-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
[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
9598bc6
..
d4f2e96
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
@@
-15,9
+14,18
@@
/* Platform type */
#define CONFIG_SOC_K2HK
/* Platform type */
#define CONFIG_SOC_K2HK
+#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 \
DEFAULT_FW_INITRAMFS_BOOT_ENV \
/* U-Boot general configuration */
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
DEFAULT_FW_INITRAMFS_BOOT_ENV \
+ DEFAULT_SEC_BOOT_ENV \
"boot=ubi\0" \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \
"boot=ubi\0" \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \
@@
-28,14
+36,10
@@
"name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
"name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
#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>
#define CONFIG_ENV_OFFSET 0x100000
#include <configs/ti_armv7_keystone2.h>
-/* SPL SPI Loader Configuration */
-#define CONFIG_SPL_TEXT_BASE 0x0c200000
-
#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
/* NAND Configuration */
#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
/* NAND Configuration */