summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/image-android.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/common/image-android.c b/common/image-android.c
index d79de0f..649080a 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -126,6 +126,19 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
strcat(commandline, bootargs_sec);
}
#endif
+#ifdef CONFIG_SYSTEM_RAMDISK_SUPPORT
+ /* Normal boot:
+ * cmdline to bypass ramdisk in boot.img, but use the system.img
+ * Recovery boot:
+ * Use the ramdisk in boot.img
+ */
+ char *bootargs_3rd = getenv("bootargs_3rd");
+ if (bootargs_3rd) {
+ strcat(commandline, " ");
+ strcat(commandline, bootargs_3rd);
+ }
+#endif
+ printf("Kernel command line: %s\n", commandline);
setenv("bootargs", commandline);
if (os_data) {