MLK-21961 imx: fix tee_addr for nand boot
teeaddr is not set. Align with sd/emmc, use tee_addr and set tee_addr.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reported-by: Jessie Lee <jessie.lee@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5fb43e3f8fba534d49d8066411644285eaa279b4)
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index f9c93d4..da6dc6a 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Freescale Semiconductor, Inc.
- * Copyright 2018 NXP
+ * Copyright 2018-2019 NXP
*
* Configuration settings for the Freescale i.MX6Q SabreSD board.
*/
@@ -98,6 +98,7 @@
CONFIG_MFG_ENV_SETTINGS \
TEE_ENV \
"fdt_addr=0x18000000\0" \
+ "tee_addr=0x20000000\0" \
"fdt_high=0xffffffff\0" \
"console=" CONSOLE_DEV "\0" \
"bootargs=console=" CONSOLE_DEV ",115200 ubi.mtd=6 " \
@@ -108,7 +109,7 @@
"nand read ${fdt_addr} 0x5000000 0x100000;"\
"if test ${tee} = yes; then " \
"nand read ${tee_addr} 0x4000000 0x400000;"\
- "bootm ${teeaddr} - ${fdt_addr};" \
+ "bootm ${tee_addr} - ${fdt_addr};" \
"else " \
"bootz ${loadaddr} - ${fdt_addr};" \
"fi\0"
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 07bf459..f136d2a 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
+ * Copyright 2019 NXP
*
* Configuration settings for the Freescale i.MX6SX Sabreauto board.
*/
@@ -69,6 +70,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS \
TEE_ENV \
+ "tee_addr=0x84000000\0" \
"panel=Hannstar-XGA\0" \
"fdt_addr=0x83000000\0" \
"fdt_high=0xffffffff\0" \
@@ -81,7 +83,7 @@
"nand read ${fdt_addr} 0x5000000 0x100000;"\
"if test ${tee} = yes; then " \
"nand read ${tee_addr} 0x6000000 0x400000;"\
- "bootm ${teeaddr} - ${fdt_addr};" \
+ "bootm ${tee_addr} - ${fdt_addr};" \
"else " \
"bootz ${loadaddr} - ${fdt_addr};" \
"fi\0"
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 36ead76..6e7de16 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
- * Copyright 2017 NXP
+ * Copyright 2017,2019 NXP
*
* Configuration settings for the Freescale i.MX6UL 14x14 EVK board.
*/
@@ -86,6 +86,7 @@
"panel=TFT43AB\0" \
"fdt_addr=0x83000000\0" \
"fdt_high=0xffffffff\0" \
+ "tee_addr=0x84000000\0" \
"console=ttymxc0\0" \
"bootargs=console=ttymxc0,115200 ubi.mtd=4 " \
"root=ubi0:rootfs rootfstype=ubifs " \
@@ -96,7 +97,7 @@
"nand read ${fdt_addr} 0x5000000 0x100000;"\
"if test ${tee} = yes; then " \
"nand read ${tee_addr} 0x6000000 0x400000;"\
- "bootm ${teeaddr} - ${fdt_addr};" \
+ "bootm ${tee_addr} - ${fdt_addr};" \
"else " \
"bootz ${loadaddr} - ${fdt_addr};" \
"fi\0"
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index ce7a0e7..ac98c03 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
- * Copyright 2017 NXP
+ * Copyright 2017,2019 NXP
*
* Configuration settings for the Freescale i.MX6UL 14x14 EVK board.
*/
@@ -86,6 +86,7 @@
"panel=TFT43AB\0" \
"fdt_addr=0x83000000\0" \
"fdt_high=0xffffffff\0" \
+ "tee_addr=0x84000000\0" \
"console=ttymxc0\0" \
"bootargs=console=ttymxc0,115200 ubi.mtd=4 " \
"root=ubi0:rootfs rootfstype=ubifs " \
@@ -96,7 +97,7 @@
"nand read ${fdt_addr} 0x5000000 0x100000;"\
"if test ${tee} = yes; then " \
"nand read ${tee_addr} 0x6000000 0x400000;"\
- "bootm ${teeaddr} - ${fdt_addr};" \
+ "bootm ${tee_addr} - ${fdt_addr};" \
"else " \
"bootz ${loadaddr} - ${fdt_addr};" \
"fi\0"
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 0fce626..4d1e60b 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Freescale Semiconductor, Inc.
- * Copyright 2017-2018 NXP
+ * Copyright 2017-2019 NXP
*
* Configuration settings for the Freescale i.MX7D SABRESD board.
*/
@@ -112,6 +112,7 @@
TEE_ENV \
"panel=TFT43AB\0" \
"fdt_addr=0x83000000\0" \
+ "tee_addr=0x84000000\0" \
"fdt_high=0xffffffff\0" \
"console=ttymxc0\0" \
"bootargs=console=ttymxc0,115200 ubi.mtd=4 " \
@@ -122,7 +123,7 @@
"nand read ${fdt_addr} 0x5000000 0x100000;"\
"if test ${tee} = yes; then " \
"nand read ${tee_addr} 0x6000000 0x400000;"\
- "bootm ${teeaddr} - ${fdt_addr};" \
+ "bootm ${tee_addr} - ${fdt_addr};" \
"else " \
"bootz ${loadaddr} - ${fdt_addr};" \
"fi\0"
