android: support boot header version 3 and 4

This adds support for Android boot header version 3 and 4.

Signed-off-by: Safae Ouajih souajih@baylibre.com

Bug: TIAU-132

Series:

• ti-linux-kernel!75 (closed)
• baylibre/ti/android/aosp/device/ti/am62x!29 (closed)
• !7 (closed)

common/image-android.c

@@ -54,6 +54,7 @@ static void android_vendor_boot_image_v3_v4_parse_hdr(const struct andr_vendor_b
 	 * The header takes a full page, the remaining components are aligned
 	 * on page boundary.
 	 */
+	data->kcmdline_extra = (const char *)hdr->cmdline;
 	data->tags_addr = hdr->tags_addr;
 	data->image_name = (const char *)hdr->name;
 	data->kernel_addr = hdr->kernel_addr;
@@ -228,6 +229,11 @@ int android_image_get_kernel(const struct andr_boot_img_hdr_v0_v1_v2 *hdr,
 		len += strlen(img_data.kcmdline);
 	}
 
+	if (*img_data.kcmdline_extra) {
+		printf("Kernel extra command line: %s\n", img_data.kcmdline_extra);
+		len += strlen(img_data.kcmdline_extra);
+	}
+
 	char *bootargs = env_get("bootargs");
 	if (bootargs)
 		len += strlen(bootargs);
@@ -246,6 +252,11 @@ int android_image_get_kernel(const struct andr_boot_img_hdr_v0_v1_v2 *hdr,
 	if (*img_data.kcmdline)
 		strcat(newbootargs, img_data.kcmdline);
 
+	if (*img_data.kcmdline_extra) {
+		strcat(newbootargs, " ");
+		strcat(newbootargs, img_data.kcmdline_extra);
+	}
+
 	env_set("bootargs", newbootargs);
 	ihdr = (const struct image_header *)img_data.kernel_ptr;
 	if (os_data) {