diff mbox series

[1/2,v2] armv8: ls1028aqds: add some environments

Message ID 20200320063707.18622-1-andy.tang@nxp.com
State Accepted
Commit 40ef9d16975ddfe502ab8db70336dd0fc0f13607
Headers show
Series [1/2,v2] armv8: ls1028aqds: add some environments | expand

Commit Message

Andy Tang March 20, 2020, 6:37 a.m. UTC
From: Yuantian Tang <andy.tang at nxp.com>

Add sd and emmc bootcmd environments to facilitate
the boot process.

Signed-off-by: Yuantian Tang <andy.tang at nxp.com>
---
v2:
	- updated some variable slightly.

 include/configs/ls1028aqds.h | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

Comments

Priyanka Jain (OSS) March 30, 2020, 11:54 a.m. UTC | #1
>-----Original Message-----
>From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of
>andy.tang at nxp.com
>Sent: Friday, March 20, 2020 12:07 PM
>To: Priyanka Jain <priyanka.jain at nxp.com>; Rajesh Bhagat
><rajesh.bhagat at nxp.com>
>Cc: Sudhanshu Gupta <sudhanshu.gupta at nxp.com>; u-boot at lists.denx.de;
>Andy Tang <andy.tang at nxp.com>
>Subject: [PATCH 1/2 v2] armv8: ls1028aqds: add some environments
>
>From: Yuantian Tang <andy.tang at nxp.com>
>
>Add sd and emmc bootcmd environments to facilitate the boot process.
>
>Signed-off-by: Yuantian Tang <andy.tang at nxp.com>
>---
Applied to u-boot-fsl-qoriq after rebasing. Waiting upstream

Thanks
Priyanka
diff mbox series

Patch

diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h
index b3c1242..5843274 100644
--- a/include/configs/ls1028aqds.h
+++ b/include/configs/ls1028aqds.h
@@ -108,6 +108,7 @@ 
 	"load_addr=0xa0000000\0" \
 	"kernel_addr_r=0x81000000\0" \
 	"fdt_addr_r=0x90000000\0" \
+	"fdt2_addr_r=0x90010000\0" \
 	"ramdisk_addr_r=0xa0000000\0" \
 	"kernel_start=0x1000000\0" \
 	"kernelheader_start=0x800000\0" \
@@ -148,19 +149,35 @@ 
 			"${scripthdraddr} ${prefix}${boot_script_hdr} " \
 			"&& esbc_validate ${scripthdraddr};" \
 		"source ${scriptaddr}\0" \
-	"sd_bootcmd=echo Trying load from SD ..;" \
-		"mmcinfo; mmc read $load_addr " \
-		"$kernel_addr_sd $kernel_size_sd && " \
+	"xspi_bootcmd=echo Trying load from FlexSPI flash ...;" \
+		"sf probe 0:0 && sf read $load_addr " \
+		"$kernel_start $kernel_size ; env exists secureboot &&" \
+		"sf read $kernelheader_addr_r $kernelheader_start " \
+		"$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\
+		" bootm $load_addr#$board\0" \
+	"xspi_hdploadcmd=echo Trying load HDP firmware from FlexSPI...;" \
+		"sf probe 0:0 && sf read $load_addr 0x940000 0x30000 " \
+		"&& hdp load $load_addr 0x2000\0"			\
+	"sd_bootcmd=echo Trying load from SD ...;" \
+		"mmc dev 0; mmcinfo; mmc read $load_addr "		\
+		"$kernel_addr_sd $kernel_size_sd && "	\
 		"env exists secureboot && mmc read $kernelheader_addr_r " \
-		"$kernelhdr_addr_sd $kernelhdr_size_sd " \
-		" && esbc_validate ${kernelheader_addr_r};" \
-		"bootm $load_addr#$board\0" \
-	"emmc_bootcmd=echo Trying load from EMMC ..;" \
-		"mmcinfo; mmc dev 1; mmc read $load_addr " \
-		"$kernel_addr_sd $kernel_size_sd && " \
+		"$kernelhdr_addr_sd $kernelhdr_size_sd "		\
+		" && esbc_validate ${kernelheader_addr_r};"	\
+		"bootm $load_addr#$board\0"		\
+	"sd_hdploadcmd=echo Trying load HDP firmware from SD..;"        \
+		"mmc dev 0;mmcinfo; mmc read $load_addr 0x4a00 0x200 "	\
+		"&& hdp load $load_addr 0x2000\0"	\
+	"emmc_bootcmd=echo Trying load from EMMC ..;"	\
+		"mmc dev 1; mmcinfo; mmc read $load_addr "		\
+		"$kernel_addr_sd $kernel_size_sd && "	\
 		"env exists secureboot && mmc read $kernelheader_addr_r " \
-		"$kernelhdr_addr_sd $kernelhdr_size_sd " \
+		"$kernelhdr_addr_sd $kernelhdr_size_sd "		\
 		" && esbc_validate ${kernelheader_addr_r};"	\
-		"bootm $load_addr#$board\0"
+		"bootm $load_addr#$board\0"			\
+	"emmc_hdploadcmd=echo Trying load HDP firmware from EMMC..;"      \
+		"mmc dev 1;mmcinfo;mmc read $load_addr 0x4a00 0x200 "	\
+		"&& hdp load $load_addr 0x2000\0"
+
 #endif
 #endif /* __LS1028A_QDS_H */