GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 21:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- disable CONFIG_VIDEO to remove DM conversion warnings

Browse source 
for boards: at91sam9, eb_cpu5282, ls1021aqds, ls1021atwr,
    mx23evk, mx6sxsabresd, mx7dsabresd, nokia_rx51, picosam9g45,
    sansa_fuze_plus, xfi3
 -----BEGIN PGP SIGNATURE-----
 
 iGwEABECACwWIQSC4hxrSoIUVfFO0kRM6ATMmsalXAUCX5cuIw4cYWd1c3RAZGVu
 eC5kZQAKCRBM6ATMmsalXPOIAJ9sRuY+hFpuYN1fFmc6UzMl0wr5RwCdH0eqlEAm
 8Qj5ITU7YhVIINeRVeE=
 =VNIK
 -----END PGP SIGNATURE-----

Merge tag 'video-for-2021.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-video

 - disable CONFIG_VIDEO to remove DM conversion warnings
   for boards: at91sam9, eb_cpu5282, ls1021aqds, ls1021atwr,
   mx23evk, mx6sxsabresd, mx7dsabresd, nokia_rx51, picosam9g45,
   sansa_fuze_plus, xfi3
This commit is contained in:
Tom Rini 2020-10-26 17:27:38 -04:00
commit 43428c6915
50 changed files with 75 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
board/BuS/eb_cpu5282/eb_cpu5282.c
View file

@ -20,7 +20,7 @@
DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_VIDEO
#if IS_ENABLED(CONFIG_VIDEO_VCXK)
unsigned long display_width;
unsigned long display_height;
#endif
@ -183,8 +183,7 @@ void __led_set(led_id_t mask, int state)
MCFGPTA_GPTPORT &= ~(1 << 3);
}
#if defined(CONFIG_VIDEO)
#if IS_ENABLED(CONFIG_VIDEO_VCXK)
int drv_video_init(void)
{
char *s;
@ -225,7 +224,7 @@ int drv_video_init(void)
/*---------------------------------------------------------------------------*/
#ifdef CONFIG_VIDEO
#if IS_ENABLED(CONFIG_VIDEO_VCXK)
int do_brightness(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
int rcode = 0;

4
common/stdio.c
View file

@ -356,7 +356,9 @@ int stdio_add_devices(void)
} else {
if (IS_ENABLED(CONFIG_LCD))
drv_lcd_init();
if (IS_ENABLED(CONFIG_VIDEO) || IS_ENABLED(CONFIG_CFB_CONSOLE))
if (IS_ENABLED(CONFIG_VIDEO) ||
IS_ENABLED(CONFIG_CFB_CONSOLE) ||
IS_ENABLED(CONFIG_VIDEO_VCXK))
drv_video_init();
}

2
configs/at91sam9261ek_dataflash_cs0_defconfig
View file

@ -59,4 +59,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9261ek_dataflash_cs3_defconfig
View file

@ -59,4 +59,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9261ek_nandflash_defconfig
View file

@ -56,4 +56,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9263ek_dataflash_cs0_defconfig
View file

@ -67,4 +67,4 @@ CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9263ek_dataflash_defconfig
View file

@ -67,4 +67,4 @@ CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9263ek_nandflash_defconfig
View file

@ -64,4 +64,4 @@ CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9263ek_norflash_boot_defconfig
View file

@ -67,4 +67,4 @@ CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9263ek_norflash_defconfig
View file

@ -67,4 +67,4 @@ CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9g10ek_dataflash_cs0_defconfig
View file

@ -57,4 +57,4 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9g10ek_dataflash_cs3_defconfig
View file

@ -57,4 +57,4 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9g10ek_nandflash_defconfig
View file

@ -54,4 +54,4 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9m10g45ek_mmc_defconfig
View file

@ -58,4 +58,4 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9m10g45ek_nandflash_defconfig
View file

@ -58,4 +58,4 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9n12ek_mmc_defconfig
View file

@ -62,4 +62,4 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_ATMEL_HLCD=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9n12ek_nandflash_defconfig
View file

@ -63,4 +63,4 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_ATMEL_HLCD=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9n12ek_spiflash_defconfig
View file

@ -64,4 +64,4 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_ATMEL_HLCD=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9rlek_dataflash_defconfig
View file

@ -60,4 +60,4 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9rlek_mmc_defconfig
View file

@ -56,4 +56,4 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_LCD=y
# CONFIG_LCD is not set

2
configs/at91sam9rlek_nandflash_defconfig
View file

@ -57,4 +57,4 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_LCD=y
# CONFIG_LCD is not set

3
configs/eb_cpu5282_defconfig
View file

@ -32,6 +32,5 @@ CONFIG_SYS_FLASH_CFI=y
CONFIG_DM_ETH=y
CONFIG_MCFFEC=y
CONFIG_MII=y
CONFIG_VIDEO=y
# CONFIG_CFB_CONSOLE is not set
CONFIG_VIDEO_VCXK=y
CONFIG_SPLASH_SCREEN=y

3
configs/eb_cpu5282_internal_defconfig
View file

@ -31,6 +31,5 @@ CONFIG_SYS_FLASH_CFI=y
CONFIG_DM_ETH=y
CONFIG_MCFFEC=y
CONFIG_MII=y
CONFIG_VIDEO=y
# CONFIG_CFB_CONSOLE is not set
CONFIG_VIDEO_VCXK=y
CONFIG_SPLASH_SCREEN=y

4
configs/ls1021aqds_ddr4_nor_defconfig
View file

@ -70,6 +70,6 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021aqds_ddr4_nor_lpuart_defconfig
View file

@ -70,6 +70,6 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021aqds_nand_defconfig
View file

@ -85,6 +85,6 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021aqds_nor_SECURE_BOOT_defconfig
View file

@ -67,8 +67,8 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_RSA=y
CONFIG_SPL_RSA=y

4
configs/ls1021aqds_nor_defconfig
View file

@ -71,6 +71,6 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021aqds_nor_lpuart_defconfig
View file

@ -71,6 +71,6 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021aqds_qspi_defconfig
View file

@ -70,6 +70,6 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021aqds_sdcard_ifc_defconfig
View file

@ -84,6 +84,6 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021aqds_sdcard_qspi_defconfig
View file

@ -82,6 +82,6 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021atwr_nor_SECURE_BOOT_defconfig
View file

@ -61,8 +61,8 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_RSA=y
CONFIG_SPL_RSA=y

4
configs/ls1021atwr_nor_defconfig
View file

@ -65,6 +65,6 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021atwr_nor_lpuart_defconfig
View file

@ -66,6 +66,6 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021atwr_qspi_defconfig
View file

@ -68,6 +68,6 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
View file

@ -75,8 +75,8 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_RSA=y
CONFIG_SPL_RSA=y

4
configs/ls1021atwr_sdcard_ifc_defconfig
View file

@ -78,6 +78,6 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

4
configs/ls1021atwr_sdcard_qspi_defconfig
View file

@ -79,6 +79,6 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_FSL_DCU_FB is not set
# CONFIG_VIDEO is not set
# CONFIG_VIDEO_SW_CURSOR is not set

2
configs/mx23evk_defconfig
View file

@ -37,7 +37,7 @@ CONFIG_CONS_INDEX=0
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y
# CONFIG_VIDEO is not set
CONFIG_SPLASH_SCREEN=y
CONFIG_VIDEO_BMP_GZIP=y
CONFIG_VIDEO_BMP_RLE8=y

2
configs/mx6sxsabresd_defconfig
View file

@ -73,7 +73,7 @@ CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_VIDEO=y
# CONFIG_VIDEO is not set
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_RLE8=y

2
configs/mx7dsabresd_defconfig
View file

@ -84,7 +84,7 @@ CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_VIDEO=y
# CONFIG_VIDEO is not set
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_RLE8=y

2
configs/mx7dsabresd_qspi_defconfig
View file

@ -91,7 +91,7 @@ CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_VIDEO=y
# CONFIG_VIDEO is not set
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_RLE8=y

2
configs/nokia_rx51_defconfig
View file

@ -54,7 +54,7 @@ CONFIG_USB_MUSB_HCD=y
CONFIG_USB_MUSB_UDC=y
CONFIG_USB_OMAP3=y
CONFIG_TWL4030_USB=y
CONFIG_VIDEO=y
CONFIG_CFB_CONSOLE=y
CONFIG_CFB_CONSOLE_ANSI=y
# CONFIG_VGA_AS_SINGLE_DEVICE is not set
CONFIG_SPLASH_SCREEN=y

2
configs/picosam9g45_defconfig
View file

@ -44,7 +44,7 @@ CONFIG_ATMEL_USART=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
# CONFIG_LCD is not set
CONFIG_WDT=y
CONFIG_WDT_AT91=y
CONFIG_OF_LIBFDT=y

2
configs/sansa_fuze_plus_defconfig
View file

@ -44,5 +44,5 @@ CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
CONFIG_VIDEO=y
# CONFIG_VIDEO is not set
CONFIG_OF_LIBFDT=y

2
configs/xfi3_defconfig
View file

@ -41,5 +41,5 @@ CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
CONFIG_VIDEO=y
# CONFIG_VIDEO is not set
CONFIG_OF_LIBFDT=y

9
drivers/video/Kconfig
View file

@ -665,7 +665,7 @@ config VIDEO
config CFB_CONSOLE
bool "Enable colour frame buffer console"
depends on VIDEO
depends on VIDEO || ARCH_OMAP2PLUS
default y if VIDEO
help
Enables the colour frame buffer driver. This supports colour
@ -972,4 +972,11 @@ config BMP_32BPP
help
Support display of bitmaps file with 32-bit-per-pixel.
config VIDEO_VCXK
bool "Enable VCXK video controller driver support"
default n
help
This enables VCXK driver which can be used with VC2K, VC4K
and VC8K devices on various boards from BuS Elektronik GmbH.
endmenu

4
include/configs/eb_cpu5282.h
View file

@ -212,9 +212,6 @@
* VIDEO configuration
*/
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_VCXK 1
#define CONFIG_SYS_VCXK_DEFAULT_LINEALIGN 2
#define CONFIG_SYS_VCXK_DOUBLEBUFFERED 1
#define CONFIG_SYS_VCXK_BASE CONFIG_SYS_CS2_BASE
@ -235,6 +232,5 @@
#define CONFIG_SYS_VCXK_INVERT_DDR MCFGPIO_DDRE
#define CONFIG_SYS_VCXK_INVERT_PIN MCFGPIO_PORT2
#endif /* CONFIG_VIDEO */
#endif /* _CONFIG_M5282EVB_H */
/*---------------------------------------------------------------------*/

1
scripts/config_whitelist.txt
View file

@ -4067,7 +4067,6 @@ CONFIG_VIDEO_MB862xx_ACCEL
CONFIG_VIDEO_MXS
CONFIG_VIDEO_MXS_MODE_SYSTEM
CONFIG_VIDEO_STD_TIMINGS
CONFIG_VIDEO_VCXK
CONFIG_VID_FLS_ENV
CONFIG_VM86
CONFIG_VOIPAC_LCD