From eec72b9f1cb2a5117fc299df14a9983bbffa499f Mon Sep 17 00:00:00 2001
From: Viswanath Kraleti <quic_vkraleti@quicinc.com>
Date: Tue, 30 Jul 2024 10:39:25 +0530
Subject: [PATCH] linux-qcom-uki.bb: Enhance cmdline handling

Construct kernel cmdline by reading QCOM_BOOTIMG_ROOTFS, SERIAL_CONSOLES
and KERNEL_CMDLINE_EXTRA variables and update the same into uki cmdline.

Signed-off-by: Viswanath Kraleti <quic_vkraleti@quicinc.com>
---
 recipes-kernel/images/linux-qcom-uki.bb | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/images/linux-qcom-uki.bb b/recipes-kernel/images/linux-qcom-uki.bb
index 0d34b60..a10d7a0 100644
--- a/recipes-kernel/images/linux-qcom-uki.bb
+++ b/recipes-kernel/images/linux-qcom-uki.bb
@@ -51,10 +51,28 @@ do_compile() {
     ukify_cmd="$ukify_cmd --uname ${KERNEL_VERSION}"
 
     # Kernel cmdline
-    if [ -n "${KERNEL_CMDLINE_EXTRA}" ]; then
-        ukify_cmd="$ukify_cmd --cmdline='${KERNEL_CMDLINE_EXTRA}'"
+    cmdline=""
+    if [ -n "${QCOM_BOOTIMG_ROOTFS}" ]; then
+        cmdline="$cmdline root=${QCOM_BOOTIMG_ROOTFS} rw rootwait"
     fi
 
+    if [ ! -z "${SERIAL_CONSOLES}" ]; then
+        tmp="${SERIAL_CONSOLES}"
+        for entry in $tmp ; do
+            baudrate=`echo $entry | sed 's/\;.*//'`
+            tty=`echo $entry | sed -e 's/^[0-9]*\;//' -e 's/\;.*//'`
+	    console="$tty","$baudrate"n8
+            cmdline="$cmdline console=$console"
+        done
+    fi
+
+    if [ -n "${KERNEL_CMDLINE_EXTRA}" ]; then
+        cmdline="$cmdline ${KERNEL_CMDLINE_EXTRA}"
+    fi
+
+    printf '%s' "$cmdline" > ${B}/cmdline
+    ukify_cmd="$ukify_cmd --cmdline @${B}/cmdline"
+
     # Architecture
     ukify_cmd="$ukify_cmd --efi-arch ${EFI_ARCH}"
 
@@ -77,6 +95,7 @@ do_compile() {
     echo "ukify cmd:$ukify_cmd"
     ukify build $ukify_cmd
 }
+do_compile[vardeps] += "KERNEL_CMDLINE_EXTRA QCOM_BOOTIMG_ROOTFS"
 
 do_install() {
     install -Dm 0755 ${B}${EFI_UKI_PATH}/${EFI_LINUX_IMG} ${D}${EFI_UKI_PATH}/${EFI_LINUX_IMG}