diff mbox

[U-Boot,v5,12/14] SECURE_BOOT: Use default bootargs

Message ID 1458730485-447-13-git-send-email-saksham.jain@nxp.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Saksham Jain March 23, 2016, 10:54 a.m. UTC 
For secure boot, currently we were using fixed bootargs for all SoCs.
This is not needed and we can use the bootargs which are used in
non-secure boot. Incase bootargs are not defined for non-secure boot
of any platform, we use default bootargs.

Signed-off-by: Aneesh Bansal <aneesh.bansal@nxp.com>
Signed-off-by: Saksham Jain <saksham.jain@nxp.com>
---
Changes for v2:
	- No changes
Changes for v3:
	- No changes
Changes for v4:
	- Cleaned up commit message
Changes for v5:
	- Cleaned up commit message

 include/config_fsl_chain_trust.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Comments

York Sun March 29, 2016, 3:57 p.m. UTC | #1 
On 03/22/2016 10:43 PM, Saksham Jain wrote:
> For secure boot, currently we were using fixed bootargs for all SoCs.
> This is not needed and we can use the bootargs which are used in
> non-secure boot. Incase bootargs are not defined for non-secure boot
> of any platform, we use default bootargs.
> 
> Signed-off-by: Aneesh Bansal <aneesh.bansal@nxp.com>
> Signed-off-by: Saksham Jain <saksham.jain@nxp.com>
> ---
> Changes for v2:
> 	- No changes
> Changes for v3:
> 	- No changes
> Changes for v4:
> 	- Cleaned up commit message
> Changes for v5:
> 	- Cleaned up commit message
> 
>  include/config_fsl_chain_trust.h | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 


Minor change to commit message.

Applied to u-boot-fsl-qoriq master. Awaiting upstream.

Thanks.

York
diff mbox

Patch

diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h
index aa222bb..566fd80 100644
--- a/include/config_fsl_chain_trust.h
+++ b/include/config_fsl_chain_trust.h
@@ -44,11 +44,18 @@ 
  *	 "41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b"
  */
 
+#ifdef CONFIG_BOOTARGS
+#define CONFIG_SET_BOOTARGS	"setenv bootargs \'" CONFIG_BOOTARGS" \';"
+#else
+#define CONFIG_SET_BOOTARGS	"setenv bootargs \'root=/dev/ram "	\
+				"rw console=ttyS0,115200 ramdisk_size=600000\';"
+#endif
+
+
 #ifdef CONFIG_BOOTSCRIPT_KEY_HASH
 #define CONFIG_SECBOOT \
 	"setenv bs_hdraddr " __stringify(CONFIG_BOOTSCRIPT_HDR_ADDR)";" \
-	"setenv bootargs \'root=/dev/ram rw console=ttyS0,115200 "	\
-	"ramdisk_size=600000\';"	\
+	CONFIG_SET_BOOTARGS	\
 	CONFIG_EXTRA_ENV	\
 	"esbc_validate $bs_hdraddr " \
 	  __stringify(CONFIG_BOOTSCRIPT_KEY_HASH)";" \
@@ -57,8 +64,7 @@ 
 #else
 #define CONFIG_SECBOOT \
 	"setenv bs_hdraddr " __stringify(CONFIG_BOOTSCRIPT_HDR_ADDR)";" \
-	"setenv bootargs \'root=/dev/ram rw console=ttyS0,115200 "	\
-	"ramdisk_size=600000\';"	\
+	CONFIG_SET_BOOTARGS	\
 	CONFIG_EXTRA_ENV	\
 	"esbc_validate $bs_hdraddr;" \
 	"source $img_addr;"	\