mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-26 04:17:09 +00:00
video: Drop CONFIG_VIDEO_BMP_LOGO
This option is not implemented anymore. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
fff49e01d8
commit
82975f8a9e
29 changed files with 0 additions and 43 deletions
1
README
1
README
|
@ -980,7 +980,6 @@ The following options need to be configured:
|
||||||
CONFIG_VIDEO
|
CONFIG_VIDEO
|
||||||
CONFIG_VIDEO_SW_CURSOR
|
CONFIG_VIDEO_SW_CURSOR
|
||||||
CONFIG_VGA_AS_SINGLE_DEVICE
|
CONFIG_VGA_AS_SINGLE_DEVICE
|
||||||
CONFIG_VIDEO_BMP_LOGO
|
|
||||||
|
|
||||||
The DIU driver will look for the 'video-mode' environment
|
The DIU driver will look for the 'video-mode' environment
|
||||||
variable, and if defined, enable the DIU as a console during
|
variable, and if defined, enable the DIU as a console during
|
||||||
|
|
|
@ -369,7 +369,6 @@
|
||||||
#undef CONFIG_FSL_DIU_FB /* RDB doesn't support DIU */
|
#undef CONFIG_FSL_DIU_FB /* RDB doesn't support DIU */
|
||||||
#ifdef CONFIG_FSL_DIU_FB
|
#ifdef CONFIG_FSL_DIU_FB
|
||||||
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
|
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
/*
|
/*
|
||||||
* With CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS, flash I/O is really slow, so
|
* With CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS, flash I/O is really slow, so
|
||||||
* disable empty flash sector detection, which is I/O-intensive.
|
* disable empty flash sector detection, which is I/O-intensive.
|
||||||
|
|
|
@ -352,7 +352,6 @@
|
||||||
#ifdef CONFIG_FSL_DIU_FB
|
#ifdef CONFIG_FSL_DIU_FB
|
||||||
#define CONFIG_FSL_DIU_CH7301
|
#define CONFIG_FSL_DIU_CH7301
|
||||||
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
|
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,6 @@
|
||||||
#define CONFIG_USBD_HS
|
#define CONFIG_USBD_HS
|
||||||
|
|
||||||
/* Framebuffer and LCD */
|
/* Framebuffer and LCD */
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define CONFIG_IMX_HDMI
|
#define CONFIG_IMX_HDMI
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
#define CONFIG_IMX_VIDEO_SKIP
|
||||||
|
|
||||||
|
|
|
@ -438,7 +438,6 @@
|
||||||
/* Framebuffer */
|
/* Framebuffer */
|
||||||
/* check this console not needed, after test remove it */
|
/* check this console not needed, after test remove it */
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
#define CONFIG_IMX_VIDEO_SKIP
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
|
|
||||||
#define CONFIG_IMX6_PWM_PER_CLK 66000000
|
#define CONFIG_IMX6_PWM_PER_CLK 66000000
|
||||||
|
|
||||||
|
|
|
@ -171,8 +171,6 @@
|
||||||
/* Display */
|
/* Display */
|
||||||
#define CONFIG_IMX_HDMI
|
#define CONFIG_IMX_HDMI
|
||||||
|
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
|
|
||||||
/* EEPROM */
|
/* EEPROM */
|
||||||
|
|
||||||
#endif /* __CONFIG_CM_FX6_H */
|
#endif /* __CONFIG_CM_FX6_H */
|
||||||
|
|
|
@ -165,7 +165,6 @@
|
||||||
|
|
||||||
#if defined(CONFIG_DM_VIDEO)
|
#if defined(CONFIG_DM_VIDEO)
|
||||||
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
|
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* __COLIBRI_IMX6ULL_CONFIG_H */
|
#endif /* __COLIBRI_IMX6ULL_CONFIG_H */
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
#define CONFIG_USBD_HS
|
#define CONFIG_USBD_HS
|
||||||
|
|
||||||
/* Framebuffer and LCD */
|
/* Framebuffer and LCD */
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define CONFIG_IMX_HDMI
|
#define CONFIG_IMX_HDMI
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
#define CONFIG_IMX_VIDEO_SKIP
|
||||||
|
|
||||||
|
|
|
@ -201,8 +201,4 @@
|
||||||
|
|
||||||
#define CONFIG_USBD_HS
|
#define CONFIG_USBD_HS
|
||||||
|
|
||||||
#if defined(CONFIG_DM_VIDEO)
|
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
#include <linux/sizes.h>
|
#include <linux/sizes.h>
|
||||||
|
|
||||||
#ifdef CONFIG_VIDEO_FSL_DCU_FB
|
#ifdef CONFIG_VIDEO_FSL_DCU_FB
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define CONFIG_SYS_FSL_DCU_LE
|
#define CONFIG_SYS_FSL_DCU_LE
|
||||||
|
|
||||||
#define CONFIG_SYS_DCU_ADDR DCU0_BASE_ADDR
|
#define CONFIG_SYS_DCU_ADDR DCU0_BASE_ADDR
|
||||||
|
|
|
@ -50,7 +50,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Framebuffer */
|
/* Framebuffer */
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define CONFIG_IMX_HDMI
|
#define CONFIG_IMX_HDMI
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
#define CONFIG_IMX_VIDEO_SKIP
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,6 @@
|
||||||
/* Framebuffer and LCD */
|
/* Framebuffer and LCD */
|
||||||
#define CONFIG_IMX_HDMI
|
#define CONFIG_IMX_HDMI
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
#define CONFIG_IMX_VIDEO_SKIP
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define CONFIG_HIDE_LOGO_VERSION /* Custom config to hide U-boot version */
|
#define CONFIG_HIDE_LOGO_VERSION /* Custom config to hide U-boot version */
|
||||||
|
|
||||||
/* Miscellaneous configurable options */
|
/* Miscellaneous configurable options */
|
||||||
|
|
|
@ -152,8 +152,6 @@
|
||||||
/* Framebuffer */
|
/* Framebuffer */
|
||||||
#ifdef CONFIG_VIDEO_IPUV3
|
#ifdef CONFIG_VIDEO_IPUV3
|
||||||
# define CONFIG_IMX_VIDEO_SKIP
|
# define CONFIG_IMX_VIDEO_SKIP
|
||||||
|
|
||||||
# define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* SPL */
|
/* SPL */
|
||||||
|
|
|
@ -21,8 +21,6 @@
|
||||||
DMAMEM_SZ_ALL)
|
DMAMEM_SZ_ALL)
|
||||||
|
|
||||||
#ifdef CONFIG_DM_VIDEO
|
#ifdef CONFIG_DM_VIDEO
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
"stdin=serial\0" \
|
"stdin=serial\0" \
|
||||||
"stdout=serial,vidconsole\0" \
|
"stdout=serial,vidconsole\0" \
|
||||||
|
|
|
@ -303,8 +303,6 @@
|
||||||
* Video
|
* Video
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_VIDEO_FSL_DCU_FB
|
#ifdef CONFIG_VIDEO_FSL_DCU_FB
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
|
|
||||||
#define CONFIG_FSL_DIU_CH7301
|
#define CONFIG_FSL_DIU_CH7301
|
||||||
#define CONFIG_SYS_I2C_DVI_BUS_NUM 0
|
#define CONFIG_SYS_I2C_DVI_BUS_NUM 0
|
||||||
#define CONFIG_SYS_I2C_QIXIS_ADDR 0x66
|
#define CONFIG_SYS_I2C_QIXIS_ADDR 0x66
|
||||||
|
|
|
@ -193,8 +193,6 @@
|
||||||
* Video
|
* Video
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_VIDEO_FSL_DCU_FB
|
#ifdef CONFIG_VIDEO_FSL_DCU_FB
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
|
|
||||||
#define CONFIG_FSL_DCU_SII9022A
|
#define CONFIG_FSL_DCU_SII9022A
|
||||||
#define CONFIG_SYS_I2C_DVI_BUS_NUM 1
|
#define CONFIG_SYS_I2C_DVI_BUS_NUM 1
|
||||||
#define CONFIG_SYS_I2C_DVI_ADDR 0x39
|
#define CONFIG_SYS_I2C_DVI_ADDR 0x39
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Framebuffer */
|
/* Framebuffer */
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define CONFIG_IMX_HDMI
|
#define CONFIG_IMX_HDMI
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
#define CONFIG_IMX_VIDEO_SKIP
|
||||||
|
|
||||||
|
|
|
@ -151,7 +151,6 @@
|
||||||
/* Environment organization */
|
/* Environment organization */
|
||||||
|
|
||||||
/* Framebuffer */
|
/* Framebuffer */
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define CONFIG_IMX_HDMI
|
#define CONFIG_IMX_HDMI
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
#define CONFIG_IMX_VIDEO_SKIP
|
||||||
|
|
||||||
|
|
|
@ -145,7 +145,6 @@
|
||||||
|
|
||||||
#ifndef CONFIG_SPL_BUILD
|
#ifndef CONFIG_SPL_BUILD
|
||||||
#ifdef CONFIG_DM_VIDEO
|
#ifdef CONFIG_DM_VIDEO
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR
|
#define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -145,7 +145,6 @@
|
||||||
|
|
||||||
#ifndef CONFIG_SPL_BUILD
|
#ifndef CONFIG_SPL_BUILD
|
||||||
#if defined(CONFIG_DM_VIDEO)
|
#if defined(CONFIG_DM_VIDEO)
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
|
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -122,8 +122,4 @@
|
||||||
|
|
||||||
#define CONFIG_USBD_HS
|
#define CONFIG_USBD_HS
|
||||||
|
|
||||||
#ifdef CONFIG_DM_VIDEO
|
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -41,7 +41,6 @@
|
||||||
/* LCD */
|
/* LCD */
|
||||||
#ifndef CONFIG_SPL_BUILD
|
#ifndef CONFIG_SPL_BUILD
|
||||||
#ifdef CONFIG_DM_VIDEO
|
#ifdef CONFIG_DM_VIDEO
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
|
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -133,7 +133,6 @@
|
||||||
#define CONFIG_FEC_MXC_PHYADDR 1
|
#define CONFIG_FEC_MXC_PHYADDR 1
|
||||||
|
|
||||||
/* Framebuffer */
|
/* Framebuffer */
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define CONFIG_IMX_HDMI
|
#define CONFIG_IMX_HDMI
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
#define CONFIG_IMX_VIDEO_SKIP
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,6 @@
|
||||||
#define CONFIG_BOARD_SIZE_LIMIT 715776
|
#define CONFIG_BOARD_SIZE_LIMIT 715776
|
||||||
|
|
||||||
#ifdef CONFIG_DM_VIDEO
|
#ifdef CONFIG_DM_VIDEO
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
|
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -119,10 +119,6 @@
|
||||||
#define CONFIG_POWER_PFUZE3000
|
#define CONFIG_POWER_PFUZE3000
|
||||||
#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08
|
#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08
|
||||||
|
|
||||||
#ifdef CONFIG_DM_VIDEO
|
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* FLASH and environment organization */
|
/* FLASH and environment organization */
|
||||||
|
|
||||||
/* Environment starts at 768k = 768 * 1024 = 786432 */
|
/* Environment starts at 768k = 768 * 1024 = 786432 */
|
||||||
|
|
|
@ -76,7 +76,6 @@
|
||||||
|
|
||||||
#if defined(CONFIG_VIDEO)
|
#if defined(CONFIG_VIDEO)
|
||||||
#define CONFIG_VIDEO_DA8XX
|
#define CONFIG_VIDEO_DA8XX
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE
|
#define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE
|
||||||
#define PWM_TICKS 0x1388
|
#define PWM_TICKS 0x1388
|
||||||
#define PWM_DUTY 0x200
|
#define PWM_DUTY 0x200
|
||||||
|
|
|
@ -69,7 +69,6 @@
|
||||||
|
|
||||||
#if defined(CONFIG_VIDEO)
|
#if defined(CONFIG_VIDEO)
|
||||||
#define CONFIG_VIDEO_DA8XX
|
#define CONFIG_VIDEO_DA8XX
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE
|
#define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE
|
||||||
|
|
||||||
#define BOARD_LCD_RESET 115 /* Bank 3 pin 19 */
|
#define BOARD_LCD_RESET 115 /* Bank 3 pin 19 */
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
#define CONFIG_MXC_USB_FLAGS 0
|
#define CONFIG_MXC_USB_FLAGS 0
|
||||||
|
|
||||||
/* Framebuffer */
|
/* Framebuffer */
|
||||||
#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
#define CONFIG_IMX_HDMI
|
#define CONFIG_IMX_HDMI
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
#define CONFIG_IMX_VIDEO_SKIP
|
||||||
|
|
||||||
|
|
|
@ -2009,7 +2009,6 @@ CONFIG_U_BOOT_HDR_SIZE
|
||||||
CONFIG_VAR_SIZE_SPL
|
CONFIG_VAR_SIZE_SPL
|
||||||
CONFIG_VERY_BIG_RAM
|
CONFIG_VERY_BIG_RAM
|
||||||
CONFIG_VIDEO_BCM2835
|
CONFIG_VIDEO_BCM2835
|
||||||
CONFIG_VIDEO_BMP_LOGO
|
|
||||||
CONFIG_VIDEO_DA8XX
|
CONFIG_VIDEO_DA8XX
|
||||||
CONFIG_VSC7385_ENET
|
CONFIG_VSC7385_ENET
|
||||||
CONFIG_VSC7385_IMAGE
|
CONFIG_VSC7385_IMAGE
|
||||||
|
|
Loading…
Add table
Reference in a new issue