commit b835c237e221ba9c2d279b5db3ebdd68c2abc11a
author Linux Build Service Account <lnxbuild@localhost> Wed Jun 25 19:26:45 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 25 19:26:45 2014 -0700
tree cefb7f01de97f0c935017ad58d388883907a649e
parent 960046421ebc710063f336d13c377eb81c3e7507
parent 6b3a9984fa397351f9c0ae696a50997046d5412e

Merge "platform: msm8994: Add support for hs400 mode"

app/aboot/aboot.c

diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index fc6bf34..13c1a3a 100755
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -102,6 +102,7 @@
 #define MAX_PANEL_BUF_SIZE 128
 
 #define UBI_MAGIC      "UBI#"
+#define DISPLAY_DEFAULT_PREFIX "mdss_mdp"
 #define UBI_MAGIC_SIZE 0x04
 #define BOOT_DEV_MAX_LEN  64
 
@@ -311,7 +312,8 @@
 			break;
 	}
 
-	if (target_display_panel_node(device.display_panel,
+	if ((strstr(cmdline, DISPLAY_DEFAULT_PREFIX) == NULL) &&
+		target_display_panel_node(device.display_panel,
 		display_panel_buf, MAX_PANEL_BUF_SIZE) &&
 		strlen(display_panel_buf)) {
 		cmdline_len += strlen(display_panel_buf);