commit 4f8a1b56f91ef173d9755884012f7ade70e895f3
author Linux Build Service Account <lnxbuild@localhost> Fri Oct 02 16:38:55 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Oct 02 16:38:55 2015 -0700
tree 95bac8d7503283701817d9b3aef8d50a83fd85df
parent e245ca04b85d0fba2af5a0e4e64673656707cb23
parent c33416f386dec830552796c5e03200cd8e2a8e1f

Merge "app: aboot: allow LK logo image to have size lesser than FB"

app/aboot/aboot.c

diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index a20bb86..f21d9b4 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -3218,8 +3218,8 @@
 			return 0;
 		}
 
-		if ((header->width != fb_display->width) || (header->height != fb_display->height)) {
-			dprintf(CRITICAL, "Logo config doesn't match with fb config. Fall back default logo\n");
+		if ((header->width > fb_display->width) || (header->height > fb_display->height)) {
+			dprintf(CRITICAL, "Logo config greater than fb config. Fall back default logo\n");
 			return -1;
 		}
 
@@ -3305,8 +3305,8 @@
 			fbcon_extract_to_screen(header, (base + LOGO_IMG_HEADER_SIZE));
 		} else { /* 2 Raw BGR data */
 
-			if ((header->width != fb_display->width) || (header->height != fb_display->height)) {
-				dprintf(CRITICAL, "Logo config doesn't match with fb config. Fall back default logo\n");
+			if ((header->width > fb_display->width) || (header->height > fb_display->height)) {
+				dprintf(CRITICAL, "Logo config greater than fb config. Fall back default logo\n");
 				return -1;
 			}