From mboxrd@z Thu Jan  1 00:00:00 1970
From: York Sun <york.sun@nxp.com>
Date: Wed, 3 Oct 2018 16:28:38 +0000
Subject: [U-Boot] [PATCH 20/53] armv8: ls1046a: define BOOTCOMMAND for
	TFABOOT
References: <20181003113736.14981-1-rajesh.bhagat@nxp.com>
 <20181003113736.14981-21-rajesh.bhagat@nxp.com>
Message-ID: <DB7PR04MB42980D14E9008E4203E2D7819AE90@DB7PR04MB4298.eurprd04.prod.outlook.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 10/03/2018 04:39 AM, Rajesh Bhagat wrote:
> Defines BOOTCOMMAND for TFABOOT configuration for
> supported boot sources.

Please keep the commit message format consistent, to wrap back at or
near 70th characters through the entire patch set.

> 
> Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
> Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com>
> ---
>  include/configs/ls1046aqds.h | 9 +++++++++
>  include/configs/ls1046ardb.h | 7 +++++++
>  2 files changed, 16 insertions(+)
> 
> diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
> index 765a21e00f..2a30cef0e4 100644
> --- a/include/configs/ls1046aqds.h
> +++ b/include/configs/ls1046aqds.h
> @@ -432,6 +432,14 @@ unsigned long get_board_ddr_clk(void);
>  #define CONFIG_CMDLINE_TAG
>  
>  #undef CONFIG_BOOTCOMMAND
> +#ifdef CONFIG_TFABOOT
> +#define QSPI_NOR_BOOTCOMMAND		"sf probe && sf read $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"
> +#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"
> @@ -439,6 +447,7 @@ unsigned long get_board_ddr_clk(void);
>  #define CONFIG_BOOTCOMMAND		"cp.b $kernel_start $kernel_load "     \
>  					"$kernel_size && bootm $kernel_load"
>  #endif
> +#endif
>  
>  #include <asm/fsl_secure_boot.h>
>  
> diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
> index b8d9419b48..cc1f5f5f55 100644
> --- a/include/configs/ls1046ardb.h
> +++ b/include/configs/ls1046ardb.h
> @@ -216,6 +216,12 @@
>  
>  #ifndef SPL_NO_MISC
>  #undef CONFIG_BOOTCOMMAND
> +#ifdef CONFIG_TFABOOT
> +#define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd; run qspi_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)
>  #define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; "	\
>  			   "env exists secureboot && esbc_halt;;"
> @@ -224,6 +230,7 @@
>  			   "env exists secureboot && esbc_halt;"
>  #endif
>  #endif
> +#endif
>  
>  #include <asm/fsl_secure_boot.h>
>  
> 

Shouldn't this patch be put before patch #19? Did you compile each patch
incrementally?

York