Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit a4206575c8e0108faed0383c08b743b50e5562f5

Authored by Simon Glass
Committed by Tom Rini
1 parent 1e1a0fb23d
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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-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_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-n7.1.2_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, v2017.01-smarct3x, v2017.01-smarct3x-emmc

video: Drop CONFIG_VIDEO_HW_CURSOR 

This is not used in U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 4 changed files with 1 additions and 116 deletions Side-by-side Diff

drivers/video/cfb_console.c
Diff comments   View file @ a420657
... ... @@ -63,14 +63,6 @@
63 63 * character. No blinking is provided.
64 64 * Uses the macros CURSOR_SET and
65 65 * CURSOR_OFF.
66   - *
67   - * CONFIG_VIDEO_HW_CURSOR: - Uses the hardware cursor capability
68   - * of the graphic chip. Uses the macro
69   - * CURSOR_SET. ATTENTION: If booting an
70   - * OS, the display driver must disable
71   - * the hardware register of the graphic
72   - * chip. Otherwise a blinking field is
73   - * displayed.
74 66 */
75 67  
76 68 #include <common.h>
77 69  
... ... @@ -154,13 +146,8 @@
154 146 * CONFIG_VIDEO_SW_CURSOR: Draws a cursor after the last character. No
155 147 * blinking is provided. Uses the macros CURSOR_SET
156 148 * and CURSOR_OFF.
157   - * CONFIG_VIDEO_HW_CURSOR: Uses the hardware cursor capability of the
158   - * graphic chip. Uses the macro CURSOR_SET.
159   - * ATTENTION: If booting an OS, the display driver
160   - * must disable the hardware register of the graphic
161   - * chip. Otherwise a blinking field is displayed
162 149 */
163   -#if !defined(CONFIG_VIDEO_SW_CURSOR) && !defined(CONFIG_VIDEO_HW_CURSOR)
  150 +#if !defined(CONFIG_VIDEO_SW_CURSOR)
164 151 /* no Cursor defined */
165 152 #define CURSOR_ON
166 153 #define CURSOR_OFF
... ... @@ -168,10 +155,6 @@
168 155 #endif
169 156  
170 157 #if defined(CONFIG_VIDEO_SW_CURSOR)
171   -#if defined(CONFIG_VIDEO_HW_CURSOR)
172   -#error only one of CONFIG_VIDEO_SW_CURSOR or CONFIG_VIDEO_HW_CURSOR can be \
173   - defined
174   -#endif
175 158 void console_cursor(int state);
176 159  
177 160 #define CURSOR_ON console_cursor(1)
... ... @@ -179,17 +162,6 @@
179 162 #define CURSOR_SET video_set_cursor()
180 163 #endif /* CONFIG_VIDEO_SW_CURSOR */
181 164  
182   -#ifdef CONFIG_VIDEO_HW_CURSOR
183   -#ifdef CURSOR_ON
184   -#error only one of CONFIG_VIDEO_SW_CURSOR or CONFIG_VIDEO_HW_CURSOR can be \
185   - defined
186   -#endif
187   -#define CURSOR_ON
188   -#define CURSOR_OFF
189   -#define CURSOR_SET video_set_hw_cursor(console_col * VIDEO_FONT_WIDTH, \
190   - (console_row * VIDEO_FONT_HEIGHT) + video_logo_height)
191   -#endif /* CONFIG_VIDEO_HW_CURSOR */
192   -
193 165 #ifdef CONFIG_VIDEO_LOGO
194 166 #ifdef CONFIG_VIDEO_BMP_LOGO
195 167 #include <bmp_logo.h>
... ... @@ -2056,9 +2028,6 @@
2056 2028 return -1;
2057 2029  
2058 2030 video_fb_address = (void *) VIDEO_FB_ADRS;
2059   -#ifdef CONFIG_VIDEO_HW_CURSOR
2060   - video_init_hw_cursor(VIDEO_FONT_WIDTH, VIDEO_FONT_HEIGHT);
2061   -#endif
2062 2031  
2063 2032 cfb_do_flush_cache = cfb_fb_is_in_dram() && dcache_status();
2064 2033  
drivers/video/ct69000.c
Diff comments   View file @ a420657
... ... @@ -804,85 +804,6 @@
804 804  
805 805 #endif
806 806  
807   -#ifdef CONFIG_VIDEO_HW_CURSOR
808   -/***************************************************************
809   - * Set Hardware Cursor in Pixel
810   - */
811   -void
812   -video_set_hw_cursor (int x, int y)
813   -{
814   - int sig_x = 0, sig_y = 0;
815   - if (x < 0) {
816   - x *= -1;
817   - sig_x = 1;
818   - }
819   - if (y < 0) {
820   - y *= -1;
821   - sig_y = 1;
822   - }
823   - ctWrite_i (CT_XR_O, 0xa4, x & 0xff);
824   - ctWrite_i (CT_XR_O, 0xa5, (x >> 8) & 0x7);
825   - ctWrite_i (CT_XR_O, 0xa6, y & 0xff);
826   - ctWrite_i (CT_XR_O, 0xa7, (y >> 8) & 0x7);
827   -}
828   -
829   -/***************************************************************
830   - * Init Hardware Cursor. To know the size of the Cursor,
831   - * we have to know the Font size.
832   - */
833   -void
834   -video_init_hw_cursor (int font_width, int font_height)
835   -{
836   - unsigned char xr_80;
837   - unsigned long *curs, pattern;
838   - int i;
839   - int cursor_start;
840   - GraphicDevice *pGD = (GraphicDevice *) & ctfb;
841   -
842   - cursor_start = pGD->dprBase;
843   - xr_80 = ctRead_i (CT_XR_O, 0x80);
844   - /* set start address */
845   - ctWrite_i (CT_XR_O, 0xa2, (cursor_start >> 8) & 0xf0);
846   - ctWrite_i (CT_XR_O, 0xa3, (cursor_start >> 16) & 0x3f);
847   - /* set cursor shape */
848   - curs = (unsigned long *) cursor_start;
849   - i = 0;
850   - while (i < 0x400) {
851   - curs[i++] = 0xffffffff; /* AND mask */
852   - curs[i++] = 0xffffffff; /* AND mask */
853   - curs[i++] = 0; /* XOR mask */
854   - curs[i++] = 0; /* XOR mask */
855   - /* Transparent */
856   - }
857   - pattern = 0xffffffff >> font_width;
858   - i = 0;
859   - while (i < (font_height * 2)) {
860   - curs[i++] = pattern; /* AND mask */
861   - curs[i++] = pattern; /* AND mask */
862   - curs[i++] = 0; /* XOR mask */
863   - curs[i++] = 0; /* XOR mask */
864   - /* Cursor Color 0 */
865   - }
866   - /* set blink rate */
867   - ctWrite_i (CT_FP_O, 0x19, 0xf);
868   -
869   - /* set cursors colors */
870   - xr_80 = ctRead_i (CT_XR_O, 0x80);
871   - xr_80 |= 0x1; /* alternate palette select */
872   - ctWrite_i (CT_XR_O, 0x80, xr_80);
873   - video_set_lut(4, CONFIG_SYS_CONSOLE_FG_COL, CONFIG_SYS_CONSOLE_FG_COL,
874   - CONFIG_SYS_CONSOLE_FG_COL);
875   - /* position 4 is color 0 cursor 0 */
876   - xr_80 &= 0xfe; /* normal palette select */
877   - ctWrite_i (CT_XR_O, 0x80, xr_80);
878   - /* cursor enable */
879   - ctWrite_i (CT_XR_O, 0xa0, 0x91);
880   - xr_80 |= 0x10; /* enable hwcursor */
881   - ctWrite_i (CT_XR_O, 0x80, xr_80);
882   - video_set_hw_cursor (0, 0);
883   -}
884   -#endif /* CONFIG_VIDEO_HW_CURSOR */
885   -
886 807 /***************************************************************
887 808 * Wait for BitBlt ready
888 809 */
... ... @@ -88,10 +88,6 @@
88 88 unsigned char g, /* green */
89 89 unsigned char b /* blue */
90 90 );
91   -#ifdef CONFIG_VIDEO_HW_CURSOR
92   -void video_set_hw_cursor(int x, int y); /* x y in pixel */
93   -void video_init_hw_cursor(int font_width, int font_height);
94   -#endif
95 91  
96 92 #endif /*_VIDEO_FB_H_ */
scripts/config_whitelist.txt
Diff comments   View file @ a420657
... ... @@ -8260,7 +8260,6 @@
8260 8260 CONFIG_VIDEO_DA8XX
8261 8261 CONFIG_VIDEO_DT_SIMPLEFB
8262 8262 CONFIG_VIDEO_FONT_4X6
8263   -CONFIG_VIDEO_HW_CURSOR
8264 8263 CONFIG_VIDEO_IPUV3
8265 8264 CONFIG_VIDEO_LCD_I2C_BUS
8266 8265 CONFIG_VIDEO_LOGO