commit c33416f386dec830552796c5e03200cd8e2a8e1f
author Veera Sundaram Sankaran <veeras@codeaurora.org> Mon Sep 28 10:25:55 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 30 12:15:42 2015 -0700
tree 2fe0deaaeb9ccf1149ee1da018a0c80f1f37b140
parent c3f9ae9d99b00d59125767f8846766b0d4719a9d

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

Currently, in bootloader we allow only splash image which is of the
same size as FB. Fix it to allow all sizes lesser than FB.

Change-Id: Ied2dce3d2104bf8dceb8fc98d15f1cc1a32aa547

app/aboot/aboot.c

diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 4911344..9acde54 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -3199,8 +3199,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;
 		}
 
@@ -3286,8 +3286,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;
 			}