video: Drop old CFB code
Subsystems (8)
cover video: Drop old CFB code
There is still quite a bit of cruft in the video subsystem. Mainly this is users of the now-removed CONFIG_VIDEO, cfb_console and CONFIG_LCD.
This series removes most of the first two. The exception is videomodes.c and its header, since these are used by sunxi. It looks like the code could be removed, but I did not attempt it.
This is left for the sunxi maintainer.
The LCD clean-up can come later. Once done, we can rename CONFIG_DM_VIDEO to CONFIG_VIDEO, thus completing the migration.
Simon Glass (14):
video: Drop cfg_console
video: nokia_rx51: Drop obsolete video code
video: siemens: Drop unused video code
video: nexell: Drop unused and invalid code
video: Drop video_fb header
video: Drop CONFIG_VIDEO_BMP_LOGO
video: Drop references to CONFIG_VIDEO et al
video: Clean up the uclass header
video: Drop da8xx-fb
video: fsl: colibri_vf: Drop FSL DCU driver
video: Drop FSL DIU driver
video: mxs: Drop old video code
video: Convert CONFIG_VIDEO_BCM2835 to Kconfig
video: Drop formike driver
README | 18 - arch/arm/cpu/armv7/ls102xa/soc.c | 4 - arch/arm/include/asm/arch-ls102xa/config.h | 1 - arch/arm/include/asm/mach-imx/mx5_video.h | 5 - .../mach-nexell/include/mach/display_dev.h | 7 +- board/aristainetos/aristainetos.c | 1 - board/freescale/common/Makefile | 4 - board/freescale/common/dcu_sii9022a.c | 248 --- board/freescale/common/dcu_sii9022a.h | 12 - board/freescale/common/diu_ch7301.c | 217 -- board/freescale/common/diu_ch7301.h | 12 - board/freescale/ls1021aiot/Makefile | 1 - board/freescale/ls1021aiot/dcu.c | 48 - board/freescale/ls1021aqds/Makefile | 1 - board/freescale/ls1021aqds/dcu.c | 110 - board/freescale/ls1021atwr/Makefile | 1 - board/freescale/ls1021atwr/dcu.c | 48 - board/freescale/mx51evk/Makefile | 1 - board/freescale/mx53loco/Makefile | 1 - board/freescale/t104xrdb/Makefile | 1 - board/freescale/t104xrdb/diu.c | 84 - board/kosagi/novena/novena_spl.c | 23 - board/nokia/rx51/rx51.c | 19 - board/siemens/common/board.c | 3 - board/siemens/common/factoryset.c | 7 - board/siemens/common/factoryset.h | 3 - board/siemens/pxm2/board.c | 189 -- board/siemens/rut/board.c | 247 --- board/socrates/socrates.c | 1 - board/toradex/colibri_vf/Makefile | 1 - board/toradex/colibri_vf/colibri_vf.c | 62 - board/toradex/colibri_vf/dcu.c | 38 - cmd/Kconfig | 2 +- cmd/bdinfo.c | 2 +- cmd/bmp.c | 4 +- cmd/cls.c | 2 - common/fdt_support.c | 2 +- common/stdio.c | 4 +- configs/colibri_vf_defconfig | 1 - configs/nokia_rx51_defconfig | 3 - configs/rpi_0_w_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_b_plus_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_4_32b_defconfig | 1 + configs/rpi_4_defconfig | 1 + configs/rpi_arm64_defconfig | 1 + configs/rpi_defconfig | 1 + doc/usage/bootmenu.rst | 5 - drivers/pci/pci_rom.c | 1 - drivers/video/Kconfig | 129 +- drivers/video/Makefile | 5 - drivers/video/cfb_console.c | 1865 ----------------- drivers/video/da8xx-fb.c | 1048 --------- drivers/video/da8xx-fb.h | 115 - drivers/video/formike.c | 513 ----- drivers/video/fsl_dcu_fb.c | 549 ----- drivers/video/fsl_diu_fb.c | 416 ---- drivers/video/imx/mxc_ipuv3_fb.c | 1 - drivers/video/mxsfb.c | 90 - drivers/video/nexell_display.c | 18 +- drivers/video/omap3_dss.c | 29 - drivers/video/sunxi/sunxi_display.c | 1 - include/asm-generic/global_data.h | 2 +- include/configs/T102xRDB.h | 13 - include/configs/T104xRDB.h | 20 - include/configs/apalis_imx6.h | 1 - include/configs/aristainetos2.h | 1 - include/configs/cm_fx6.h | 2 - include/configs/colibri-imx6ull.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_imx7.h | 4 - include/configs/colibri_vf.h | 8 - include/configs/embestmx6boards.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/imx6-engicam.h | 2 - include/configs/imxrt1050-evk.h | 2 - include/configs/ls1021aqds.h | 12 - include/configs/ls1021atwr.h | 15 - include/configs/mx6cuboxi.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mx7dsabresd.h | 4 - include/configs/nokia_rx51.h | 11 - include/configs/opos6uldev.h | 1 - include/configs/pico-imx6.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/pico-imx7d.h | 4 - include/configs/pxm2.h | 8 - include/configs/rpi.h | 1 - include/configs/rut.h | 10 - include/configs/wandboard.h | 1 - include/fsl_dcu_fb.h | 22 - include/fsl_diu_fb.h | 14 - include/video.h | 84 +- include/video_fb.h | 91 - lib/efi_loader/Kconfig | 1 - scripts/config_whitelist.txt | 10 - 100 files changed, 33 insertions(+), 6553 deletions(-) delete mode 100644 board/freescale/common/dcu_sii9022a.c delete mode 100644 board/freescale/common/dcu_sii9022a.h delete mode 100644 board/freescale/common/diu_ch7301.c delete mode 100644 board/freescale/common/diu_ch7301.h delete mode 100644 board/freescale/ls1021aiot/dcu.c delete mode 100644 board/freescale/ls1021aqds/dcu.c delete mode 100644 board/freescale/ls1021atwr/dcu.c delete mode 100644 board/freescale/t104xrdb/diu.c delete mode 100644 board/toradex/colibri_vf/dcu.c delete mode 100644 drivers/video/cfb_console.c delete mode 100644 drivers/video/da8xx-fb.c delete mode 100644 drivers/video/da8xx-fb.h delete mode 100644 drivers/video/formike.c delete mode 100644 drivers/video/fsl_dcu_fb.c delete mode 100644 drivers/video/fsl_diu_fb.c delete mode 100644 include/fsl_dcu_fb.h delete mode 100644 include/fsl_diu_fb.h delete mode 100644 include/video_fb.h
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 1/14 video: Drop cfg_console
The non-driver model video support was removed two years ago. Drop this driver, which is only used by nokia_rx51.
---
README | 1 - cmd/cls.c | 2 - common/stdio.c | 1 - configs/nokia_rx51_defconfig | 2 - doc/usage/bootmenu.rst | 5 - drivers/video/Kconfig | 50 - drivers/video/Makefile | 1 - drivers/video/cfb_console.c | 1865 ---------------------------------- drivers/video/omap3_dss.c | 28 - 9 files changed, 1955 deletions(-) delete mode 100644 drivers/video/cfb_console.c
README +0 -1
@@ -1014,7 +1014,6 @@ The following options need to be configured: CONFIG_SYS_DIU_ADDR CONFIG_VIDEO - CONFIG_CFB_CONSOLE CONFIG_VIDEO_SW_CURSOR CONFIG_VGA_AS_SINGLE_DEVICE CONFIG_VIDEO_BMP_LOGO
cmd/cls.c +0 -2
@@ -22,8 +22,6 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc,if (video_clear (dev))return CMD_RET_FAILURE ; -#elif defined(CONFIG_CFB_CONSOLE ) -video_clear ();#elif defined(CONFIG_LCD )lcd_clear ();#else
common/stdio.c +0 -1
@@ -368,7 +368,6 @@ int stdio_add_devices(void)if (IS_ENABLED (CONFIG_LCD ))drv_lcd_init ();if (IS_ENABLED (CONFIG_VIDEO ) || -IS_ENABLED (CONFIG_CFB_CONSOLE ) ||IS_ENABLED (CONFIG_VIDEO_VCXK ))drv_video_init (); }
configs/nokia_rx51_defconfig +0 -2
@@ -76,8 +76,6 @@ CONFIG_SPI=y CONFIG_USB=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -CONFIG_CFB_CONSOLE=y -CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set CONFIG_SPLASH_SCREEN=y CONFIG_WATCHDOG_TIMEOUT_MSECS=31000
doc/usage/bootmenu.rst +0 -5
@@ -88,8 +88,3 @@ To run the bootmenu at startup add these additional settings:: CONFIG_AUTOBOOT_KEYED=y CONFIG_BOOTDELAY=30 CONFIG_AUTOBOOT_MENU_SHOW=y - -When you intend to use the bootmenu on a color frame buffer console, -make sure to additionally define:: - - CONFIG_CFB_CONSOLE_ANSI=y
drivers/video/Kconfig +0 -50
56 lines not on this page · raw message
drivers/video/Makefile +0 -1
@@ -30,7 +30,6 @@ obj-y += ti/ obj-$(CONFIG_ATMEL_HLCD) += atmel_hlcdfb.o obj-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o -obj-$(CONFIG_CFB_CONSOLE) += cfb_console.o obj-$(CONFIG_FORMIKE) += formike.o obj-$(CONFIG_FSL_DIU_FB) += fsl_diu_fb.o videomodes.o obj-$(CONFIG_IHS_VIDEO_OUT) += ihs_video_out.o
drivers/video/cfb_console.c deleted +0 -1865
1,865 lines not on this page · raw message
drivers/video/omap3_dss.c +0 -28
@@ -137,31 +137,3 @@ void omap3_dss_enable(void) l |=LCD_ENABLE |GO_LCD |DIG_ENABLE |GO_DIG |GP_OUT0 |GP_OUT1 ;writel (l, &dispc->control); } - -#ifdef CONFIG_CFB_CONSOLE -int __board_video_init (void ) -{ -return -1 ; -} - -int board_video_init (void ) - __attribute__((weak,alias ("__board_video_init" ))); - -void *video_hw_init (void ) -{ -static GraphicDevice dssfb; -GraphicDevice *pGD = &dssfb; -struct dispc_regs *dispc = (struct dispc_regs *)OMAP3_DISPC_BASE ; - -if (board_video_init () || !readl (&dispc->gfx_ba0)) -return NULL ; - - pGD->winSizeX = (readl (&dispc->size_lcd) &0x7FF ) +1 ; - pGD->winSizeY = ((readl (&dispc->size_lcd) >>16 ) &0x7FF ) +1 ; - pGD->gdfBytesPP =4 ; - pGD->gdfIndex =GDF_32BIT_X888RGB ; - pGD->frameAdrs =readl (&dispc->gfx_ba0); - -return pGD; -} -#endif
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 2/14 video: nokia_rx51: Drop obsolete video code
In reply to Simon GlassDrop this code which uses a header that is about to be deleted.
---
board/nokia/rx51/rx51.c | 19 ------------------- configs/nokia_rx51_defconfig | 1 - include/configs/nokia_rx51.h | 11 ----------- 3 files changed, 31 deletions(-)
board/nokia/rx51/rx51.c +0 -19
@@ -30,7 +30,6 @@#include <malloc.h> #include <twl4030.h> #include <i2c.h> -#include <video_fb.h> #include <asm/global_data.h> #include <asm/io.h> #include <asm/setup.h>
@@ -61,8 +60,6 @@ struct emu_hal_params_rx51 {DECLARE_GLOBAL_DATA_PTR ; -GraphicDevice gdev; -const omap3_sysinfo sysinfo = {DDR_STACKED ,"Nokia RX-51" ,
@@ -341,22 +338,6 @@ void setup_board_tags(struct tag **in_params) *in_params = params; } -/* -* Routine: video_hw_init -* Description: Set up the GraphicDevice depending on sys_boot. -*/ -void *video_hw_init (void ) -{ -/* fill in Graphic Device */ - gdev.frameAdrs =0x8f9c0000 ; - gdev.winSizeX =800 ; - gdev.winSizeY =480 ; - gdev.gdfBytesPP =2 ; - gdev.gdfIndex =GDF_16BIT_565RGB ; -memset ((void *)gdev.frameAdrs,0 ,0xbb800 ); -return (void *) &gdev; -} -/* * Routine: twl4030_regulator_set_mode * Description: Set twl4030 regulator mode over i2c powerbus.
configs/nokia_rx51_defconfig +0 -1
@@ -76,7 +76,6 @@ CONFIG_SPI=y CONFIG_USB=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -# CONFIG_VGA_AS_SINGLE_DEVICE is not set CONFIG_SPLASH_SCREEN=y CONFIG_WATCHDOG_TIMEOUT_MSECS=31000 CONFIG_WDT=y
include/configs/nokia_rx51.h +0 -11
@@ -70,17 +70,6 @@#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -/* -* Framebuffer -*/ -/* Video console */ -#define VIDEO_FB_16BPP_PIXEL_SWAP -#define VIDEO_FB_16BPP_WORD_SWAP - -/* functions for cfb_console */ -#define VIDEO_KBD_INIT_FCT rx51_kp_init() -#define VIDEO_TSTC_FCT rx51_kp_tstc -#define VIDEO_GETC_FCT rx51_kp_getc#ifndef __ASSEMBLY__struct stdio_dev ;int rx51_kp_init (void );
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
Re: [PATCH 02/14] video: nokia_rx51: Drop obsolete video code
+ Maemo
Quoted 1 line · On Sunday 23 January 2022 07:04:03 Simon Glass wrote:
Drop this code which uses a header that is about to be deleted.
And what / where is the replacement?
Quoted 89 lines
Signed-off-by Simon Glass <[email protected]>---
board/nokia/rx51/rx51.c | 19 ------------------- configs/nokia_rx51_defconfig | 1 - include/configs/nokia_rx51.h | 11 ----------- 3 files changed, 31 deletions(-)board/nokia/rx51/rx51.c +0
-19@@ -30,7 +30,6 @@#include <malloc.h> #include <twl4030.h> #include <i2c.h> -#include <video_fb.h> #include <asm/global_data.h> #include <asm/io.h> #include <asm/setup.h> @@ -61,8 +60,6 @@ struct emu_hal_params_rx51 {DECLARE_GLOBAL_DATA_PTR ; -GraphicDevice gdev; -const omap3_sysinfo sysinfo = {DDR_STACKED ,"Nokia RX-51" ,@@ -341,22 +338,6 @@ void setup_board_tags(struct tag **in_params) *in_params = params; } -/* -* Routine: video_hw_init -* Description: Set up the GraphicDevice depending on sys_boot. -*/ -void *video_hw_init (void ) -{ -/* fill in Graphic Device */ - gdev.frameAdrs =0x8f9c0000 ; - gdev.winSizeX =800 ; - gdev.winSizeY =480 ; - gdev.gdfBytesPP =2 ; - gdev.gdfIndex =GDF_16BIT_565RGB ; -memset ((void *)gdev.frameAdrs,0 ,0xbb800 ); -return (void *) &gdev; -} -/* * Routine: twl4030_regulator_set_mode * Description: Set twl4030 regulator mode over i2c powerbus. configs/nokia_rx51_defconfig +0
-1@@ -76,7 +76,6 @@ CONFIG_SPI=y CONFIG_USB=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -# CONFIG_VGA_AS_SINGLE_DEVICE is not set CONFIG_SPLASH_SCREEN=y CONFIG_WATCHDOG_TIMEOUT_MSECS=31000 CONFIG_WDT=yinclude/configs/nokia_rx51.h +0
-11@@ -70,17 +70,6 @@#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -/* -* Framebuffer -*/ -/* Video console */ -#define VIDEO_FB_16BPP_PIXEL_SWAP -#define VIDEO_FB_16BPP_WORD_SWAP - -/* functions for cfb_console */ -#define VIDEO_KBD_INIT_FCT rx51_kp_init() -#define VIDEO_TSTC_FCT rx51_kp_tstc -#define VIDEO_GETC_FCT rx51_kp_getc#ifndef __ASSEMBLY__struct stdio_dev ;int rx51_kp_init (void );Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
Re: [PATCH 02/14] video: nokia_rx51: Drop obsolete video code
Hi Pali,
Quoted 7 lines · Pali Rohár
+ Maemo
Quoted 1 line · On Sunday 23 January 2022 07:04:03 Simon Glass wrote:
Drop this code which uses a header that is about to be deleted.
And what / where is the replacement?
This is DM_VIDEO. There are quite a few example drivers in drivers/video - perhaps the mxsfb.c one is a reasonable example. See the top of video_uclass.c for how frame-buffer allocation works.
Regards,
Simon
Re: [PATCH 02/14] video: nokia_rx51: Drop obsolete video code
Quoted 6 lines · On Sunday 23 January 2022 07:36:22 Simon Glass wrote:
Hi Pali,
Quoted 3 lines · Pali Rohár
+ Maemo
Quoted 8 lines
Quoted 4 lines · On Sunday 23 January 2022 07:04:03 Simon Glass wrote:
Quoted 1 line
Drop this code which uses a header that is about to be deleted.
And what / where is the replacement?
This is
DM_VIDEO. There are quite a few example drivers indrivers/video- perhaps themxsfb.cone is a reasonable example. See the top ofvideo_uclass.cfor how frame-buffer allocation works.
I have already WIP patches for usage of video-uclass.c but because reviewing of N900 patches is slow, I have not sent them yet.
So could you please do NOT remove N900 support? I would really appreciative for reviewing pending patches instead of sending patches with board removal.
Note that there is some issue with video_post_bind(), it throws false-positive error "Video device '%s' cannot allocate frame buffer memory" with "return -ENOSPC". If I remove that "return -ENOSPC" it is working fine.
Re: [PATCH 02/14] video: nokia_rx51: Drop obsolete video code
Hi Pali,
Quoted 11 lines · Pali Rohár
Quoted 9 lines · On Sunday 23 January 2022 07:36:22 Simon Glass wrote:
Hi Pali,
Quoted 6 lines · Pali Rohár
+ Maemo
Quoted 1 line · On Sunday 23 January 2022 07:04:03 Simon Glass wrote:
Drop this code which uses a header that is about to be deleted.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
And what / where is the replacement?
This is
DM_VIDEO. There are quite a few example drivers indrivers/video- perhaps themxsfb.cone is a reasonable example. See the top ofvideo_uclass.cfor how frame-buffer allocation works.I have already WIP patches for usage of
video-uclass.cbut because reviewing of N900 patches is slow, I have not sent them yet.
Who is reviewing them? If you send the patches I can review them and we can get them applied for this release.
Quoted 4 lines
So could you please do NOT remove N900 support? I would really appreciative for reviewing pending patches instead of sending patches with board removal.
This is not a board removal, just dropping a feature.
Quoted 5 lines
Note that there is some issue with
video_post_bind(), it throws false-positive error "Video device '%s' cannot allocate frame buffer memory" with "return-ENOSPC". If I remove that "return-ENOSPC" it is working fine.
Do you need U-Boot to allocate the frame buffer. If so, this is likely because your driver is not bound before relocation. See the comment around that message in the code.
Regards,
Simon
Re: [PATCH 02/14] video: nokia_rx51: Drop obsolete video code
Hello!
Quoted 16 lines · On Sunday 23 January 2022 08:54:24 Simon Glass wrote:
Hi Pali,
Quoted 13 lines · Pali Rohár
Quoted 11 lines · On Sunday 23 January 2022 07:36:22 Simon Glass wrote:
Hi Pali,
Quoted 7 lines · Pali Rohár
+ Maemo
Quoted 1 line · On Sunday 23 January 2022 07:04:03 Simon Glass wrote:
Drop this code which uses a header that is about to be deleted.
And what / where is the replacement?
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
This is
DM_VIDEO. There are quite a few example drivers indrivers/video- perhaps themxsfb.cone is a reasonable example. See the top ofvideo_uclass.cfor how frame-buffer allocation works.I have already WIP patches for usage of
video-uclass.cbut because reviewing of N900 patches is slow, I have not sent them yet.Who is reviewing them?
Lokesh is reviewing omap3 and n900 patches.
Quoted 2 lines
If you send the patches I can review them and
we can get them applied for this release.
I have already wrote in other thread I do not want to send too many patches if I see that review process is slow. And also because I totally lost the track what was send, what was not and what depends on what. And I do not want to work on too many things in paralel if I see that it took half year or more to make patches in acceptable form.
Quoted 6 lines
Quoted 4 lines
So could you please do NOT remove N900 support? I would really appreciative for reviewing pending patches instead of sending patches with board removal.
This is not a board removal, just dropping a feature.
... feature which is essential and without which board is unusable.
Quoted 6 lines
Quoted 5 lines
Note that there is some issue with
video_post_bind(), it throws false-positive error "Video device '%s' cannot allocate frame buffer memory" with "return-ENOSPC". If I remove that "return-ENOSPC" it is working fine.
Quoted 6 lines
Do you need U-Boot to allocate the frame buffer. If so, this is likely because your driver is not bound before relocation. See the comment around that message in the code.
Regards,
Simon
I did not spend too much time for investigation. I just saw that removing that comment and returning makes it fully working.
Re: [PATCH 02/14] video: nokia_rx51: Drop obsolete video code
Hi Pali,
Quoted 59 lines · Pali Rohár
Hello!
Quoted 16 lines · On Sunday 23 January 2022 08:54:24 Simon Glass wrote:
Hi Pali,
Quoted 13 lines · Pali Rohár
Quoted 11 lines · On Sunday 23 January 2022 07:36:22 Simon Glass wrote:
Hi Pali,
Quoted 7 lines · Pali Rohár
+ Maemo
Quoted 1 line · On Sunday 23 January 2022 07:04:03 Simon Glass wrote:
Drop this code which uses a header that is about to be deleted.
And what / where is the replacement?
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
This is
DM_VIDEO. There are quite a few example drivers indrivers/video- perhaps themxsfb.cone is a reasonable example. See the top ofvideo_uclass.cfor how frame-buffer allocation works.I have already WIP patches for usage of
video-uclass.cbut because reviewing of N900 patches is slow, I have not sent them yet.Who is reviewing them?
Lokesh is reviewing omap3 and n900 patches.
Quoted 2 lines
If you send the patches I can review them and
we can get them applied for this release.I have already wrote in other thread I do not want to send too many patches if I see that review process is slow. And also because I totally lost the track what was send, what was not and what depends on what. And I do not want to work on too many things in paralel if I see that it took half year or more to make patches in acceptable form.
Quoted 6 lines
Quoted 4 lines
So could you please do NOT remove N900 support? I would really appreciative for reviewing pending patches instead of sending patches with board removal.
This is not a board removal, just dropping a feature.
... feature which is essential and without which board is unusable.
Quoted 10 lines
Quoted 5 lines
Note that there is some issue with
video_post_bind(), it throws false-positive error "Video device '%s' cannot allocate frame buffer memory" with "return-ENOSPC". If I remove that "return-ENOSPC" it is working fine.Do you need U-Boot to allocate the frame buffer. If so, this is likely because your driver is not bound before relocation. See the comment around that message in the code.
Quoted 5 lines
Quoted 2 lines
Regards,
SimonI did not spend too much time for investigation. I just saw that removing that comment and returning makes it fully working.
Sure, but it is indicating a bug, so needs to be figured out. If you read the top of video-uclass.c you can probably see what is going on.
Regards,
Simon
PATCH 3/14 video: siemens: Drop unused video code
In reply to Simon GlassDrop this old code which is not built anymore, as it depends on CONFIG_VIDEO which has been removed.
---
board/siemens/common/board.c | 3 - board/siemens/common/factoryset.c | 7 - board/siemens/common/factoryset.h | 3 - board/siemens/pxm2/board.c | 189 ----------------------- board/siemens/rut/board.c | 247 ------------------------------ 5 files changed, 449 deletions(-)
board/siemens/common/board.c +0 -3
@@ -96,9 +96,6 @@ int board_init(void)#ifdef CONFIG_NAND_CS_INIT board_nand_cs_init ();#endif -#ifdef CONFIG_VIDEO -board_video_init (); -#endif return 0 ; }
board/siemens/common/factoryset.c +0 -7
@@ -275,13 +275,6 @@ int factoryset_read_eeprom(int i2c_addr) }printf ("DFU USB: VID = 0x%4x, PID = 0x%4x\n" , factory_dat.usb_vendor_id, factory_dat.usb_product_id); -#endif -#if defined(CONFIG_VIDEO ) -if (0 <=get_factory_record_val (cp, size, (uchar *)"DISP1" , - (uchar *)"name" , factory_dat.disp_name, -MAX_STRING_LENGTH )) { -debug ("display name: %s\n" , factory_dat.disp_name); - }#endif if (0 <= get_factory_record_val(cp, size, (uchar *)"DEV", (uchar *)"num", factory_dat.serial,
board/siemens/common/factoryset.h +0 -3
@@ -17,9 +17,6 @@ struct factorysetcontainer {int usb_vendor_id;int usb_product_id;int pxm50; -#if defined(CONFIG_VIDEO ) -unsigned char disp_name[MAX_STRING_LENGTH ]; -#endif unsigned char serial[MAX_STRING_LENGTH ];int version;uchar asn[MAX_STRING_LENGTH ];
board/siemens/pxm2/board.c +0 -189
201 lines not on this page · raw message
board/siemens/rut/board.c +0 -247
259 lines not on this page · raw message
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 4/14 video: nexell: Drop unused and invalid code
In reply to Simon GlassUnfortunately this driver uses the old video structure to store things. This is not supported with driver model.
Drop the old code and comment out the other pieces, so the maintainer can take a look.
---
arch/arm/mach-nexell/include/mach/display_dev.h | 4 ++-- drivers/video/nexell_display.c | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-)
arch/arm/mach-nexell/include/mach/display_dev.h +2 -2
@@ -15,8 +15,8 @@#endif struct nx_display_dev { -#if definedCONFIG_VIDEO || definedCONFIG_DM_VIDEO -GraphicDevice graphic_device; +#if definedCONFIG_DM_VIDEO +/* GraphicDevice graphic_device; -- not defined anymore */ #elif definedCONFIG_LCD vidinfo_t *panel_info;#endif
drivers/video/nexell_display.c +3 -11
@@ -537,7 +537,6 @@ static int nx_display_probe(struct udevice *dev)struct video_uc_plat *uc_plat =dev_get_uclass_plat (dev);struct video_priv *uc_priv =dev_get_uclass_priv (dev);struct nx_display_plat *plat =dev_get_plat (dev); -static GraphicDevice *graphic_device;char addr[64 ];debug ("%s()\n" , __func__);
@@ -564,7 +563,7 @@ static int nx_display_probe(struct udevice *dev) }struct nx_display_dev *dp; -unsigned int pp_index =0 ; +/* unsigned int pp_index = 0; */ dp =nx_display_setup ();if (!dp) {
@@ -574,6 +573,7 @@ static int nx_display_probe(struct udevice *dev) }switch (dp->depth) { +#if 0 /* GDF_16BIT_565RGB is not defined in video.h */ case 2 : pp_index =GDF_16BIT_565RGB ; uc_priv->bpix =VIDEO_BPP16 ;
@@ -586,6 +586,7 @@ static int nx_display_probe(struct udevice *dev) pp_index =GDF_32BIT_X888RGB ; uc_priv->bpix =VIDEO_BPP32 ;break ; +#endif default :printf ("fail : not support LCD bit per pixel %d\n" , dp->depth *8 );
@@ -596,15 +597,6 @@ static int nx_display_probe(struct udevice *dev) uc_priv->ysize = dp->fb_plane->height; uc_priv->rot =0 ; - graphic_device = &dp->graphic_device; - graphic_device->frameAdrs = dp->fb_addr; - graphic_device->gdfIndex = pp_index; - graphic_device->gdfBytesPP = dp->depth; - graphic_device->winSizeX = dp->fb_plane->width; - graphic_device->winSizeY = dp->fb_plane->height; - graphic_device->plnSizeX = - graphic_device->winSizeX * graphic_device->gdfBytesPP; -/* * set environment variable "fb_addr" (frame buffer address), required * for splash image. Because drv_video_init() in common/stdio.c is only
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
Re: [PATCH 04/14] video: nexell: Drop unused and invalid code
Hi Simon,
please find below the patch of your patch 04/14 (diff after applying your hole patch-series and my changes).
arch/arm/mach-nexell/include/mach/display_dev.h +2 -5
@@ -8,15 +8,12 @@ #ifndef _NX__DISPLAY_DEV_H_ #define _NX__DISPLAY_DEV_H_ -#if defined CONFIG_DM_VIDEO -#elif defined CONFIG_LCD +#if !defined(CONFIG_DM_VIDEO) && defined(CONFIG_LCD) #include <lcd.h> #endif struct nx_display_dev { -#if defined CONFIG_DM_VIDEO - /* GraphicDevice graphic_device; -- not defined anymore */ -#elif defined CONFIG_LCD +#if !defined(CONFIG_DM_VIDEO) && defined(CONFIG_LCD) vidinfo_t *panel_info; #endif unsigned long base;
drivers/video/nexell_display.c +0 -5
@@ -562,7 +562,6 @@ static int nx_display_probe(struct udevice *dev) }struct nx_display_dev *dp; -/* unsigned int pp_index = 0; */ dp =nx_display_setup ();if (!dp) {
@@ -572,9 +571,7 @@ static int nx_display_probe(struct udevice *dev) }switch (dp->depth) { -#if 0 /* GDF_16BIT_565RGB is not defined in video.h */ case 2 : - pp_index =GDF_16BIT_565RGB ; uc_priv->bpix =VIDEO_BPP16 ;break ;case 3 :
@@ -582,10 +579,8 @@ static int nx_display_probe(struct udevice *dev)* type video_log2_bpp */ case 4 : - pp_index =GDF_32BIT_X888RGB ; uc_priv->bpix =VIDEO_BPP32 ;break ; -#endif default :printf ("fail : not support LCD bit per pixel %d\n" , dp->depth *8 );
Regards
Stefan
Quoted 81 lines · Simon Glass
Unfortunately this driver uses the old video structure to store things. This is not supported with driver model.
Drop the old code and comment out the other pieces, so the maintainer can take a look.
Signed-off-by Simon Glass <[email protected]>---
arch/arm/mach-nexell/include/mach/display_dev.h | 4 ++-- drivers/video/nexell_display.c | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-)arch/arm/mach-nexell/include/mach/display_dev.h +2
-2@@ -15,8 +15,8 @@#endif struct nx_display_dev { -#if definedCONFIG_VIDEO || definedCONFIG_DM_VIDEO -GraphicDevice graphic_device; +#if definedCONFIG_DM_VIDEO +/* GraphicDevice graphic_device; -- not defined anymore */ #elif definedCONFIG_LCD vidinfo_t *panel_info;#endif drivers/video/nexell_display.c +3
-11@@ -537,7 +537,6 @@ static int nx_display_probe(struct udevice *dev)struct video_uc_plat *uc_plat =dev_get_uclass_plat (dev);struct video_priv *uc_priv =dev_get_uclass_priv (dev);struct nx_display_plat *plat =dev_get_plat (dev); -static GraphicDevice *graphic_device;char addr[64 ];debug ("%s()\n" , __func__);@@ -564,7 +563,7 @@ static int nx_display_probe(struct udevice *dev) }struct nx_display_dev *dp; -unsigned int pp_index =0 ; +/* unsigned int pp_index = 0; */ dp =nx_display_setup ();if (!dp) {@@ -574,6 +573,7 @@ static int nx_display_probe(struct udevice *dev) }switch (dp->depth) { +#if 0 /* GDF_16BIT_565RGB is not defined in video.h */ case 2 : pp_index =GDF_16BIT_565RGB ; uc_priv->bpix =VIDEO_BPP16 ;@@ -586,6 +586,7 @@ static int nx_display_probe(struct udevice *dev) pp_index =GDF_32BIT_X888RGB ; uc_priv->bpix =VIDEO_BPP32 ;break ; +#endif default :printf ("fail : not support LCD bit per pixel %d\n" , dp->depth *8 );@@ -596,15 +597,6 @@ static int nx_display_probe(struct udevice *dev) uc_priv->ysize = dp->fb_plane->height; uc_priv->rot =0 ; - graphic_device = &dp->graphic_device; - graphic_device->frameAdrs = dp->fb_addr; - graphic_device->gdfIndex = pp_index; - graphic_device->gdfBytesPP = dp->depth; - graphic_device->winSizeX = dp->fb_plane->width; - graphic_device->winSizeY = dp->fb_plane->height; - graphic_device->plnSizeX = - graphic_device->winSizeX * graphic_device->gdfBytesPP; -/* * set environment variable "fb_addr" (frame buffer address), required * for splash image. Because drv_video_init() in common/stdio.c is only
Re: [PATCH 04/14] video: nexell: Drop unused and invalid code
Hi Stefan,
Quoted 7 lines · Stefan Bosch
Hi Simon,
please find below the patch of your patch 04/14 (diff after applying your hole patch-series and my changes).
OK, let's see where this all goes. Once it is applied it will be clearer.
Regards,
Simon
PATCH 5/14 video: Drop video_fb header
In reply to Simon GlassThis is not used now. Drop it.
---
.../mach-nexell/include/mach/display_dev.h | 1 - board/aristainetos/aristainetos.c | 1 - board/freescale/t104xrdb/diu.c | 1 - board/socrates/socrates.c | 1 - drivers/pci/pci_rom.c | 1 - drivers/video/da8xx-fb.c | 1 - drivers/video/fsl_dcu_fb.c | 1 - drivers/video/fsl_diu_fb.c | 1 - drivers/video/imx/mxc_ipuv3_fb.c | 1 - drivers/video/mxsfb.c | 1 - drivers/video/nexell_display.c | 1 - drivers/video/omap3_dss.c | 1 - drivers/video/sunxi/sunxi_display.c | 1 - include/video_fb.h | 91 ------------------- 14 files changed, 104 deletions(-) delete mode 100644 include/video_fb.h
arch/arm/mach-nexell/include/mach/display_dev.h +0 -1
@@ -9,7 +9,6 @@#define _NX__DISPLAY_DEV_H_#if definedCONFIG_VIDEO || definedCONFIG_DM_VIDEO -#include <video_fb.h> #elif definedCONFIG_LCD #include <lcd.h> #endif
board/aristainetos/aristainetos.c +0 -1
@@ -39,7 +39,6 @@#include <power/regulator.h> #include <power/da9063_pmic.h> #include <splash.h> -#include <video_fb.h> DECLARE_GLOBAL_DATA_PTR ;
board/freescale/t104xrdb/diu.c +0 -1
@@ -10,7 +10,6 @@#include <command.h> #include <fsl_diu_fb.h> #include <linux/ctype.h> -#include <video_fb.h> #include "../common/diu_ch7301.h"
board/socrates/socrates.c +0 -1
@@ -26,7 +26,6 @@#include <fdt_support.h> #include <asm/io.h> #include <i2c.h> -#include <video_fb.h> #include "upm_table.h" DECLARE_GLOBAL_DATA_PTR ;
drivers/pci/pci_rom.c +0 -1
@@ -36,7 +36,6 @@#include <pci_rom.h> #include <vbe.h> #include <video.h> -#include <video_fb.h> #include <acpi/acpi_s3.h> #include <asm/global_data.h> #include <linux/screen_info.h>
drivers/video/da8xx-fb.c +0 -1
@@ -16,7 +16,6 @@#include <log.h> #include <malloc.h> #include <memalign.h> -#include <video_fb.h> #include <asm/global_data.h> #include <linux/delay.h> #include <linux/list.h>
drivers/video/fsl_dcu_fb.c +0 -1
@@ -17,7 +17,6 @@#include <linux/fb.h> #include <malloc.h> #include <video.h> -#include <video_fb.h> #include "videomodes.h" /* Convert the X,Y resolution pair into a single number */
drivers/video/fsl_diu_fb.c +0 -1
@@ -12,7 +12,6 @@#include <asm/io.h> #include "videomodes.h" -#include <video_fb.h> #include <fsl_diu_fb.h> #include <linux/list.h> #include <linux/fb.h>
drivers/video/imx/mxc_ipuv3_fb.c +0 -1
@@ -22,7 +22,6 @@#include <asm/io.h> #include <asm/mach-imx/video.h> #include <malloc.h> -#include <video_fb.h> #include "../videomodes.h" #include "ipu.h" #include "mxcfb.h"
drivers/video/mxsfb.c +0 -1
@@ -15,7 +15,6 @@#include <linux/errno.h> #include <malloc.h> #include <video.h> -#include <video_fb.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h>
drivers/video/nexell_display.c +0 -1
@@ -16,7 +16,6 @@#include <linux/compat.h> #include <linux/err.h> #include <video.h> /* For struct video_uc_plat */ -#include <video_fb.h> #include <lcd.h> #include <asm/global_data.h> #include <asm/io.h>
drivers/video/omap3_dss.c +0 -1
@@ -28,7 +28,6 @@#include <common.h> #include <asm/io.h> #include <asm/arch/dss.h> -#include <video_fb.h> /* Configure VENC for a given Mode (NTSC / PAL) */ void omap3_dss_venc_config(const struct venc_regs *venc_cfg,
drivers/video/sunxi/sunxi_display.c +0 -1
@@ -30,7 +30,6 @@#include <i2c.h> #include <malloc.h> #include <video.h> -#include <video_fb.h> #include <dm/uclass-internal.h> #include "../videomodes.h" #include "../anx9804.h"
include/video_fb.h deleted +0 -91
91 lines not on this page · raw message
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 6/14 video: Drop CONFIG_VIDEO_BMP_LOGO
In reply to Simon GlassThis option is not implemented anymore. Drop it.
---
README | 1 - include/configs/T102xRDB.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/aristainetos2.h | 1 - include/configs/cm_fx6.h | 2 -- include/configs/colibri-imx6ull.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_imx7.h | 4 ---- include/configs/colibri_vf.h | 1 - include/configs/embestmx6boards.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/imx6-engicam.h | 2 -- include/configs/imxrt1050-evk.h | 2 -- include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 2 -- include/configs/mx6cuboxi.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mx7dsabresd.h | 4 ---- include/configs/opos6uldev.h | 1 - include/configs/pico-imx6.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/pico-imx7d.h | 4 ---- include/configs/pxm2.h | 1 - include/configs/rut.h | 1 - include/configs/wandboard.h | 1 - scripts/config_whitelist.txt | 1 - 29 files changed, 43 deletions(-)
README +0 -1
@@ -1016,7 +1016,6 @@ The following options need to be configured: CONFIG_VIDEO CONFIG_VIDEO_SW_CURSOR CONFIG_VGA_AS_SINGLE_DEVICE - CONFIG_VIDEO_BMP_LOGO The DIU driver will look for the 'video-mode' environment variable, and if defined, enable the DIU as a console during
include/configs/T102xRDB.h +0 -1
@@ -372,7 +372,6 @@#undef CONFIG_FSL_DIU_FB/* RDB doesn't support DIU */ #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS /* * With CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS, flash I/O is really slow, so
include/configs/T104xRDB.h +0 -1
@@ -361,7 +361,6 @@#ifdef CONFIG_FSL_DIU_FB #define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) -#define CONFIG_VIDEO_BMP_LOGO #endif #endif
include/configs/apalis_imx6.h +0 -1
@@ -45,7 +45,6 @@#define CONFIG_USBD_HS /* Framebuffer and LCD */ -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
include/configs/aristainetos2.h +0 -1
@@ -443,7 +443,6 @@/* Framebuffer */ /* check this console not needed, after test remove it */ #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX6_PWM_PER_CLK 66000000
include/configs/cm_fx6.h +0 -2
@@ -176,8 +176,6 @@/* Display */ #define CONFIG_IMX_HDMI -#define CONFIG_VIDEO_BMP_LOGO -/* EEPROM */ #endif /* __CONFIG_CM_FX6_H */
include/configs/colibri-imx6ull.h +0 -1
@@ -164,7 +164,6 @@#if defined(CONFIG_DM_VIDEO )#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR -#define CONFIG_VIDEO_BMP_LOGO #endif #endif /* __COLIBRI_IMX6ULL_CONFIG_H */
include/configs/colibri_imx6.h +0 -1
@@ -35,7 +35,6 @@#define CONFIG_USBD_HS /* Framebuffer and LCD */ -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
include/configs/colibri_imx7.h +0 -4
@@ -196,8 +196,4 @@#define CONFIG_USBD_HS -#if defined(CONFIG_DM_VIDEO ) -#define CONFIG_VIDEO_BMP_LOGO -#endif -#endif
include/configs/colibri_vf.h +0 -1
@@ -15,7 +15,6 @@#include <linux/sizes.h> #ifdef CONFIG_VIDEO_FSL_DCU_FB -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_SYS_FSL_DCU_LE #define CONFIG_SYS_DCU_ADDR DCU0_BASE_ADDR
include/configs/embestmx6boards.h +0 -1
@@ -52,7 +52,6 @@#endif /* Framebuffer */ -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
include/configs/gw_ventana.h +0 -1
@@ -73,7 +73,6 @@/* Framebuffer and LCD */ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_HIDE_LOGO_VERSION /* Custom config to hide U-boot version */ /* Miscellaneous configurable options */
include/configs/imx6-engicam.h +0 -2
@@ -152,8 +152,6 @@/* Framebuffer */ #ifdef CONFIG_VIDEO_IPUV3 # define CONFIG_IMX_VIDEO_SKIP - -# define CONFIG_VIDEO_BMP_LOGO #endif /* SPL */
include/configs/imxrt1050-evk.h +0 -2
@@ -21,8 +21,6 @@ DMAMEM_SZ_ALL)#ifdef CONFIG_DM_VIDEO -#define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ "stdout=serial,vidconsole\0" \
include/configs/ls1021aqds.h +0 -2
@@ -307,8 +307,6 @@* Video */ #ifdef CONFIG_VIDEO_FSL_DCU_FB -#define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_I2C_DVI_BUS_NUM 0#define CONFIG_SYS_I2C_QIXIS_ADDR 0x66
include/configs/ls1021atwr.h +0 -2
@@ -198,8 +198,6 @@* Video */ #ifdef CONFIG_VIDEO_FSL_DCU_FB -#define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_FSL_DCU_SII9022A #define CONFIG_SYS_I2C_DVI_BUS_NUM 1#define CONFIG_SYS_I2C_DVI_ADDR 0x39
include/configs/mx6cuboxi.h +0 -1
@@ -25,7 +25,6 @@#endif /* Framebuffer */ -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
include/configs/mx6sabre_common.h +0 -1
@@ -153,7 +153,6 @@/* Environment organization */ /* Framebuffer */ -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
include/configs/mx6sxsabresd.h +0 -1
@@ -148,7 +148,6 @@#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_DM_VIDEO -#define CONFIG_VIDEO_BMP_LOGO #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR#endif #endif
include/configs/mx6ul_14x14_evk.h +0 -1
@@ -149,7 +149,6 @@#ifndef CONFIG_SPL_BUILD #if defined(CONFIG_DM_VIDEO ) -#define CONFIG_VIDEO_BMP_LOGO #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR#endif #endif
include/configs/mx7dsabresd.h +0 -4
@@ -122,8 +122,4 @@#define CONFIG_USBD_HS -#ifdef CONFIG_DM_VIDEO -#define CONFIG_VIDEO_BMP_LOGO -#endif -#endif /* __CONFIG_H */
include/configs/opos6uldev.h +0 -1
@@ -41,7 +41,6 @@/* LCD */ #ifndef CONFIG_SPL_BUILD #ifdef CONFIG_DM_VIDEO -#define CONFIG_VIDEO_BMP_LOGO #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR#endif #endif
include/configs/pico-imx6.h +0 -1
@@ -135,7 +135,6 @@#define CONFIG_FEC_MXC_PHYADDR 1/* Framebuffer */ -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
include/configs/pico-imx6ul.h +0 -1
@@ -130,7 +130,6 @@#define CONFIG_BOARD_SIZE_LIMIT 715776#ifdef CONFIG_DM_VIDEO -#define CONFIG_VIDEO_BMP_LOGO #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR#endif
include/configs/pico-imx7d.h +0 -4
@@ -119,10 +119,6 @@#define CONFIG_POWER_PFUZE3000 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 -#ifdef CONFIG_DM_VIDEO -#define CONFIG_VIDEO_BMP_LOGO -#endif -/* FLASH and environment organization */ /* Environment starts at 768k = 768 * 1024 = 786432 */
include/configs/pxm2.h +0 -1
@@ -76,7 +76,6 @@#if defined(CONFIG_VIDEO )#define CONFIG_VIDEO_DA8XX -#define CONFIG_VIDEO_BMP_LOGO #define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE#define PWM_TICKS 0x1388#define PWM_DUTY 0x200
include/configs/rut.h +0 -1
@@ -69,7 +69,6 @@#if defined(CONFIG_VIDEO )#define CONFIG_VIDEO_DA8XX -#define CONFIG_VIDEO_BMP_LOGO #define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE#define BOARD_LCD_RESET 115/* Bank 3 pin 19 */
include/configs/wandboard.h +0 -1
@@ -32,7 +32,6 @@#define CONFIG_MXC_USB_FLAGS 0/* Framebuffer */ -#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
scripts/config_whitelist.txt +0 -1
@@ -2118,7 +2118,6 @@ CONFIG_U_BOOT_HDR_SIZE CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM CONFIG_VIDEO_BCM2835 -CONFIG_VIDEO_BMP_LOGO CONFIG_VIDEO_DA8XX CONFIG_VSC7385_ENET CONFIG_VSC7385_IMAGE
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 7/14 video: Drop references to CONFIG_VIDEO et al
In reply to Simon GlassDrop 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.
---
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(-)
README +0 -3
@@ -1013,9 +1013,6 @@ The following options need to be configured: support, and should also define these other macros: CONFIG_SYS_DIU_ADDR - CONFIG_VIDEO - CONFIG_VIDEO_SW_CURSOR - CONFIG_VGA_AS_SINGLE_DEVICE The DIU driver will look for the 'video-mode' environment variable, and if defined, enable the DIU as a console during
arch/arm/include/asm/mach-imx/mx5_video.h +0 -5
@@ -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
arch/arm/mach-nexell/include/mach/display_dev.h +1 -1
@@ -8,7 +8,7 @@#ifndef _NX__DISPLAY_DEV_H_#define _NX__DISPLAY_DEV_H_ -#if definedCONFIG_VIDEO || definedCONFIG_DM_VIDEO +#if definedCONFIG_DM_VIDEO #elif definedCONFIG_LCD #include <lcd.h> #endif
board/freescale/mx51evk/Makefile +0 -1
@@ -5,4 +5,3 @@ # (C) Copyright 2009 Freescale Semiconductor, Inc. obj-y += mx51evk.o -obj-$(CONFIG_VIDEO) += mx51evk_video.o
board/freescale/mx53loco/Makefile +0 -1
@@ -4,4 +4,3 @@ # Jason Liu <[email protected]> obj-y += mx53loco.o -obj-$(CONFIG_VIDEO) += mx53loco_video.o
board/kosagi/novena/novena_spl.c +0 -23
@@ -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
cmd/Kconfig +1 -1
@@ -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
cmd/bdinfo.c +1 -1
@@ -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 )
cmd/bmp.c +1 -3
@@ -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)
common/fdt_support.c +1 -1
@@ -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;
common/stdio.c +1 -2
@@ -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 (); }
drivers/video/Kconfig +2 -54
76 lines not on this page · raw message
drivers/video/nexell_display.c +1 -2
@@ -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 is set). +* 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);
include/asm-generic/global_data.h +1 -1
@@ -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 */
include/configs/pxm2.h +0 -7
@@ -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 */
include/configs/rut.h +0 -9
@@ -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 */
lib/efi_loader/Kconfig +0 -1
@@ -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
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
RE: [PATCH 07/14] video: Drop references to CONFIG_VIDEO et al
Quoted 23 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: 2022年1月23日 22:04
To: U-Boot Mailing List <[email protected]>
Cc: Anatolij Gustschin <[email protected]>; Jagan Teki <[email protected]>; Andre Przywara <[email protected]>; Simon Glass <[email protected]>; Andy Shevchenko <[email protected]>; Aswath Govindraju <[email protected]>; Aymen Sghaier <[email protected]>; Bin Meng <[email protected]>; Dario Binacchi <[email protected]>; Fabio Estevam <[email protected]>; Heiko Schocher <[email protected]>; Heinrich Schuchardt <[email protected]>; Jaehoon Chung <[email protected]>; Jason Liu <[email protected]>; Joel Peshkin <[email protected]>; Kory Maincent <[email protected]>; Marek Vasut <[email protected]>; Michal Simek <[email protected]>; dl-uboot-imx <[email protected]>; Ovidiu Panait <[email protected]>; Peng Fan <[email protected]>; Rasmus Villemoes <[email protected]>; [email protected]; Stefan Bosch <[email protected]>; Stefan Roese <[email protected]>; Stefano Babic <[email protected]>
Subject: [PATCH 07/14] video: Drop references toCONFIG_VIDEOet al
Quoted 1 line
Drop the Kconfigs which are not used and all references to them. In
particular,
Quoted 18 lines
this drops
CONFIG_VIDEOto avoid confusion and allow us to eventually renameCONFIG_DM_VIDEOtoCONFIG_VIDEO.Also drop the prototype for
video_get_info_str()which is no-longer used.Signed-off-by Simon Glass <[email protected]>---
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 +-
Quoted 8 lines
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.
Quoted 6 lines
README +0
-0
README The following options need to be configured: · line 1018
Quoted 9 lines
README +0
-3@@ -1013,9 +1013,6 @@ The following options need to be configured: support, and should also define these other macros: CONFIG_SYS_DIU_ADDR - CONFIG_VIDEO - CONFIG_VIDEO_SW_CURSOR - CONFIG_VGA_AS_SINGLE_DEVICE The DIU driver will look for the 'video-mode' environment variable, and if defined, enable the DIU as a console during
diff --git
Quoted 6 lines
a/arch/arm/include/asm/mach-imx/mx5_video.hb/arch/arm/include/asm/mach-imx/mx5_video.h
indexdc6aa00c894..b55c0fe8971100644
arch/arm/include/asm/mach-imx/mx5_video.h line 9
Quoted 8 lines
arch/arm/include/asm/mach-imx/mx5_video.h +0
-4@@ -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)
Quoted 78 lines
{ } -#endif
#endif
arch/arm/mach-nexell/include/mach/display_dev.h +1
-1@@ -8,7 +8,7 @@#ifndef _NX__DISPLAY_DEV_H_#define _NX__DISPLAY_DEV_H_ -#if definedCONFIG_VIDEO || definedCONFIG_DM_VIDEO +#if definedCONFIG_DM_VIDEO #elif definedCONFIG_LCD #include <lcd.h> #endif board/freescale/mx51evk/Makefile +0
-1@@ -5,4 +5,3 @@ # (C) Copyright 2009 Freescale Semiconductor, Inc. obj-y += mx51evk.o -obj-$(CONFIG_VIDEO) += mx51evk_video.oboard/freescale/mx53loco/Makefile +0
-1@@ -4,4 +4,3 @@ # Jason Liu <[email protected]> obj-y += mx53loco.o -obj-$(CONFIG_VIDEO) += mx53loco_video.oboard/kosagi/novena/novena_spl.c +0
-22@@ -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 cmd/Kconfig +0
-0
cmd/Kconfig config CMD_CONITRACE · line 1754
Quoted 8 lines
cmd/Kconfig +1
-1@@ -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
cmd/bdinfo.c int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int
Quoted 4 lines
a/cmd/bdinfo.cb/cmd/bdinfo.cindexc56b3f4f6ec..37cd8a57ebd100644cmd/bdinfo.c +0
-0@@ -117,7 +117,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int
argc,
Review
Quoted 134 lines
cmd/bdinfo.c +1
-1char *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 --gita/cmd/bmp.cb/cmd/bmp.cindex071ba90b435..45f4c1296de100644cmd/bmp.c +1
-3@@ -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)common/fdt_support.c index renamed from common/fdt_support.c +0
-0
daa24d4c10b..867d74e0c0c100644common/fdt_support.c +1
-1@@ -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;common/stdio.c index renamed from common/stdio.c +0
-0
aedaea14ec5..e20427c6fbd100644common/stdio.c +1
-2@@ -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 (); }drivers/video/Kconfig index renamed from drivers/video/Kconfig +0
-0c2465121a72..51570310533 100644
drivers/video/Kconfig +2
-55@@ -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 an - output-only device. The Keyboard driver will not be set up. This - may 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 is - provided. This makes it possible to see the current cursor - position when entering text on the console. It is recommended to - enable this. - -config CONSOLE_EXTRA_INFO - bool "Display additional board information" - depends on CFB_CONSOLE - help - Display additional board information strings that normally go to - the serial port. When this option is enabled, a board-specific - function video_get_info_str() is called to get the string for - each 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 from - 0x00 to 0xff and the meaning depends on the graphics card. - Typically, 0x00 means black and 0xff means white. Do not set - the background and foreground to the same colour or you will see - nothing. - -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 from - 0x00 to 0xff and the meaning depends on the graphics card. - Typically, 0x00 means black and 0xff means white. Do not set - the background and foreground to the same colour or you will see - nothing. - 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.(quoted diff) +0
-0
b/drivers/video/nexell_display.c index
drivers/video/nexell_display.c static int nx_display_probe(struct udevice *dev) · line 600
Quoted 7 lines
0a9cea680fd..2179e413300100644drivers/video/nexell_display.c +0
-0@@ -598,8 +598,7 @@ static int nx_display_probe(struct udevice *dev)/* * set environment variable "fb_addr" (frame buffer address),
required
drivers/video/nexell_display.c static int nx_display_probe(struct udevice *dev) · line 601
Quoted 1 line
drivers/video/nexell_display.c +0
-1-* for splash image. Because drv_video_init() in common/stdio.c is
only
drivers/video/nexell_display.c
Quoted 3 lines
drivers/video/nexell_display.c +0
-1-* called when CONFIG_VIDEO is set (and not if CONFIG_DM_VIDEO is set).
drivers/video/nexell_display.c +1
-0+* for splash image, which is not set if CONFIG_DM_VIDEO is
enabled).
drivers/video/nexell_display.c static int nx_display_probe(struct udevice *dev)
Quoted 3 lines
drivers/video/nexell_display.c +0
-0*/ sprintf (addr,"0x%x" , dp->fb_addr);debug ("%s(): env_set(\"fb_addr\", %s) ...\n" , __func__, addr); diff
--git
Quoted 62 lines
a/include/asm-generic/global_data.hb/include/asm-generic/global_data.hindex104282bd479..78986b5bee0100644include/asm-generic/global_data.h +1
-1@@ -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 include/asm-generic/global_data.h +0
-0*/ include/configs/pxm2.h index renamed from include/configs/pxm2.h +0
-0
6cd7929db30..7272470d12e100644include/configs/pxm2.h +0
-7@@ -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 */ include/configs/rut.h index renamed from include/configs/rut.h +0
-0
410c6d379c3..b30b12af52c100644include/configs/rut.h +0
-9@@ -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 */ lib/efi_loader/Kconfig index renamed from lib/efi_loader/Kconfig +0
-0
24f9a2bb757..2876acce066100644lib/efi_loader/Kconfig +0
-2@@ -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
PATCH 8/14 video: Clean up the uclass header
In reply to Simon GlassDrop the unnecessary cruft from this header and update the title.
---
include/video.h | 84 +------------------------------------------------ 1 file changed, 1 insertion(+), 83 deletions(-)
include/video.h +1 -83
@@ -1,13 +1,7 @@/* -* Video uclass and legacy implementation +* Video uclass to support displays (see also vidconsole for text) * * Copyright (c) 2015 Google, Inc -* -* MPC823 Video Controller -* ======================= -* (C) 2000 by Paolo Scaffardi ([email protected]) -* AIRVENT SAM s.p.a - RIMINI(ITALY) -* */ #ifndef _VIDEO_H_
@@ -155,7 +149,6 @@ struct video_ops {*/ int video_reserve (ulong *addrp); -#ifdef CONFIG_DM_VIDEO /** * video_clear() - Clear a device's frame buffer to background color. *
@@ -163,7 +156,6 @@ int video_reserve(ulong *addrp);* Return: 0 */ int video_clear (struct udevice *dev); -#endif /* CONFIG_DM_VIDEO */ /** * video_sync() - Sync a device's frame buffer with its hardware
@@ -283,78 +275,4 @@ static inline int video_sync_copy_all(struct udevice *dev)*/ bool video_is_active (void ); -#ifndef CONFIG_DM_VIDEO - -/* Video functions */ - -/** -* Display a BMP format bitmap on the screen -* -* @param bmp_image Address of BMP image -* @param x X position to draw image -* @param y Y position to draw image -*/ -int video_display_bitmap (ulong bmp_image,int x,int y); - -/** -* Get the width of the screen in pixels -* -* Return: width of screen in pixels -*/ -int video_get_pixel_width (void ); - -/** -* Get the height of the screen in pixels -* -* Return: height of screen in pixels -*/ -int video_get_pixel_height (void ); - -/** -* Get the number of text lines/rows on the screen -* -* Return: number of rows -*/ -int video_get_screen_rows (void ); - -/** -* Get the number of text columns on the screen -* -* Return: number of columns -*/ -int video_get_screen_columns (void ); - -/** -* Set the position of the text cursor -* -* @param col Column to place cursor (0 = left side) -* @param row Row to place cursor (0 = top line) -*/ -void video_position_cursor (unsigned col,unsigned row); - -/* Clear the display */ -void video_clear (void ); - -#if defined(CONFIG_FORMIKE ) -int kwh043st20_f01_spi_startup (unsigned int bus,unsigned int cs, -unsigned int max_hz,unsigned int spi_mode); -#endif -#if defined(CONFIG_LG4573 ) -int lg4573_spi_startup (unsigned int bus,unsigned int cs, -unsigned int max_hz,unsigned int spi_mode); -#endif - -/* -* video_get_info_str() - obtain a board string: type, speed, etc. -* -* This is called if CONFIG_CONSOLE_EXTRA_INFO is enabled. -* -* line_number: location to place info string beside logo -* info: buffer for info string (empty if nothing to display on this -* line) -*/ -void video_get_info_str (int line_number,char *info); - -#endif /* !CONFIG_DM_VIDEO */ -#endif
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 9/14 video: Drop da8xx-fb
In reply to Simon GlassThis is not used in U-Boot anymore. Drop it.
---
drivers/video/Makefile | 1 - drivers/video/da8xx-fb.c | 1047 ---------------------------------- drivers/video/da8xx-fb.h | 115 ---- scripts/config_whitelist.txt | 1 - 4 files changed, 1164 deletions(-) delete mode 100644 drivers/video/da8xx-fb.c delete mode 100644 drivers/video/da8xx-fb.h
drivers/video/Makefile +0 -1
@@ -46,7 +46,6 @@ obj-$(CONFIG_VIDEO_ARM_MALIDP) += mali_dp.o obj-$(CONFIG_VIDEO_BCM2835) += bcm2835.o obj-$(CONFIG_VIDEO_BROADWELL_IGD) += broadwell_igd.o obj-$(CONFIG_VIDEO_COREBOOT) += coreboot.o -obj-$(CONFIG_VIDEO_DA8XX) += da8xx-fb.o videomodes.o obj-$(CONFIG_VIDEO_DW_HDMI) += dw_hdmi.o obj-$(CONFIG_VIDEO_DW_MIPI_DSI) += dw_mipi_dsi.o obj-$(CONFIG_VIDEO_EFI) += efi.o
drivers/video/da8xx-fb.c deleted +0 -1047
1,047 lines not on this page · raw message
drivers/video/da8xx-fb.h deleted +0 -115
115 lines not on this page · raw message
scripts/config_whitelist.txt +0 -1
@@ -2118,7 +2118,6 @@ CONFIG_U_BOOT_HDR_SIZE CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM CONFIG_VIDEO_BCM2835 -CONFIG_VIDEO_DA8XX CONFIG_VSC7385_ENET CONFIG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 10/14 video: fsl: colibri_vf: Drop FSL DCU driver
In reply to Simon GlassThis does not use driver model and is more than two years past the migration date. Drop it.
It can be added back later if needed.
---
arch/arm/cpu/armv7/ls102xa/soc.c | 4 - arch/arm/include/asm/arch-ls102xa/config.h | 1 - board/freescale/common/Makefile | 2 - board/freescale/common/dcu_sii9022a.c | 248 ---------- board/freescale/common/dcu_sii9022a.h | 12 - board/freescale/ls1021aiot/Makefile | 1 - board/freescale/ls1021aiot/dcu.c | 48 -- board/freescale/ls1021aqds/Makefile | 1 - board/freescale/ls1021aqds/dcu.c | 110 ----- board/freescale/ls1021atwr/Makefile | 1 - board/freescale/ls1021atwr/dcu.c | 48 -- board/toradex/colibri_vf/Makefile | 1 - board/toradex/colibri_vf/colibri_vf.c | 62 --- board/toradex/colibri_vf/dcu.c | 38 -- configs/colibri_vf_defconfig | 1 - drivers/video/Kconfig | 15 - drivers/video/Makefile | 1 - drivers/video/fsl_dcu_fb.c | 548 --------------------- include/configs/colibri_vf.h | 7 - include/configs/ls1021aqds.h | 10 - include/configs/ls1021atwr.h | 13 - include/fsl_dcu_fb.h | 22 - scripts/config_whitelist.txt | 3 - 23 files changed, 1197 deletions(-) delete mode 100644 board/freescale/common/dcu_sii9022a.c delete mode 100644 board/freescale/common/dcu_sii9022a.h delete mode 100644 board/freescale/ls1021aiot/dcu.c delete mode 100644 board/freescale/ls1021aqds/dcu.c delete mode 100644 board/freescale/ls1021atwr/dcu.c delete mode 100644 board/toradex/colibri_vf/dcu.c delete mode 100644 drivers/video/fsl_dcu_fb.c delete mode 100644 include/fsl_dcu_fb.h
arch/arm/cpu/armv7/ls102xa/soc.c +0 -4
@@ -172,10 +172,6 @@ int arch_soc_init(void)out_be32 (&scfg->qspi_cfg,SCFG_QSPI_CLKSEL );#endif -#ifdef CONFIG_VIDEO_FSL_DCU_FB -out_be32 (&scfg->pixclkcr,SCFG_PIXCLKCR_PXCKEN ); -#endif -/* Configure Little endian for SAI, ASRC and SPDIF */ out_be32 (&scfg->endiancr,SCFG_ENDIANCR_LE );
arch/arm/include/asm/arch-ls102xa/config.h +0 -1
@@ -93,7 +93,6 @@#define CONFIG_SYS_FSL_ESDHC_BE #define CONFIG_SYS_FSL_WDOG_BE #define CONFIG_SYS_FSL_DSPI_BE -#define CONFIG_SYS_FSL_DCU_BE #define CONFIG_SYS_FSL_SEC_MON_LE #define CONFIG_SYS_FSL_SFP_VER_3_2 #define CONFIG_SYS_FSL_SFP_BE
board/freescale/common/Makefile +0 -2
@@ -52,8 +52,6 @@ else obj-$(CONFIG_DEEP_SLEEP) += mpc85xx_sleep.o endif -obj-$(CONFIG_FSL_DCU_SII9022A) += dcu_sii9022a.o - obj-$(CONFIG_TARGET_MPC8548CDS) += cds_pci_ft.o obj-$(CONFIG_TARGET_MPC8536DS) += ics307_clk.o
board/freescale/common/dcu_sii9022a.c deleted +0 -248
248 lines not on this page · raw message
board/freescale/common/dcu_sii9022a.h deleted +0 -12
@@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright 2014 Freescale Semiconductor, Inc. -*/ - -#ifndef __DCU_HDMI_SII9022A__ -#define __DCU_HDMI_SII9022A__ - -/* Programming of Silicon SII9022A connector HDMI Transmitter*/ -int dcu_set_dvi_encoder (struct fb_videomode *videomode); - -#endif
board/freescale/ls1021aiot/Makefile +0 -1
@@ -3,5 +3,4 @@ # Copyright 2016 Freescale Semiconductor, Inc. obj-y += ls1021aiot.o -obj-$(CONFIG_VIDEO_FSL_DCU_FB) += dcu.o obj-$(CONFIG_ARMV7_PSCI) += psci.o
board/freescale/ls1021aiot/dcu.c deleted +0 -48
48 lines not on this page · raw message
board/freescale/ls1021aqds/Makefile +0 -1
@@ -7,5 +7,4 @@ obj-y += ls1021aqds.o obj-y += ddr.o obj-y += eth.o -obj-$(CONFIG_VIDEO_FSL_DCU_FB) += dcu.o obj-$(CONFIG_ARMV7_PSCI) += psci.o
board/freescale/ls1021aqds/dcu.c deleted +0 -110
110 lines not on this page · raw message
board/freescale/ls1021atwr/Makefile +0 -1
@@ -5,5 +5,4 @@ # obj-y += ls1021atwr.o -obj-$(CONFIG_VIDEO_FSL_DCU_FB) += dcu.o obj-$(CONFIG_ARMV7_PSCI) += psci.o
board/freescale/ls1021atwr/dcu.c deleted +0 -48
48 lines not on this page · raw message
board/toradex/colibri_vf/Makefile +0 -1
@@ -3,4 +3,3 @@ # Copyright 2013 Freescale Semiconductor, Inc. obj-y := colibri_vf.o -obj-$(CONFIG_VIDEO_FSL_DCU_FB) += dcu.o
board/toradex/colibri_vf/colibri_vf.c +0 -62
98 lines not on this page · raw message
board/toradex/colibri_vf/dcu.c deleted +0 -38
@@ -1,38 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Copyright 2017 Toradex AG -* -* FSL DCU platform driver -*/ - -#include <asm/arch/crm_regs.h> -#include <asm/io.h> -#include <common.h> -#include <fsl_dcu_fb.h> -#include "div64.h" - -unsigned int dcu_set_pixel_clock (unsigned int pixclock) -{ -struct ccm_reg *ccm = (struct ccm_reg *)CCM_BASE_ADDR ; -unsigned long long div; - -clrbits_le32 (&ccm->cscmr1,CCM_CSCMR1_DCU0_CLK_SEL ); -clrsetbits_le32 (&ccm->cscdr3, -CCM_CSCDR3_DCU0_DIV_MASK |CCM_CSCDR3_DCU0_EN , -CCM_CSCDR3_DCU0_DIV (0 ) |CCM_CSCDR3_DCU0_EN ); - div = (unsigned long long )(PLL1_PFD2_FREQ /1000 ); -do_div (div, pixclock); - -return div; -} - -int platform_dcu_init (struct fb_info *fbinfo, -unsigned int xres, -unsigned int yres, -const char *port, -struct fb_videomode *dcu_fb_videomode) -{ -fsl_dcu_init (fbinfo, xres, yres,32 ); - -return 0 ; -}
configs/colibri_vf_defconfig +0 -1
@@ -102,7 +102,6 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_LOGO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set -CONFIG_VIDEO_FSL_DCU_FB=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y
drivers/video/Kconfig +0 -15
@@ -601,21 +601,6 @@ config VIDEO_IVYBRIDGE_IGD a special tool which configures the VGA ROM, but the graphics resolution can be selected in U-Boot. -config VIDEO_FSL_DCU_FB - bool "Enable Freescale Display Control Unit" - depends on VIDEO || DM_VIDEO - help - This enables support for Freescale Display Control Unit (DCU4) - module found on Freescale Vybrid and QorIQ family of SoCs. - -config VIDEO_FSL_DCU_MAX_FB_SIZE_MB - int "Freescale DCU framebuffer size" - depends on VIDEO_FSL_DCU_FB - default 4194304 - help - Set maximum framebuffer size to be used for Freescale Display - Controller Unit (DCU4). - source "drivers/video/rockchip/Kconfig" config VIDEO_ARM_MALIDP
drivers/video/Makefile +0 -1
@@ -49,7 +49,6 @@ obj-$(CONFIG_VIDEO_COREBOOT) += coreboot.o obj-$(CONFIG_VIDEO_DW_HDMI) += dw_hdmi.o obj-$(CONFIG_VIDEO_DW_MIPI_DSI) += dw_mipi_dsi.o obj-$(CONFIG_VIDEO_EFI) += efi.o -obj-$(CONFIG_VIDEO_FSL_DCU_FB) += fsl_dcu_fb.o videomodes.o obj-$(CONFIG_VIDEO_IPUV3) += imx/ obj-$(CONFIG_VIDEO_IVYBRIDGE_IGD) += ivybridge_igd.o obj-$(CONFIG_VIDEO_LCD_ANX9804) += anx9804.o
drivers/video/fsl_dcu_fb.c deleted +0 -548
548 lines not on this page · raw message
include/configs/colibri_vf.h +0 -7
@@ -14,13 +14,6 @@#include <asm/arch/imx-regs.h> #include <linux/sizes.h> -#ifdef CONFIG_VIDEO_FSL_DCU_FB -#define CONFIG_SYS_FSL_DCU_LE - -#define CONFIG_SYS_DCU_ADDR DCU0_BASE_ADDR -#define DCU_LAYER_MAX_NUM 64 -#endif -/* NAND support */ #define CONFIG_SYS_MAX_NAND_DEVICE 1
include/configs/ls1021aqds.h +0 -10
@@ -303,16 +303,6 @@* MMC */ -/* -* Video -*/ -#ifdef CONFIG_VIDEO_FSL_DCU_FB -#define CONFIG_FSL_DIU_CH7301 -#define CONFIG_SYS_I2C_DVI_BUS_NUM 0 -#define CONFIG_SYS_I2C_QIXIS_ADDR 0x66 -#define CONFIG_SYS_I2C_DVI_ADDR 0x75 -#endif -/* * eTSEC */
include/configs/ls1021atwr.h +0 -13
@@ -190,19 +190,6 @@#define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 1 -/* -* MMC -*/ - -/* -* Video -*/ -#ifdef CONFIG_VIDEO_FSL_DCU_FB -#define CONFIG_FSL_DCU_SII9022A -#define CONFIG_SYS_I2C_DVI_BUS_NUM 1 -#define CONFIG_SYS_I2C_DVI_ADDR 0x39 -#endif -/* * eTSEC */
include/fsl_dcu_fb.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright 2014 Freescale Semiconductor, Inc. -* -* FSL DCU Framebuffer driver -*/ -#include <linux/fb.h> - -int fsl_dcu_init (struct fb_info *fbinfo, -unsigned int xres, -unsigned int yres, -unsigned int pixel_format); - -int fsl_dcu_fixedfb_setup (void *blob); - -/* Prototypes for external board-specific functions */ -int platform_dcu_init (struct fb_info *fbinfo, -unsigned int xres, -unsigned int yres, -const char *port, -struct fb_videomode *dcu_fb_videomode); -unsigned int dcu_set_pixel_clock (unsigned int pixclock);
scripts/config_whitelist.txt +0 -3
@@ -210,7 +210,6 @@ CONFIG_FPGA_STRATIX_V CONFIG_FSL_CADMUS CONFIG_FSL_CORENET CONFIG_FSL_CPLD -CONFIG_FSL_DCU_SII9022A CONFIG_FSL_DEVICE_DISABLE CONFIG_FSL_DIU_CH7301 CONFIG_FSL_DIU_FB
@@ -1218,8 +1217,6 @@ CONFIG_SYS_FSL_DCSR_DDR2_ADDR CONFIG_SYS_FSL_DCSR_DDR3_ADDR CONFIG_SYS_FSL_DCSR_DDR4_ADDR CONFIG_SYS_FSL_DCSR_DDR_ADDR -CONFIG_SYS_FSL_DCU_BE -CONFIG_SYS_FSL_DCU_LE CONFIG_SYS_FSL_DDR2_ADDR CONFIG_SYS_FSL_DDR3_ADDR CONFIG_SYS_FSL_DDR_ADDR
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 11/14 video: Drop FSL DIU driver
In reply to Simon GlassThis does not use driver model and is more than two years past the migration date. Drop it.
It can be added back later if needed.
---
README | 13 - board/freescale/common/Makefile | 2 - board/freescale/common/diu_ch7301.c | 217 --------------- board/freescale/common/diu_ch7301.h | 12 - board/freescale/t104xrdb/Makefile | 1 - board/freescale/t104xrdb/diu.c | 83 ------ drivers/video/Makefile | 1 - drivers/video/fsl_diu_fb.c | 415 ---------------------------- include/configs/T102xRDB.h | 12 - include/configs/T104xRDB.h | 19 -- include/fsl_diu_fb.h | 14 - scripts/config_whitelist.txt | 3 - 12 files changed, 792 deletions(-) delete mode 100644 board/freescale/common/diu_ch7301.c delete mode 100644 board/freescale/common/diu_ch7301.h delete mode 100644 board/freescale/t104xrdb/diu.c delete mode 100644 drivers/video/fsl_diu_fb.c delete mode 100644 include/fsl_diu_fb.h
README +0 -13
@@ -1006,19 +1006,6 @@ The following options need to be configured: - Keyboard Support: See Kconfig help for available keyboard drivers. -- Video support: - CONFIG_FSL_DIU_FB - Enable the Freescale DIU video driver. Reference boards for - SOCs that have a DIU should define this macro to enable DIU - support, and should also define these other macros: - - CONFIG_SYS_DIU_ADDR - - The DIU driver will look for the 'video-mode' environment - variable, and if defined, enable the DIU as a console during - boot. See the documentation file doc/README.video for a - description of this variable. - - LCD Support: CONFIG_LCD Define this to enable LCD support (for output to LCD
board/freescale/common/Makefile +0 -2
@@ -44,8 +44,6 @@ ifndef CONFIG_RAMBOOT_PBL obj-$(CONFIG_FSL_FIXED_MMC_LOCATION) += sdhc_boot.o endif -obj-$(CONFIG_FSL_DIU_CH7301) += diu_ch7301.o - ifdef CONFIG_ARM obj-$(CONFIG_DEEP_SLEEP) += arm_sleep.o else
board/freescale/common/diu_ch7301.c deleted +0 -217
217 lines not on this page · raw message
board/freescale/common/diu_ch7301.h deleted +0 -12
@@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright 2014 Freescale Semiconductor, Inc. -*/ - -#ifndef __DIU_HDMI_CH7301__ -#define __DIU_HDMI_CH7301__ - -/* Programming of HDMI Chrontel CH7301 connector */ -int diu_set_dvi_encoder (unsigned int pixclock); - -#endif
board/freescale/t104xrdb/Makefile +0 -1
@@ -8,7 +8,6 @@ else obj-y += t104xrdb.o obj-y += cpld.o obj-y += eth.o -obj-$(CONFIG_FSL_DIU_FB)+= diu.o endif obj-y += ddr.o obj-y += law.o
board/freescale/t104xrdb/diu.c deleted +0 -83
83 lines not on this page · raw message
drivers/video/Makefile +0 -1
@@ -31,7 +31,6 @@ obj-y += ti/ obj-$(CONFIG_ATMEL_HLCD) += atmel_hlcdfb.o obj-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o obj-$(CONFIG_FORMIKE) += formike.o -obj-$(CONFIG_FSL_DIU_FB) += fsl_diu_fb.o videomodes.o obj-$(CONFIG_IHS_VIDEO_OUT) += ihs_video_out.o obj-$(CONFIG_LD9040) += ld9040.o obj-$(CONFIG_LG4573) += lg4573.o
drivers/video/fsl_diu_fb.c deleted +0 -415
415 lines not on this page · raw message
include/configs/T102xRDB.h +0 -12
@@ -368,18 +368,6 @@#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -/* Video */ -#undef CONFIG_FSL_DIU_FB/* RDB doesn't support DIU */ -#ifdef CONFIG_FSL_DIU_FB -#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) -#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS -/* -* With CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS, flash I/O is really slow, so -* disable empty flash sector detection, which is I/O-intensive. -*/ -#undef CONFIG_SYS_FLASH_EMPTY_INFO -#endif -/* I2C */ #define I2C_PCA6408_BUS_NUM 1
include/configs/T104xRDB.h +0 -19
@@ -354,18 +354,6 @@#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -#if defined(CONFIG_TARGET_T1042RDB_PI ) || defined(CONFIG_TARGET_T1042D4RDB ) -/* Video */ -#define CONFIG_FSL_DIU_FB - -#ifdef CONFIG_FSL_DIU_FB -#define CONFIG_FSL_DIU_CH7301 -#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) -#endif -#endif - -/* I2C */ -/* I2C bus multiplexer */ #define I2C_MUX_PCA_ADDR 0x70#define I2C_MUX_CH_DEFAULT 0x8
@@ -571,18 +559,11 @@#define FDTFILE "t1042rdb/t1042d4rdb.dtb"#endif -#ifdef CONFIG_FSL_DIU_FB -#define DIU_ENVIRONMENT "video-mode=fslfb:1024x768-32@60,monitor=dvi" -#else -#define DIU_ENVIRONMENT -#endif -#define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=cs0_cs1;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\ "usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ - "video-mode=" __stringify(DIU_ENVIRONMENT) "\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \
include/fsl_diu_fb.h deleted +0 -14
@@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright 2007, 2011 Freescale Semiconductor, Inc. -* Authors: York Sun <[email protected]> -* Timur Tabi <[email protected]> -* -* FSL DIU Framebuffer driver -*/ - -int fsl_diu_init (u16 xres,u16 yres,u32 pixel_format,int gamma_fix); - -/* Prototypes for external board-specific functions */ -int platform_diu_init (unsigned int xres,unsigned int yres,const char *port); -void diu_set_pixel_clock (unsigned int pixclock);
scripts/config_whitelist.txt +0 -3
@@ -211,8 +211,6 @@ CONFIG_FSL_CADMUS CONFIG_FSL_CORENET CONFIG_FSL_CPLD CONFIG_FSL_DEVICE_DISABLE -CONFIG_FSL_DIU_CH7301 -CONFIG_FSL_DIU_FB CONFIG_FSL_DSPI1 CONFIG_FSL_ESDHC_PIN_MUX CONFIG_FSL_FIXED_MMC_LOCATION
@@ -1074,7 +1072,6 @@ CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS CONFIG_SYS_DIALOG_PMIC_I2C_ADDR CONFIG_SYS_DIRECT_FLASH_TFTP CONFIG_SYS_DISCOVER_PHY -CONFIG_SYS_DIU_ADDR CONFIG_SYS_DPAA_DCE CONFIG_SYS_DPAA_FMAN CONFIG_SYS_DPAA_PME
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 12/14 video: mxs: Drop old video code
In reply to Simon GlassThis is no-longer used and is the last reference to video_hw_init(). Drop it.
---
drivers/video/mxsfb.c | 89 ------------------------------------------- 1 file changed, 89 deletions(-)
drivers/video/mxsfb.c +0 -89
@@ -252,94 +252,6 @@ static int mxs_remove_common(u32 fb)return 0 ; } -#ifndef CONFIG_DM_VIDEO - -static GraphicDevice panel; - -void lcdif_power_down (void ) -{ -mxs_remove_common (panel.frameAdrs); -} - -void *video_hw_init (void ) -{ -int bpp =-1 ; -int ret =0 ; -char *penv; -void *fb =NULL ; -struct ctfb_res_modes mode; -struct display_timing timings; - -puts ("Video: " ); - -/* Suck display configuration from "videomode" variable */ - penv =env_get ("videomode" ); -if (!penv) { -puts ("MXSFB: 'videomode' variable not set!\n" ); -return NULL ; - } - - bpp =video_get_params (&mode, penv); - -/* fill in Graphic device struct */ -sprintf (panel.modeIdent,"%dx%dx%d" , mode.xres, mode.yres, bpp); - - panel.winSizeX = mode.xres; - panel.winSizeY = mode.yres; - panel.plnSizeX = mode.xres; - panel.plnSizeY = mode.yres; - -switch (bpp) { -case 24 : -case 18 : - panel.gdfBytesPP =4 ; - panel.gdfIndex =GDF_32BIT_X888RGB ; -break ; -case 16 : - panel.gdfBytesPP =2 ; - panel.gdfIndex =GDF_16BIT_565RGB ; -break ; -case 8 : - panel.gdfBytesPP =1 ; - panel.gdfIndex =GDF__8BIT_INDEX ; -break ; -default : -printf ("MXSFB: Invalid BPP specified! (bpp = %i)\n" , bpp); -return NULL ; - } - - panel.memSize = mode.xres * mode.yres * panel.gdfBytesPP; - -/* Allocate framebuffer */ - fb =memalign (ARCH_DMA_MINALIGN , -roundup (panel.memSize,ARCH_DMA_MINALIGN )); -if (!fb) { -printf ("MXSFB: Error allocating framebuffer!\n" ); -return NULL ; - } - -/* Wipe framebuffer */ -memset (fb,0 , panel.memSize); - - panel.frameAdrs = (u32 )fb; - -printf ("%s\n" , panel.modeIdent); - -video_ctfb_mode_to_display_timing (&mode, &timings); - - ret =mxs_probe_common (NULL , &timings, bpp, (u32 )fb); -if (ret) - goto dealloc_fb; - -return (void *)&panel; - -dealloc_fb: -free (fb); - -return NULL ; -} -#else /* ifndef CONFIG_DM_VIDEO */ -static int mxs_of_get_timings (struct udevice *dev,struct display_timing *timings,u32 *bpp)
@@ -489,4 +401,3 @@ U_BOOT_DRIVER(mxs_video) = { .remove = mxs_video_remove, .flags = DM_FLAG_PRE_RELOC | DM_FLAG_OS_PREPARE, }; -#endif /* ifndef CONFIG_DM_VIDEO */
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 13/14 video: Convert CONFIG_VIDEO_BCM2835 to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_VIDEO_BCM2835
This is the final ad-hoc CONFIG_VIDEO_... to convert.
---
configs/rpi_0_w_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_b_plus_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_4_32b_defconfig | 1 + configs/rpi_4_defconfig | 1 + configs/rpi_arm64_defconfig | 1 + configs/rpi_defconfig | 1 + drivers/video/Kconfig | 8 ++++++++ include/configs/rpi.h | 1 - scripts/config_whitelist.txt | 1 - 12 files changed, 17 insertions(+), 2 deletions(-)
configs/rpi_0_w_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/rpi_2_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/rpi_3_32b_defconfig +1 -0
@@ -45,6 +45,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/rpi_3_b_plus_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/rpi_3_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/rpi_4_32b_defconfig +1 -0
@@ -59,6 +59,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_ADDR_MAP=y
configs/rpi_4_defconfig +1 -0
@@ -59,6 +59,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/rpi_arm64_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/rpi_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y
drivers/video/Kconfig +8 -0
@@ -421,6 +421,14 @@ config VIDEO_LCD_ANX9804 from a parallel LCD interface and translate it on the fy into a DP interface for driving eDP TFT displays. It uses I2C for configuration. +config VIDEO_BCM2835 + bool "Display support for BCM2835" + help + The graphics processor already sets up the display so this driver + simply checks the resolution and then sets up the frame buffer with + that same resolution (or as near as possible) and 32bpp depth, so + that U-Boot can access it with full colour depth. + config VIDEO_LCD_ORISETECH_OTM8009A bool "OTM8009A DSI LCD panel support" depends on DM_VIDEO
include/configs/rpi.h +0 -1
@@ -44,7 +44,6 @@/* GPIO */ #define CONFIG_BCM2835_GPIO /* LCD */ -#define CONFIG_VIDEO_BCM2835 /* DFU over USB/UDC */ #ifdef CONFIG_CMD_DFU
scripts/config_whitelist.txt +0 -1
@@ -2111,7 +2111,6 @@ CONFIG_USE_ONENAND_BOARD_INIT CONFIG_U_BOOT_HDR_SIZE CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM -CONFIG_VIDEO_BCM2835 CONFIG_VSC7385_ENET CONFIG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
Re: [PATCH 13/14] video: Convert CONFIG_VIDEO_BCM2835 to Kconfig
Quoted 6 lines · Simon Glass
This converts the following to
Kconfig:CONFIG_VIDEO_BCM2835This is the final ad-hoc
CONFIG_VIDEO_... to convert.Signed-off-by Simon Glass <[email protected]>
Quoted 167 lines
---
configs/rpi_0_w_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_b_plus_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_4_32b_defconfig | 1 + configs/rpi_4_defconfig | 1 + configs/rpi_arm64_defconfig | 1 + configs/rpi_defconfig | 1 + drivers/video/Kconfig | 8 ++++++++ include/configs/rpi.h | 1 - scripts/config_whitelist.txt | 1 - 12 files changed, 17 insertions(+), 2 deletions(-)configs/rpi_0_w_defconfig +1
-0@@ -41,6 +41,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=yconfigs/rpi_2_defconfig +1
-0@@ -42,6 +42,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=yconfigs/rpi_3_32b_defconfig +1
-0@@ -45,6 +45,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=yconfigs/rpi_3_b_plus_defconfig +1
-0@@ -44,6 +44,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=yconfigs/rpi_3_defconfig +1
-0@@ -44,6 +44,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=yconfigs/rpi_4_32b_defconfig +1
-0@@ -59,6 +59,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_ADDR_MAP=yconfigs/rpi_4_defconfig +1
-0@@ -59,6 +59,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=yconfigs/rpi_arm64_defconfig +1
-0@@ -51,6 +51,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=yconfigs/rpi_defconfig +1
-0@@ -41,6 +41,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=ydrivers/video/Kconfig +8
-0@@ -421,6 +421,14 @@ config VIDEO_LCD_ANX9804 from a parallel LCD interface and translate it on the fy into a DP interface for driving eDP TFT displays. It uses I2C for configuration. +config VIDEO_BCM2835 + bool "Display support for BCM2835" + help + The graphics processor already sets up the display so this driver + simply checks the resolution and then sets up the frame buffer with + that same resolution (or as near as possible) and 32bpp depth, so + that U-Boot can access it with full colour depth. + config VIDEO_LCD_ORISETECH_OTM8009A bool "OTM8009A DSI LCD panel support" depends on DM_VIDEOinclude/configs/rpi.h +0
-1@@ -44,7 +44,6 @@/* GPIO */ #define CONFIG_BCM2835_GPIO /* LCD */ -#define CONFIG_VIDEO_BCM2835 /* DFU over USB/UDC */ #ifdef CONFIG_CMD_DFU scripts/config_whitelist.txt +0
-1@@ -2111,7 +2111,6 @@ CONFIG_USE_ONENAND_BOARD_INIT CONFIG_U_BOOT_HDR_SIZE CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM -CONFIG_VIDEO_BCM2835 CONFIG_VSC7385_ENET CONFIG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE
PATCH 14/14 video: Drop formike driver
In reply to Simon GlassThis is not used. Drop it.
---
drivers/video/Makefile | 1 - drivers/video/formike.c | 513 ----------------------------------- scripts/config_whitelist.txt | 1 - 3 files changed, 515 deletions(-) delete mode 100644 drivers/video/formike.c
drivers/video/Makefile +0 -1
@@ -30,7 +30,6 @@ obj-y += ti/ obj-$(CONFIG_ATMEL_HLCD) += atmel_hlcdfb.o obj-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o -obj-$(CONFIG_FORMIKE) += formike.o obj-$(CONFIG_IHS_VIDEO_OUT) += ihs_video_out.o obj-$(CONFIG_LD9040) += ld9040.o obj-$(CONFIG_LG4573) += lg4573.o
drivers/video/formike.c deleted +0 -513
513 lines not on this page · raw message
scripts/config_whitelist.txt +0 -1
@@ -204,7 +204,6 @@ CONFIG_FLASH_SHOW_PROGRESS CONFIG_FLASH_SPANSION_S29WS_N CONFIG_FLASH_VERIFY CONFIG_FM_PLAT_CLK_DIV -CONFIG_FORMIKE CONFIG_FPGA_COUNT CONFIG_FPGA_STRATIX_V CONFIG_FSL_CADMUS
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
Hi Anatolij,
Quoted 150 lines · Simon Glass
There is still quite a bit of cruft in the video subsystem. Mainly this is users of the now-removed
CONFIG_VIDEO,cfb_consoleandCONFIG_LCD.This series removes most of the first two. The exception is
videomodes.cand its header, since these are used by sunxi. It looks like the code could be removed, but I did not attempt it.This is left for the sunxi maintainer.
The LCD clean-up can come later. Once done, we can rename
CONFIG_DM_VIDEOtoCONFIG_VIDEO, thus completing the migration.Simon Glass (14):
video: Dropcfg_console
video:nokia_rx51: Drop obsolete video code
video: siemens: Drop unused video code
video: nexell: Drop unused and invalid code
video: Dropvideo_fbheader
video: DropCONFIG_VIDEO_BMP_LOGO
video: Drop references toCONFIG_VIDEOet al
video: Clean up the uclass header
video: Drop da8xx-fb
video: fsl:colibri_vf: Drop FSL DCU driver
video: Drop FSL DIU driver
video: mxs: Drop old video code
video: ConvertCONFIG_VIDEO_BCM2835toKconfig
video: Drop formike driverREADME | 18 - arch/arm/cpu/armv7/ls102xa/soc.c | 4 - arch/arm/include/asm/arch-ls102xa/config.h | 1 - arch/arm/include/asm/mach-imx/mx5_video.h | 5 - .../mach-nexell/include/mach/display_dev.h | 7 +- board/aristainetos/aristainetos.c | 1 - board/freescale/common/Makefile | 4 - board/freescale/common/dcu_sii9022a.c | 248 --- board/freescale/common/dcu_sii9022a.h | 12 - board/freescale/common/diu_ch7301.c | 217 -- board/freescale/common/diu_ch7301.h | 12 - board/freescale/ls1021aiot/Makefile | 1 - board/freescale/ls1021aiot/dcu.c | 48 - board/freescale/ls1021aqds/Makefile | 1 - board/freescale/ls1021aqds/dcu.c | 110 - board/freescale/ls1021atwr/Makefile | 1 - board/freescale/ls1021atwr/dcu.c | 48 - board/freescale/mx51evk/Makefile | 1 - board/freescale/mx53loco/Makefile | 1 - board/freescale/t104xrdb/Makefile | 1 - board/freescale/t104xrdb/diu.c | 84 - board/kosagi/novena/novena_spl.c | 23 - board/nokia/rx51/rx51.c | 19 - board/siemens/common/board.c | 3 - board/siemens/common/factoryset.c | 7 - board/siemens/common/factoryset.h | 3 - board/siemens/pxm2/board.c | 189 -- board/siemens/rut/board.c | 247 --- board/socrates/socrates.c | 1 - board/toradex/colibri_vf/Makefile | 1 - board/toradex/colibri_vf/colibri_vf.c | 62 - board/toradex/colibri_vf/dcu.c | 38 - cmd/Kconfig | 2 +- cmd/bdinfo.c | 2 +- cmd/bmp.c | 4 +- cmd/cls.c | 2 - common/fdt_support.c | 2 +- common/stdio.c | 4 +- configs/colibri_vf_defconfig | 1 - configs/nokia_rx51_defconfig | 3 - configs/rpi_0_w_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_b_plus_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_4_32b_defconfig | 1 + configs/rpi_4_defconfig | 1 + configs/rpi_arm64_defconfig | 1 + configs/rpi_defconfig | 1 + doc/usage/bootmenu.rst | 5 - drivers/pci/pci_rom.c | 1 - drivers/video/Kconfig | 129 +- drivers/video/Makefile | 5 - drivers/video/cfb_console.c | 1865 ----------------- drivers/video/da8xx-fb.c | 1048 --------- drivers/video/da8xx-fb.h | 115 - drivers/video/formike.c | 513 ----- drivers/video/fsl_dcu_fb.c | 549 ----- drivers/video/fsl_diu_fb.c | 416 ---- drivers/video/imx/mxc_ipuv3_fb.c | 1 - drivers/video/mxsfb.c | 90 - drivers/video/nexell_display.c | 18 +- drivers/video/omap3_dss.c | 29 - drivers/video/sunxi/sunxi_display.c | 1 - include/asm-generic/global_data.h | 2 +- include/configs/T102xRDB.h | 13 - include/configs/T104xRDB.h | 20 - include/configs/apalis_imx6.h | 1 - include/configs/aristainetos2.h | 1 - include/configs/cm_fx6.h | 2 - include/configs/colibri-imx6ull.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_imx7.h | 4 - include/configs/colibri_vf.h | 8 - include/configs/embestmx6boards.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/imx6-engicam.h | 2 - include/configs/imxrt1050-evk.h | 2 - include/configs/ls1021aqds.h | 12 - include/configs/ls1021atwr.h | 15 - include/configs/mx6cuboxi.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mx7dsabresd.h | 4 - include/configs/nokia_rx51.h | 11 - include/configs/opos6uldev.h | 1 - include/configs/pico-imx6.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/pico-imx7d.h | 4 - include/configs/pxm2.h | 8 - include/configs/rpi.h | 1 - include/configs/rut.h | 10 - include/configs/wandboard.h | 1 - include/fsl_dcu_fb.h | 22 - include/fsl_diu_fb.h | 14 - include/video.h | 84 +- include/video_fb.h | 91 - lib/efi_loader/Kconfig | 1 - scripts/config_whitelist.txt | 10 - 100 files changed, 33 insertions(+), 6553 deletions(-) delete mode 100644 board/freescale/common/dcu_sii9022a.c delete mode 100644 board/freescale/common/dcu_sii9022a.h delete mode 100644 board/freescale/common/diu_ch7301.c delete mode 100644 board/freescale/common/diu_ch7301.h delete mode 100644 board/freescale/ls1021aiot/dcu.c delete mode 100644 board/freescale/ls1021aqds/dcu.c delete mode 100644 board/freescale/ls1021atwr/dcu.c delete mode 100644 board/freescale/t104xrdb/diu.c delete mode 100644 board/toradex/colibri_vf/dcu.c delete mode 100644 drivers/video/cfb_console.c delete mode 100644 drivers/video/da8xx-fb.c delete mode 100644 drivers/video/da8xx-fb.h delete mode 100644 drivers/video/formike.c delete mode 100644 drivers/video/fsl_dcu_fb.c delete mode 100644 drivers/video/fsl_diu_fb.c delete mode 100644 include/fsl_dcu_fb.h delete mode 100644 include/fsl_diu_fb.h delete mode 100644 include/video_fb.h
Quoted 3 lines
--
2.35.0.rc0.227.g00780c9af4-goog
Is there any word on this series, please?
Regards,
Simon
Quoted 20 lines · On Thursday 24 March 2022 13:54:22 Simon Glass wrote:
Hi Anatolij,
Quoted 17 lines · Simon Glass
There is still quite a bit of cruft in the video subsystem. Mainly this is users of the now-removed
CONFIG_VIDEO,cfb_consoleandCONFIG_LCD.This series removes most of the first two. The exception is
videomodes.cand its header, since these are used by sunxi. It looks like the code could be removed, but I did not attempt it.This is left for the sunxi maintainer.
The LCD clean-up can come later. Once done, we can rename
CONFIG_DM_VIDEOtoCONFIG_VIDEO, thus completing the migration.Simon Glass (14):
video: Dropcfg_console
video:nokia_rx51: Drop obsolete video code
...
Quoted 2 lines
Is there any word on this series, please?
Nokia board code does not use this cfb_console anymore... Or it is still affected?
Hi Pali,
Quoted 22 lines · Pali Rohár
Quoted 20 lines · On Thursday 24 March 2022 13:54:22 Simon Glass wrote:
Hi Anatolij,
Quoted 17 lines · Simon Glass
There is still quite a bit of cruft in the video subsystem. Mainly this is users of the now-removed
CONFIG_VIDEO,cfb_consoleandCONFIG_LCD.This series removes most of the first two. The exception is
videomodes.cand its header, since these are used by sunxi. It looks like the code could be removed, but I did not attempt it.This is left for the sunxi maintainer.
The LCD clean-up can come later. Once done, we can rename
CONFIG_DM_VIDEOtoCONFIG_VIDEO, thus completing the migration.Simon Glass (14):
video: Dropcfg_console
video:nokia_rx51: Drop obsolete video code
Quoted 6 lines
...
Quoted 2 lines
Is there any word on this series, please?
Nokia board code does not use this
cfb_consoleanymore... Or it is still affected?
It should not be affected. Maybe this patch can be dropped?
Regards,
Simon
Hi Simon,
On Thu, 24 Mar 2022 13:54:22 -0600
Simon Glass [email protected] wrote:
...
Quoted 2 lines
Is there any word on this series, please?
last week I've rebased and applied this series to next (PATCH 02/14 dropped) and will submit a pull request when Tom merges last -rc into his next branch. Otherwise there will be a build error due to missing Nokia RX-51 related changes. Thanks!
--
Anatolij
Hi Anatloij,
Quoted 7 lines · Anatolij Gustschin
Hi Simon,
On Thu, 24 Mar 2022 13:54:22 -0600
Simon Glass [email protected] wrote:
...Quoted 1 line
Quoted 6 lines
Quoted 1 line
Is there any word on this series, please?
last week I've rebased and applied this series to next (PATCH 02/14 dropped) and will submit a pull request when Tom merges last -rc into his next branch. Otherwise there will be a build error due to missing Nokia RX-51 related changes. Thanks!
That's great, thank you! I was thinking of doing the same thing for LCD. What do you think?
Regards,
Simon
Hi Simon,
Quoted 12 lines · On Fri, 25 Mar 2022 11:41:54 +1300 Simon Glass [email protected] wrote:
Hi Anatloij,
Quoted 9 lines · Anatolij Gustschin
Hi Simon,
On Thu, 24 Mar 2022 13:54:22 -0600
Simon Glass [email protected] wrote:
...Quoted 2 lines
Is there any word on this series, please?
Quoted 7 lines
Quoted 4 lines
last week I've rebased and applied this series to next (PATCH 02/14 dropped) and will submit a pull request when Tom merges last -rc into his next branch. Otherwise there will be a build error due to missing Nokia RX-51 related changes. Thanks!
That's great, thank you! I was thinking of doing the same thing for LCD. What do you think?
Yes, removing CONFIG_LCD code would be good. I hope we can do frame buffer support by DM_VIDEO for boards still using LCD.
--
Anatolij
On Sun, 23 Jan 2022 07:04:01 -0700
Simon Glass [email protected] wrote:
...
Quoted 7 lines
Simon Glass (14):
video: Dropcfg_console
video:nokia_rx51: Drop obsolete video code
video: siemens: Drop unused video code
video: nexell: Drop unused and invalid code
video: Dropvideo_fbheader
video: DropCONFIG_VIDEO_BMP_LOGO
Quoted 8 lines
video: Drop references to
CONFIG_VIDEOet al
video: Clean up the uclass header
video: Drop da8xx-fb
video: fsl:colibri_vf: Drop FSL DCU driver
video: Drop FSL DIU driver
video: mxs: Drop old video code
video: ConvertCONFIG_VIDEO_BCM2835toKconfig
video: Drop formike driver
Re-based and applied to u-boot-video/next, thanks!
--
Anatolij