summaryrefslogtreecommitdiffstats
path: root/include/config_fsl_chain_trust.h
diff options
context:
space:
mode:
authorSaksham Jain <saksham.jain@nxp.com>2016-03-23 16:24:43 +0530
committerYork Sun <york.sun@nxp.com>2016-03-29 08:46:23 -0700
commit2bfe4890856c94d939e193999dccdc75afc5c5bd (patch)
treefe3de0eaf58e6798e5b71fe87374a0beb3a92c01 /include/config_fsl_chain_trust.h
parent8a6f83dcb8638e34c264e6ee8ee5699975de68a0 (diff)
downloadblackbird-obmc-uboot-2bfe4890856c94d939e193999dccdc75afc5c5bd.tar.gz
blackbird-obmc-uboot-2bfe4890856c94d939e193999dccdc75afc5c5bd.zip
SECURE_BOOT: Use default bootargs
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. Signed-off-by: Aneesh Bansal <aneesh.bansal@nxp.com> Signed-off-by: Saksham Jain <saksham.jain@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'include/config_fsl_chain_trust.h')
-rw-r--r--include/config_fsl_chain_trust.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h
index aa222bbde2..566fd80a05 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;" \
OpenPOWER on IntegriCloud