[PATCH 1/4] image-android: Prepend/postpend default bootargs value with given bootcmd

[George Chan via B4 Relay]

From: George Chan <gchan9...@gmail.com>

Control how default bootargs is prepended or postpended to boot param found
from androidboot img.

Signed-off-by: George Chan <gchan9...@gmail.com>
---
 boot/Kconfig         |  8 ++++++++
 boot/image-android.c | 10 ++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index 30eb5b328d7..6559398cb92 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -11,6 +11,14 @@ config ANDROID_BOOT_IMAGE
          This enables support for booting images which use the Android
          image format header.
 
+config ANDROID_BOOT_IMAGE_PREPEND_ENV_BOOTARGS
+       bool "Android Boot Image boot cmd param will prepend to env bootargs"
+       default n
+       help
+         This control how androidboot img with bootcmd param integrate with 
u-boot
+         env bootargs. By enable this, androidboot boot param will prepend to
+         head of bootargs env.
+
 config TIMESTAMP
        bool "Show image date and time when displaying image information"
        default y if CMD_DATE
diff --git a/boot/image-android.c b/boot/image-android.c
index 1746b018900..fbcd2682a5e 100644
--- a/boot/image-android.c
+++ b/boot/image-android.c
@@ -347,14 +347,14 @@ int android_image_get_kernel(const void *hdr,
                len += strlen(img_data.kcmdline_extra) + (len ? 1 : 0); /* +1 
for extra space */
        }
 
-       char *newbootargs = malloc(len + 1); /* +1 for the '\0' */
+       char *newbootargs = malloc(len + 2); /* +2 for 2x '\0' */
        if (!newbootargs) {
                puts("Error: malloc in android_image_get_kernel failed!\n");
                return -ENOMEM;
        }
        *newbootargs = '\0'; /* set to Null in case no components below are 
present */
 
-       if (bootargs)
+       if (bootargs && 
!IS_ENABLED(CONFIG_ANDROID_BOOT_IMAGE_PREPEND_ENV_BOOTARGS))
                strcpy(newbootargs, bootargs);
 
        if (img_data.kcmdline && *img_data.kcmdline) {
@@ -369,6 +369,12 @@ int android_image_get_kernel(const void *hdr,
                strcat(newbootargs, img_data.kcmdline_extra);
        }
 
+       if (bootargs && 
IS_ENABLED(CONFIG_ANDROID_BOOT_IMAGE_PREPEND_ENV_BOOTARGS)) {
+               if (*newbootargs) /* If there is something in newbootargs, a 
space is needed */
+                       strcat(newbootargs, " ");
+               strcat(newbootargs, bootargs);
+       }
+
        env_set("bootargs", newbootargs);
        free(newbootargs);
 

-- 
2.43.0