commit 20773b4dc6d64a42e837d9e059b4f238b0209af3
author Jeevan Shriram <jshriram@codeaurora.org> Tue Oct 10 14:16:15 2017 -0700
committer Jeevan Shriram <jshriram@codeaurora.org> Wed Nov 08 16:29:29 2017 -0800
tree 45948f7a91e83bc0cdd4f29df363ed4e68209991
parent 0773574865c21a00528958777ee8895c17d5b637

QcomModulePkg: Update Commandline for NAND devices

Update Command line for NAND devices with ubi system image partition
index.

Change-Id: If3832e248d1e4debed97e1b2f19165e5fd718923

QcomModulePkg/Include/Library/UpdateCmdLine.h

diff --git a/QcomModulePkg/Include/Library/UpdateCmdLine.h b/QcomModulePkg/Include/Library/UpdateCmdLine.h
index c5de7ea..1c89cd1 100644
--- a/QcomModulePkg/Include/Library/UpdateCmdLine.h
+++ b/QcomModulePkg/Include/Library/UpdateCmdLine.h
@@ -44,7 +44,7 @@
 #define BOOT_BASE_BAND " androidboot.baseband="
 #define BATT_MIN_VOLT 3200
 
-#define MAX_PATH_SIZE 64
+#define MAX_PATH_SIZE 72
 #define SERIAL_NUM_SIZE 64
 
 EFI_STATUS

QcomModulePkg/Library/BootLib/UpdateCmdLine.c

diff --git a/QcomModulePkg/Library/BootLib/UpdateCmdLine.c b/QcomModulePkg/Library/BootLib/UpdateCmdLine.c
index f6f2d86..267b2e8 100755
--- a/QcomModulePkg/Library/BootLib/UpdateCmdLine.c
+++ b/QcomModulePkg/Library/BootLib/UpdateCmdLine.c
@@ -294,13 +294,26 @@
     return 0;
   }
 
-  if (!AsciiStrCmp ("EMMC", RootDevStr))
+  if (!AsciiStrCmp ("EMMC", RootDevStr)) {
     AsciiSPrint (*SysPath, MAX_PATH_SIZE, " root=/dev/mmcblk0p%d", Index);
-  else
+  } else if (!AsciiStrCmp ("NAND", RootDevStr)) {
+    /* NAND is being treated as GPT partition, hence reduce the index by 1 as
+     * PartitionIndex (0) should be ignored for correct mapping of partition.
+     */
+    AsciiSPrint (*SysPath,
+          MAX_PATH_SIZE,
+          " rootfstype=ubifs rootflags=bulk_read root=ubi0:rootfs ubi.mtd=%d",
+          (Index - 1));
+  } else if (!AsciiStrCmp ("UFS", RootDevStr)) {
     AsciiSPrint (*SysPath, MAX_PATH_SIZE, " root=/dev/sd%c%d",
                  LunCharMapping[Lun],
                  GetPartitionIdxInLun (PartitionName, Lun));
-
+  } else {
+    DEBUG ((EFI_D_ERROR, "Unknown Device type\n"));
+    FreePool (*SysPath);
+    *SysPath = NULL;
+    return 0;
+  }
   DEBUG ((EFI_D_VERBOSE, "System Path - %a \n", *SysPath));
 
   return AsciiStrLen (*SysPath);
@@ -356,8 +369,6 @@
     CmdLineLen += AsciiStrLen (VBCmdLine);
   }
 
-  CmdLineLen += AsciiStrLen (BootDeviceCmdLine);
-
   BootDevBuf = AllocatePool (sizeof (CHAR8) * BOOT_DEV_MAX_LEN);
   if (BootDevBuf == NULL) {
     DEBUG ((EFI_D_ERROR, "Boot device buffer: Out of resources\n"));
@@ -369,11 +380,11 @@
     DEBUG ((EFI_D_ERROR, "Failed to get Boot Device: %r\n", Status));
     FreePool (BootDevBuf);
     BootDevBuf = NULL;
-    return Status;
+  } else {
+    CmdLineLen += AsciiStrLen (BootDeviceCmdLine);
+    CmdLineLen += AsciiStrLen (BootDevBuf);
   }
 
-  CmdLineLen += AsciiStrLen (BootDevBuf);
-
   CmdLineLen += AsciiStrLen (UsbSerialCmdLine);
   CmdLineLen += AsciiStrLen (StrSerialNum);
 
@@ -458,17 +469,19 @@
     STR_COPY (Dst, Src);
   }
 
-  Src = BootDeviceCmdLine;
-  if (HaveCmdLine) {
-    --Dst;
-  }
-  STR_COPY (Dst, Src);
+  if (BootDevBuf) {
+    Src = BootDeviceCmdLine;
+    if (HaveCmdLine) {
+      --Dst;
+    }
+    STR_COPY (Dst, Src);
 
-  Src = BootDevBuf;
-  --Dst;
-  STR_COPY (Dst, Src);
-  FreePool (BootDevBuf);
-  BootDevBuf = NULL;
+    Src = BootDevBuf;
+    --Dst;
+    STR_COPY (Dst, Src);
+    FreePool (BootDevBuf);
+    BootDevBuf = NULL;
+  }
 
   Src = UsbSerialCmdLine;
   --Dst;