From: 陈金泉 <chenjq@rock-chips.com>
Date: Tue, 30 Aug 2011 09:27:58 +0000 (+0800)
Subject: 解决kernel logo占用空间过大问题,需使用新tool实现kernel logo替换。
X-Git-Tag: firefly_0821_release~9767^2~78
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c68e9a8580a75fcd590f8209d1d63beb53f0e196;p=firefly-linux-kernel-4.4.55.git

解决kernel logo占用空间过大问题,需使用新tool实现kernel logo替换。
---

diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
index d38bbe16b930..b5beb5bc5eb5 100755
--- a/scripts/pnmtologo.c
+++ b/scripts/pnmtologo.c
@@ -40,8 +40,6 @@ static const char *logo_types[LINUX_LOGO_GRAY256+1] = {
 };
 
 #define MAX_LINUX_LOGO_COLORS	224
-#define MAX_LINUX_LOGO_WIDTH  1280
-#define MAX_LINUX_LOGO_HEIGHT 800
 
 struct color {
     unsigned char red;
@@ -393,6 +391,11 @@ static void write_logo_clut224(void)
 	/* write file header */
 	write_header();
 
+	write_hex((unsigned char)(logo_width >> 8));
+	write_hex((unsigned char)logo_width);
+	write_hex((unsigned char)(logo_height >> 8));
+	write_hex((unsigned char)logo_height);
+
 	for (i = 0; i < sizeof(data_name); i++){
 		write_hex(data_name[i]);
 	}
@@ -410,26 +413,6 @@ static void write_logo_clut224(void)
 			write_hex(k+32);
 		}
 
-	if (logo_height < MAX_LINUX_LOGO_HEIGHT ||  logo_width < MAX_LINUX_LOGO_WIDTH) {
-		if (logo_height == MAX_LINUX_LOGO_HEIGHT) {
-			for (i = 0; i < MAX_LINUX_LOGO_HEIGHT; i++)
-				for (j = logo_width; j < MAX_LINUX_LOGO_WIDTH; j++)
-					write_hex(32);
-		} else if (logo_width == MAX_LINUX_LOGO_WIDTH) {
-			for (i = logo_height; i < MAX_LINUX_LOGO_HEIGHT; i++)
-				for (j = 0; j < MAX_LINUX_LOGO_WIDTH; j++)
-					write_hex(32);
-		} else {
-			for (i = logo_height; i < MAX_LINUX_LOGO_HEIGHT; i++)
-				for (j = 0; j < MAX_LINUX_LOGO_WIDTH; j++)
-					write_hex(32);
-
-			for (i = 0; i < logo_height; i++)
-				for (j = logo_width; j < MAX_LINUX_LOGO_WIDTH; j++)
-					write_hex(32);
-		}
-	}
-
 	fputs("\n};\n\n", out);
 
 	/* write logo clut */
@@ -449,6 +432,11 @@ static void write_logo_clut224(void)
 		write_hex(logo_clut[i].blue);
 	}
 
+	for (i = logo_clutsize; i < (MAX_LINUX_LOGO_COLORS * 3); i++)
+	{
+		write_hex(32);
+	}
+
 	/* write logo structure and file footer */
 	write_footer();
 }