[PATCH] condfigs: ls1046aqds: support distro boot

[Biwen Li]

> >Cc: Alison Wang <alison.wang at nxp.com>; u-boot at lists.denx.de; Jiafei Pan
> ><jiafei.pan at nxp.com>; Biwen Li <biwen.li at nxp.com>
> >Subject: [PATCH] condfigs: ls1046aqds: support distro boot
> >
> 
> Typo mistake : configs
I will correct it in v2.
> >Add support of distro boot for ls1046aqds
> >
> >Signed-off-by: Biwen Li <biwen.li at nxp.com>
> >---
> > include/configs/ls1046a_common.h |  8 +++++++-
> > include/configs/ls1046aqds.h     | 20 +++++++++-----------
> > 2 files changed, 16 insertions(+), 12 deletions(-)
> >
> >diff --git a/include/configs/ls1046a_common.h
> >b/include/configs/ls1046a_common.h
> >index 07570187f5..111bc9a7b9 100644
> >--- a/include/configs/ls1046a_common.h
> >+++ b/include/configs/ls1046a_common.h
> >@@ -227,7 +227,7 @@
> > 	"fdt_high=0xffffffffffffffff\0"		\
> > 	"initrd_high=0xffffffffffffffff\0"	\
> > 	"fdt_addr=0x64f00000\0"                 \
> >-	"kernel_addr=0x65000000\0"              \
> >+	"kernel_addr=0x61000000\0"              \
> > 	"scriptaddr=0x80000000\0"               \
> > 	"scripthdraddr=0x80080000\0"		\
> > 	"fdtheader_addr_r=0x80100000\0"         \
> >@@ -274,6 +274,12 @@
> > 		"&& sf read $kernelheader_addr_r $kernelheader_start "
> >	\
> > 		"$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \
> > 		"bootm $load_addr#$board\0"		\
> >+	"nor_bootcmd=echo Trying load from nor..;"	\
> >+		"cp.b $kernel_addr $load_addr "		\
> >+		"$kernel_size; env exists secureboot "	\
> >+		"&& cp.b $kernelheader_addr $kernelheader_addr_r "	\
> >+		"$kernelheader_size && esbc_validate
> >${kernelheader_addr_r}; " \
> >+		"bootm $load_addr#$board\0"	\
> > 	"sd_bootcmd=echo Trying load from SD ..;"	\
> > 		"mmcinfo; mmc read $load_addr "		\
> > 		"$kernel_addr_sd $kernel_size_sd && "	\
> >diff --git a/include/configs/ls1046aqds.h
> >b/include/configs/ls1046aqds.h index
> >eea738e602..d5d96c4ed5 100644
> >--- a/include/configs/ls1046aqds.h
> >+++ b/include/configs/ls1046aqds.h
> >@@ -457,19 +457,17 @@ unsigned long get_board_ddr_clk(void);
> >
> > #undef CONFIG_BOOTCOMMAND
> > #ifdef CONFIG_TFABOOT
> >-#define QSPI_NOR_BOOTCOMMAND		"sf probe && sf read
> 
> I don't see updated definition of QSPI_NOR_BOOTCOMMAND?
Have updated the definition.
> 
> >$kernel_load "    \
> >-					"e0000 f00000 && bootm
> >$kernel_load"
> >-#define IFC_NOR_BOOTCOMMAND		"cp.b $kernel_start
> >$kernel_load "     \
> >-					"$kernel_size && bootm
> >$kernel_load"
> >-#define SD_BOOTCOMMAND		"mmc info; mmc read $kernel_load"
> >\
> >-					"$kernel_addr_sd $kernel_size_sd &&
> >bootm $kernel_load"
> >+#define IFC_NOR_BOOTCOMMAND "run distro_bootcmd; run
> nor_bootcmd;
> >"	\
> >+			   "env exists secureboot && esbc_halt;;"
> >+#define SD_BOOTCOMMAND "run distro_bootcmd; run sd_bootcmd; "
> >	\
> >+			   "env exists secureboot && esbc_halt;;"
> > #else
> >-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
> >-#define CONFIG_BOOTCOMMAND		"sf probe && sf read
> >$kernel_load "    \
> >-					"e0000 f00000 && bootm
> >$kernel_load"
> >+#if defined(CONFIG_SD_BOOT)
> >+#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run sd_bootcmd;
> "
> >	\
> >+			   "env exists secureboot && esbc_halt;;"
> > #else
> >-#define CONFIG_BOOTCOMMAND		"cp.b $kernel_start
> >$kernel_load "     \
> >-					"$kernel_size && bootm
> >$kernel_load"
> >+#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run nor_bootcmd;
> "
> >	\
> >+			   "env exists secureboot && esbc_halt;;"
> > #endif
> > #endif
> >
> >--
> >2.17.1
> 
> Priyanka