app: aboot: Remove UFS_SUPPORT dependency for android.bootdevice inclusion in command line
For android.bootdevice to be included in kernel command line UFS_SUPPORT needs to defined.
On targets that support EMMC the ufs drivers may not be needed and hence this dependency
needs to be removed as android.bootdevice needs to be present to boot on emmc device also.
Change-Id: I8246c1e4666f3e3e4558b82d8032a9a2df9f1d03
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 529bf2b..f3b63b7 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -127,7 +127,7 @@
#define ADD_OF(a, b) (UINT_MAX - b > a) ? (a + b) : UINT_MAX
-#if UFS_SUPPORT || USE_BOOTDEV_CMDLINE
+#if USE_BOOTDEV_CMDLINE
static const char *emmc_cmdline = " androidboot.bootdevice=";
#else
static const char *emmc_cmdline = " androidboot.emmc=true";
@@ -250,7 +250,7 @@
}
if (target_is_emmc_boot()) {
cmdline_len += strlen(emmc_cmdline);
-#if UFS_SUPPORT || USE_BOOTDEV_CMDLINE
+#if USE_BOOTDEV_CMDLINE
boot_dev_buf = (char *) malloc(sizeof(char) * BOOT_DEV_MAX_LEN);
ASSERT(boot_dev_buf);
platform_boot_dev_cmdline(boot_dev_buf);
@@ -365,7 +365,7 @@
if (have_cmdline) --dst;
have_cmdline = 1;
while ((*dst++ = *src++));
-#if UFS_SUPPORT || USE_BOOTDEV_CMDLINE
+#if USE_BOOTDEV_CMDLINE
src = boot_dev_buf;
if (have_cmdline) --dst;
while ((*dst++ = *src++));