mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
eb_cpu5282: fix CONFIG_DM_VIDEO build warnings
Remove CONFIG_VIDEO dependency to fix board removal warnings. Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: Jens Scharsig <esw@bus-elektronik.de>
This commit is contained in:
parent
2310620960
commit
8c9940d5ec
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
#ifdef CONFIG_VIDEO
|
#if IS_ENABLED(CONFIG_VIDEO_VCXK)
|
||||||
unsigned long display_width;
|
unsigned long display_width;
|
||||||
unsigned long display_height;
|
unsigned long display_height;
|
||||||
#endif
|
#endif
|
||||||
|
@ -183,8 +183,7 @@ void __led_set(led_id_t mask, int state)
|
||||||
MCFGPTA_GPTPORT &= ~(1 << 3);
|
MCFGPTA_GPTPORT &= ~(1 << 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_VIDEO)
|
#if IS_ENABLED(CONFIG_VIDEO_VCXK)
|
||||||
|
|
||||||
int drv_video_init(void)
|
int drv_video_init(void)
|
||||||
{
|
{
|
||||||
char *s;
|
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 do_brightness(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
|
||||||
{
|
{
|
||||||
int rcode = 0;
|
int rcode = 0;
|
||||||
|
|
|
@ -356,7 +356,9 @@ int stdio_add_devices(void)
|
||||||
} else {
|
} else {
|
||||||
if (IS_ENABLED(CONFIG_LCD))
|
if (IS_ENABLED(CONFIG_LCD))
|
||||||
drv_lcd_init();
|
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();
|
drv_video_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,5 @@ CONFIG_SYS_FLASH_CFI=y
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_MCFFEC=y
|
CONFIG_MCFFEC=y
|
||||||
CONFIG_MII=y
|
CONFIG_MII=y
|
||||||
CONFIG_VIDEO=y
|
CONFIG_VIDEO_VCXK=y
|
||||||
# CONFIG_CFB_CONSOLE is not set
|
|
||||||
CONFIG_SPLASH_SCREEN=y
|
CONFIG_SPLASH_SCREEN=y
|
||||||
|
|
|
@ -31,6 +31,5 @@ CONFIG_SYS_FLASH_CFI=y
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_MCFFEC=y
|
CONFIG_MCFFEC=y
|
||||||
CONFIG_MII=y
|
CONFIG_MII=y
|
||||||
CONFIG_VIDEO=y
|
CONFIG_VIDEO_VCXK=y
|
||||||
# CONFIG_CFB_CONSOLE is not set
|
|
||||||
CONFIG_SPLASH_SCREEN=y
|
CONFIG_SPLASH_SCREEN=y
|
||||||
|
|
|
@ -972,4 +972,11 @@ config BMP_32BPP
|
||||||
help
|
help
|
||||||
Support display of bitmaps file with 32-bit-per-pixel.
|
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
|
endmenu
|
||||||
|
|
|
@ -212,9 +212,6 @@
|
||||||
* VIDEO configuration
|
* VIDEO configuration
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CONFIG_VIDEO
|
|
||||||
#define CONFIG_VIDEO_VCXK 1
|
|
||||||
|
|
||||||
#define CONFIG_SYS_VCXK_DEFAULT_LINEALIGN 2
|
#define CONFIG_SYS_VCXK_DEFAULT_LINEALIGN 2
|
||||||
#define CONFIG_SYS_VCXK_DOUBLEBUFFERED 1
|
#define CONFIG_SYS_VCXK_DOUBLEBUFFERED 1
|
||||||
#define CONFIG_SYS_VCXK_BASE CONFIG_SYS_CS2_BASE
|
#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_DDR MCFGPIO_DDRE
|
||||||
#define CONFIG_SYS_VCXK_INVERT_PIN MCFGPIO_PORT2
|
#define CONFIG_SYS_VCXK_INVERT_PIN MCFGPIO_PORT2
|
||||||
|
|
||||||
#endif /* CONFIG_VIDEO */
|
|
||||||
#endif /* _CONFIG_M5282EVB_H */
|
#endif /* _CONFIG_M5282EVB_H */
|
||||||
/*---------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------*/
|
||||||
|
|
|
@ -4067,7 +4067,6 @@ CONFIG_VIDEO_MB862xx_ACCEL
|
||||||
CONFIG_VIDEO_MXS
|
CONFIG_VIDEO_MXS
|
||||||
CONFIG_VIDEO_MXS_MODE_SYSTEM
|
CONFIG_VIDEO_MXS_MODE_SYSTEM
|
||||||
CONFIG_VIDEO_STD_TIMINGS
|
CONFIG_VIDEO_STD_TIMINGS
|
||||||
CONFIG_VIDEO_VCXK
|
|
||||||
CONFIG_VID_FLS_ENV
|
CONFIG_VID_FLS_ENV
|
||||||
CONFIG_VM86
|
CONFIG_VM86
|
||||||
CONFIG_VOIPAC_LCD
|
CONFIG_VOIPAC_LCD
|
||||||
|
|
Loading…
Reference in New Issue
Block a user