-----Original Message----- From: Simon Glass sjg@chromium.org Sent: 2022年1月23日 22:04 To: U-Boot Mailing List u-boot@lists.denx.de Cc: Anatolij Gustschin agust@denx.de; Jagan Teki jagan@amarulasolutions.com; Andre Przywara andre.przywara@arm.com; Simon Glass sjg@chromium.org; Andy Shevchenko andriy.shevchenko@linux.intel.com; Aswath Govindraju a-govindraju@ti.com; Aymen Sghaier aymen.sghaier@nxp.com; Bin Meng bmeng.cn@gmail.com; Dario Binacchi dariobin@libero.it; Fabio Estevam festevam@gmail.com; Heiko Schocher hs@denx.de; Heinrich Schuchardt xypron.glpk@gmx.de; Jaehoon Chung jh80.chung@samsung.com; Jason Liu jason.hui.liu@nxp.com; Joel Peshkin joel.peshkin@broadcom.com; Kory Maincent kory.maincent@bootlin.com; Marek Vasut marex@denx.de; Michal Simek michal.simek@xilinx.com; dl-uboot-imx uboot-imx@nxp.com; Ovidiu Panait ovidiu.panait@windriver.com; Peng Fan peng.fan@nxp.com; Rasmus Villemoes rasmus.villemoes@prevas.dk; samuel.egli@siemens.com; Stefan Bosch stefan_b@posteo.net; Stefan Roese sr@denx.de; Stefano Babic sbabic@denx.de Subject: [PATCH 07/14] video: Drop references to CONFIG_VIDEO et al
Drop the Kconfigs which are not used and all references to them. In
particular,
this drops CONFIG_VIDEO to avoid confusion and allow us to eventually rename CONFIG_DM_VIDEO to CONFIG_VIDEO.
Also drop the prototype for video_get_info_str() which is no-longer used.
Signed-off-by: Simon Glass sjg@chromium.org
README | 3 - arch/arm/include/asm/mach-imx/mx5_video.h | 5 -- .../mach-nexell/include/mach/display_dev.h | 2 +- board/freescale/mx51evk/Makefile | 1 - board/freescale/mx53loco/Makefile | 1 - board/kosagi/novena/novena_spl.c | 23 -------- cmd/Kconfig | 2 +- cmd/bdinfo.c | 2 +- cmd/bmp.c | 4 +- common/fdt_support.c | 2 +- common/stdio.c | 3 +- drivers/video/Kconfig | 56 +------------------ drivers/video/nexell_display.c | 3 +- include/asm-generic/global_data.h | 2 +- include/configs/pxm2.h | 7 --- include/configs/rut.h | 9 --- lib/efi_loader/Kconfig | 1 - 17 files changed, 10 insertions(+), 116 deletions(-)
For the imx51/53 board. Acked-by: Jason Liu jason.hui.liu@nxp.com
diff --git a/README b/README index 816d9c4dfb2..40ef21df3b5 100644 --- a/README +++ b/README @@ -1013,9 +1013,6 @@ The following options need to be configured: support, and should also define these other macros:
CONFIG_SYS_DIU_ADDR
CONFIG_VIDEOCONFIG_VIDEO_SW_CURSORCONFIG_VGA_AS_SINGLE_DEVICEThe DIU driver will look for the 'video-mode' environment variable, and if defined, enable the DIU as a console during
diff --git
a/arch/arm/include/asm/mach-imx/mx5_video.h b/arch/arm/include/asm/mach-imx/mx5_video.h index dc6aa00c894..b55c0fe8971 100644 --- a/arch/arm/include/asm/mach-imx/mx5_video.h +++ b/arch/arm/include/asm/mach-imx/mx5_video.h @@ -6,12 +6,7 @@ #ifndef __MX5_VIDEO_H #define __MX5_VIDEO_H
-#ifdef CONFIG_VIDEO -void lcd_enable(void); -void setup_iomux_lcd(void); -#else static inline void lcd_enable(void) { } static inline void
setup_iomux_lcd(void)
{ } -#endif
#endif diff --git a/arch/arm/mach-nexell/include/mach/display_dev.h b/arch/arm/mach-nexell/include/mach/display_dev.h index ffa45518d99..39b28ca1299 100644 --- a/arch/arm/mach-nexell/include/mach/display_dev.h +++ b/arch/arm/mach-nexell/include/mach/display_dev.h @@ -8,7 +8,7 @@ #ifndef _NX__DISPLAY_DEV_H_ #define _NX__DISPLAY_DEV_H_
-#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO +#if defined CONFIG_DM_VIDEO #elif defined CONFIG_LCD #include <lcd.h> #endif diff --git a/board/freescale/mx51evk/Makefile b/board/freescale/mx51evk/Makefile index 1a9581cabf9..808e35015e8 100644 --- a/board/freescale/mx51evk/Makefile +++ b/board/freescale/mx51evk/Makefile @@ -5,4 +5,3 @@ # (C) Copyright 2009 Freescale Semiconductor, Inc.
obj-y += mx51evk.o -obj-$(CONFIG_VIDEO) += mx51evk_video.o diff --git a/board/freescale/mx53loco/Makefile b/board/freescale/mx53loco/Makefile index d2ebd94dca1..9befe426957 100644 --- a/board/freescale/mx53loco/Makefile +++ b/board/freescale/mx53loco/Makefile @@ -4,4 +4,3 @@ # Jason Liu r64343@freescale.com
obj-y += mx53loco.o -obj-$(CONFIG_VIDEO) += mx53loco_video.o diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c index 3d22f2019e9..24c0fb22268 100644 --- a/board/kosagi/novena/novena_spl.c +++ b/board/kosagi/novena/novena_spl.c @@ -379,30 +379,7 @@ static void novena_spl_setup_iomux_uart(void) imx_iomux_v3_setup_multiple_pads(uart4_pads, ARRAY_SIZE(uart4_pads)); }
-/*
- Video
- */
-#ifdef CONFIG_VIDEO -static iomux_v3_cfg_t hdmi_pads[] = {
- /* "Ghost HPD" pin */
- MX6_PAD_EIM_A24__GPIO5_IO04 | MUX_PAD_CTRL(NO_PAD_CTRL),
- /* LCD_PWR_CTL */
- MX6_PAD_CSI0_DAT10__GPIO5_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL),
- /* LCD_BL_ON */
- MX6_PAD_KEY_ROW4__GPIO4_IO15 | MUX_PAD_CTRL(NO_PAD_CTRL),
- /* GPIO_PWM1 */
- MX6_PAD_DISP0_DAT8__GPIO4_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-static void novena_spl_setup_iomux_video(void) -{
- imx_iomux_v3_setup_multiple_pads(hdmi_pads,
ARRAY_SIZE(hdmi_pads));
- gpio_direction_input(NOVENA_HDMI_GHOST_HPD);
-} -#else static inline void novena_spl_setup_iomux_video(void) {} -#endif
/*
- SPL boots from uSDHC card
diff --git a/cmd/Kconfig b/cmd/Kconfig index 84ede90eee9..02eb2c69aed 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1748,7 +1748,7 @@ config CMD_CONITRACE
config CMD_CLS bool "Enable clear screen command 'cls'"
- depends on CFB_CONSOLE || DM_VIDEO || LCD || VIDEO
- depends on DM_VIDEO || LCD || VIDEO default y if LCD help Enable the 'cls' command which clears the screen contents diff
--git
a/cmd/bdinfo.c b/cmd/bdinfo.c index c56b3f4f6ec..37cd8a57ebd 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -117,7 +117,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int
argc,
char *const argv[]) bdinfo_print_num_l("fdt_size", (ulong)gd->fdt_size); if (IS_ENABLED(CONFIG_DM_VIDEO)) show_video_info(); -#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) +#if defined(CONFIG_LCD) bdinfo_print_num_l("FB base ", gd->fb_base); #endif #if CONFIG_IS_ENABLED(MULTI_DTB_FIT) diff --git a/cmd/bmp.c b/cmd/bmp.c index 071ba90b435..45f4c1296de 100644 --- a/cmd/bmp.c +++ b/cmd/bmp.c @@ -268,10 +268,8 @@ int bmp_display(ulong addr, int x, int y) } #elif defined(CONFIG_LCD) ret = lcd_display_bitmap(addr, x, y); -#elif defined(CONFIG_VIDEO)
- ret = video_display_bitmap(addr, x, y);
#else -# error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO +# error bmp_display() requires CONFIG_LCD #endif
if (bmp_alloc_addr) diff --git a/common/fdt_support.c b/common/fdt_support.c index daa24d4c10b..867d74e0c0c 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -1720,7 +1720,7 @@ int fdt_set_status_by_pathf(void *fdt, enum fdt_status status, const char *fmt, return fdt_set_node_status(fdt, offset, status); }
-#if defined(CONFIG_VIDEO) || defined(CONFIG_LCD) +#if defined(CONFIG_LCD) int fdt_add_edid(void *blob, const char *compat, unsigned char *edid_buf) { int noff; diff --git a/common/stdio.c b/common/stdio.c index aedaea14ec5..e20427c6fbd 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -367,8 +367,7 @@ int stdio_add_devices(void) } else { if (IS_ENABLED(CONFIG_LCD)) drv_lcd_init();
if (IS_ENABLED(CONFIG_VIDEO) ||IS_ENABLED(CONFIG_VIDEO_VCXK))
if (IS_ENABLED(CONFIG_VIDEO_VCXK)) drv_video_init();diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index c2465121a72..51570310533 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -691,39 +691,9 @@ config VIDEO model. Video drivers typically provide a colour text console and cursor.
-config VGA_AS_SINGLE_DEVICE
- bool "Set the video as an output-only device"
- depends on CFB_CONSOLE
- default y
- help
If enable the framebuffer device will be initialized as anoutput-only device. The Keyboard driver will not be set up. Thismay be used if you have no keyboard device, or more than one(USB Keyboard, AT Keyboard).-config VIDEO_SW_CURSOR
- bool "Enable a software cursor"
- depends on CFB_CONSOLE
- default y if CFB_CONSOLE
- help
This draws a cursor after the last character. No blinking isprovided. This makes it possible to see the current cursorposition when entering text on the console. It is recommended toenable this.-config CONSOLE_EXTRA_INFO
- bool "Display additional board information"
- depends on CFB_CONSOLE
- help
Display additional board information strings that normally go tothe serial port. When this option is enabled, a board-specificfunction video_get_info_str() is called to get the string foreach line of the display. The function should return the string,which can be empty if there is nothing to display for that line.config CONSOLE_SCROLL_LINES int "Number of lines to scroll the console by"
- depends on CFB_CONSOLE || DM_VIDEO || LCD
- depends on DM_VIDEO || LCD default 1 help When the console need to be scrolled, this is the number of @@
-731,28 +701,6 @@ config CONSOLE_SCROLL_LINES console jump but can help speed up operation when scrolling is slow.
-config SYS_CONSOLE_BG_COL
- hex "Background colour"
- depends on CFB_CONSOLE
- default 0x00
- help
Defines the background colour for the console. The value is from0x00 to 0xff and the meaning depends on the graphics card.Typically, 0x00 means black and 0xff means white. Do not setthe background and foreground to the same colour or you will seenothing.-config SYS_CONSOLE_FG_COL
- hex "Foreground colour"
- depends on CFB_CONSOLE
- default 0xa0
- help
Defines the foreground colour for the console. The value is from0x00 to 0xff and the meaning depends on the graphics card.Typically, 0x00 means black and 0xff means white. Do not setthe background and foreground to the same colour or you will seenothing.config LCD bool "Enable legacy LCD support" help @@ -938,7 +886,7 @@ config VIDEO_BMP_GZIP
config VIDEO_BMP_RLE8 bool "Run length encoded BMP image (RLE8) support"
- depends on DM_VIDEO || CFB_CONSOLE
- depends on DM_VIDEO help If this option is set, the 8-bit RLE compressed BMP images is supported.
diff --git a/drivers/video/nexell_display.c
b/drivers/video/nexell_display.c index
0a9cea680fd..2179e413300 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -598,8 +598,7 @@ static int nx_display_probe(struct udevice *dev)
/* * set environment variable "fb_addr" (frame buffer address),
required
* for splash image. Because drv_video_init() in common/stdio.c is
only
* called when CONFIG_VIDEO is set (and not if CONFIG_DM_VIDEO isset).
* for splash image, which is not set if CONFIG_DM_VIDEO is
enabled).
*/sprintf(addr, "0x%x", dp->fb_addr); debug("%s(): env_set("fb_addr", %s) ...\n", __func__, addr); diff
--git
a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 104282bd479..78986b5bee0 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -66,7 +66,7 @@ struct global_data { * @mem_clk: memory clock rate in Hz */ unsigned long mem_clk; -#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) +#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) /** * @fb_base: base address of frame buffer memory */ diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 6cd7929db30..7272470d12e 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -74,11 +74,4 @@ #endif #endif /* CONFIG_SPL_BUILD */
-#if defined(CONFIG_VIDEO) -#define CONFIG_VIDEO_DA8XX -#define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE -#define PWM_TICKS 0x1388 -#define PWM_DUTY 0x200 -#endif
#endif /* ! __CONFIG_PXM2_H */ diff --git a/include/configs/rut.h b/include/configs/rut.h index 410c6d379c3..b30b12af52c 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -67,13 +67,4 @@
#endif /* CONFIG_SPL_BUILD */
-#if defined(CONFIG_VIDEO) -#define CONFIG_VIDEO_DA8XX -#define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE
-#define BOARD_LCD_RESET 115 /* Bank 3 pin 19 */ -#define CONFIG_FORMIKE -#define DISPL_PLL_SPREAD_SPECTRUM -#endif
#endif /* ! __CONFIG_RUT_H */ diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 24f9a2bb757..2876acce066 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -18,7 +18,6 @@ config EFI_LOADER select PARTITION_UUIDS select HAVE_BLOCK_DEVICE select REGEX
- imply CFB_CONSOLE_ANSI imply FAT imply FAT_WRITE imply USB_KEYBOARD_FN_KEYS
-- 2.35.0.rc0.227.g00780c9af4-goog