diff options
| author | Nicolas Belin <nbelin@baylibre.com> | 2024-12-17 14:29:08 +0100 |
|---|---|---|
| committer | Mattijs Korpershoek <mkorpershoek@baylibre.com> | 2024-12-18 14:04:23 +0100 |
| commit | 53a0ddb6d3bed9f9607af79934a7625299c36793 (patch) | |
| tree | 818d460a9303f42182568a9b6ab5dea08cf4b52b | |
| parent | 25fb58e88aba0c4af0af554d7b141be3f2e5e0b5 (diff) | |
| download | u-boot-53a0ddb6d3bed9f9607af79934a7625299c36793.zip u-boot-53a0ddb6d3bed9f9607af79934a7625299c36793.tar.gz u-boot-53a0ddb6d3bed9f9607af79934a7625299c36793.tar.bz2 | |
boot: android: fix extra command line support
Check that the value at the address kcmdline_extra is not 0
instead of checking the address value itself keeping it
consistent with what is done for kcmdline.
Fixes: b36b227b ("android: boot: support extra command line")
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
Link: https://lore.kernel.org/r/20241217-fix-bootargs-concatenation-v2-1-b2fd7cf4e130@baylibre.com
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| -rw-r--r-- | boot/image-android.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/boot/image-android.c b/boot/image-android.c index cd01278..5715828 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -292,7 +292,7 @@ int android_image_get_kernel(const void *hdr, len += strlen(img_data.kcmdline); } - if (img_data.kcmdline_extra) { + if (*img_data.kcmdline_extra) { printf("Kernel extra command line: %s\n", img_data.kcmdline_extra); len += strlen(img_data.kcmdline_extra); } @@ -316,7 +316,7 @@ int android_image_get_kernel(const void *hdr, if (*img_data.kcmdline) strcat(newbootargs, img_data.kcmdline); - if (img_data.kcmdline_extra) { + if (*img_data.kcmdline_extra) { strcat(newbootargs, " "); strcat(newbootargs, img_data.kcmdline_extra); } |