diff options
| author | Peng Fan <peng.fan@nxp.com> | 2019-06-06 11:10:43 +0800 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2019-06-06 14:19:53 +0800 |
| commit | 0621daad605581ce8e489749cfbfc1d4f48be894 (patch) | |
| tree | 039aca60b5c8bf2066ec72c3eae049da9b95a28a | |
| parent | 745f7a4e916d84bc61f2b131cffd50f53c6c1394 (diff) | |
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)
| -rw-r--r-- | include/configs/mx6sabre_common.h | 5 | ||||
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 4 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h | 5 | ||||
| -rw-r--r-- | include/configs/mx6ullevk.h | 5 | ||||
| -rw-r--r-- | include/configs/mx7dsabresd.h | 5 |
5 files changed, 15 insertions, 9 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 40014ed6a5..6dc02b7de4 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2012 Freescale Semiconductor, Inc. - * Copyright 2018 NXP + * Copyright 2018-2019 NXP * * Configuration settings for the Freescale i.MX6Q SabreSD board. * @@ -101,6 +101,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 " \ @@ -111,7 +112,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 d464f86968..b3afbacd18 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -1,5 +1,6 @@ /* * Copyright 2014 Freescale Semiconductor, Inc. + * Copyright 2019 NXP * * Configuration settings for the Freescale i.MX6SX Sabreauto board. * @@ -70,6 +71,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" \ @@ -82,7 +84,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 7c4b659acf..156e9f0df5 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. - * Copyright 2017 NXP + * Copyright 2017,2019 NXP * * Configuration settings for the Freescale i.MX6UL 14x14 EVK board. * @@ -100,6 +100,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 " \ @@ -110,7 +111,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 b4984a4cd2..6d131a1ebe 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. - * Copyright 2017 NXP + * Copyright 2017,2019 NXP * * Configuration settings for the Freescale i.MX6UL 14x14 EVK board. * @@ -100,6 +100,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 " \ @@ -110,7 +111,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 f5171bb579..69f4670c92 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. - * Copyright 2017-2018 NXP + * Copyright 2017-2019 NXP * * Configuration settings for the Freescale i.MX7D SABRESD board. * @@ -115,6 +115,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 " \ @@ -125,7 +126,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" |