SECURE_BOOT: Use default bootargs
authorSaksham Jain <saksham.jain@nxp.com>
Wed, 23 Mar 2016 10:54:43 +0000 (16:24 +0530)
committerYork Sun <york.sun@nxp.com>
Tue, 29 Mar 2016 15:46:23 +0000 (08:46 -0700)
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>
include/config_fsl_chain_trust.h

index aa222bbde20031eae33714253ce928250040a3de..566fd80a05c8769e4e2c77df1a2ec4b00cad9d16 100644 (file)
  *      "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;"     \