Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f1fdc42e5efb9e3b6d0dd3b605d0848d3ca8a039

Authored by Wolfgang Denk
2 parents 05022629a2 be129aa718
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Merge branch 'master' of git://git.denx.de/u-boot-video

Showing 1 changed file Side-by-side Diff

drivers/video/cfb_console.c
Diff comments   View file @ f1fdc42
... ... @@ -260,7 +260,7 @@
260 260 #define CURSOR_ON
261 261 #define CURSOR_OFF
262 262 #define CURSOR_SET video_set_hw_cursor(console_col * VIDEO_FONT_WIDTH, \
263   - (console_row * VIDEO_FONT_HEIGHT) + VIDEO_LOGO_HEIGHT);
  263 + (console_row * VIDEO_FONT_HEIGHT) + video_logo_height);
264 264 #endif /* CONFIG_VIDEO_HW_CURSOR */
265 265  
266 266 #ifdef CONFIG_VIDEO_LOGO
... ... @@ -298,7 +298,7 @@
298 298 #define VIDEO_BURST_LEN (VIDEO_COLS/8)
299 299  
300 300 #ifdef CONFIG_VIDEO_LOGO
301   -#define CONSOLE_ROWS ((VIDEO_ROWS - VIDEO_LOGO_HEIGHT) / VIDEO_FONT_HEIGHT)
  301 +#define CONSOLE_ROWS ((VIDEO_ROWS - video_logo_height) / VIDEO_FONT_HEIGHT)
302 302 #else
303 303 #define CONSOLE_ROWS (VIDEO_ROWS / VIDEO_FONT_HEIGHT)
304 304 #endif
... ... @@ -349,6 +349,8 @@
349 349 static void *video_fb_address; /* frame buffer address */
350 350 static void *video_console_address; /* console buffer start address */
351 351  
  352 +static int video_logo_height = VIDEO_LOGO_HEIGHT;
  353 +
352 354 static int console_col = 0; /* cursor col */
353 355 static int console_row = 0; /* cursor row */
354 356  
... ... @@ -527,7 +529,7 @@
527 529  
528 530 static void video_putchar (int xx, int yy, unsigned char c)
529 531 {
530   - video_drawchars (xx, yy + VIDEO_LOGO_HEIGHT, &c, 1);
  532 + video_drawchars (xx, yy + video_logo_height, &c, 1);
531 533 }
532 534  
533 535 /*****************************************************************************/
534 536  
535 537  
... ... @@ -620,11 +622,11 @@
620 622 #ifdef VIDEO_HW_BITBLT
621 623 video_hw_bitblt (VIDEO_PIXEL_SIZE, /* bytes per pixel */
622 624 0, /* source pos x */
623   - VIDEO_LOGO_HEIGHT + VIDEO_FONT_HEIGHT, /* source pos y */
  625 + video_logo_height + VIDEO_FONT_HEIGHT, /* source pos y */
624 626 0, /* dest pos x */
625   - VIDEO_LOGO_HEIGHT, /* dest pos y */
  627 + video_logo_height, /* dest pos y */
626 628 VIDEO_VISIBLE_COLS, /* frame width */
627   - VIDEO_VISIBLE_ROWS - VIDEO_LOGO_HEIGHT - VIDEO_FONT_HEIGHT /* frame height */
  629 + VIDEO_VISIBLE_ROWS - video_logo_height - VIDEO_FONT_HEIGHT /* frame height */
628 630 );
629 631 #else
630 632 memcpyl (CONSOLE_ROW_FIRST, CONSOLE_ROW_SECOND,
... ... @@ -1101,7 +1103,7 @@
1101 1103  
1102 1104 int xcount, i;
1103 1105 int skip = (width - VIDEO_LOGO_WIDTH) * VIDEO_PIXEL_SIZE;
1104   - int ycount = VIDEO_LOGO_HEIGHT;
  1106 + int ycount = video_logo_height;
1105 1107 unsigned char r, g, b, *logo_red, *logo_blue, *logo_green;
1106 1108 unsigned char *source;
1107 1109 unsigned char *dest = (unsigned char *)screen +
... ... @@ -1225,6 +1227,7 @@
1225 1227 #endif /* CONFIG_SPLASH_SCREEN_ALIGN */
1226 1228  
1227 1229 if (video_display_bitmap (addr, x, y) == 0) {
  1230 + video_logo_height = 0;
1228 1231 return ((void *) (video_fb_address));
1229 1232 }
1230 1233 }
... ... @@ -1249,7 +1252,7 @@
1249 1252  
1250 1253 #ifdef CONFIG_CONSOLE_EXTRA_INFO
1251 1254 {
1252   - int i, n = ((VIDEO_LOGO_HEIGHT - VIDEO_FONT_HEIGHT) / VIDEO_FONT_HEIGHT);
  1255 + int i, n = ((video_logo_height - VIDEO_FONT_HEIGHT) / VIDEO_FONT_HEIGHT);
1253 1256  
1254 1257 for (i = 1; i < n; i++) {
1255 1258 video_get_info_str (i, info);
... ... @@ -1278,7 +1281,7 @@
1278 1281 }
1279 1282 #endif
1280 1283  
1281   - return (video_fb_address + VIDEO_LOGO_HEIGHT * VIDEO_LINE_LEN);
  1284 + return (video_fb_address + video_logo_height * VIDEO_LINE_LEN);
1282 1285 }
1283 1286 #endif
1284 1287