diff --git a/README b/README index 59965980ec6f9a22d6e2f92cde63164630268501..7443b9fd41fe151ca3afa3a51a33eadc0f747557 100644 --- a/README +++ b/README @@ -1619,35 +1619,12 @@ CBFS (Coreboot Filesystem) support instead. - Video support: - CONFIG_VIDEO_CT69000 - - Enable Chips & Technologies 69000 Video chip - CONFIG_VIDEO_SMI_LYNXEM Enable Silicon Motion SMI 712/710/810 Video chip. The video output is selected via environment 'videoout' (1 = LCD and 2 = CRT). If videoout is undefined, CRT is assumed. - For the CT69000 and SMI_LYNXEM drivers, videomode is - selected via environment 'videomode'. Two different ways - are possible: - - "videomode=num" 'num' is a standard LiLo mode numbers. - Following standard modes are supported (* is default): - - Colors 640x480 800x600 1024x768 1152x864 1280x1024 - -------------+--------------------------------------------- - 8 bits | 0x301* 0x303 0x305 0x161 0x307 - 15 bits | 0x310 0x313 0x316 0x162 0x319 - 16 bits | 0x311 0x314 0x317 0x163 0x31A - 24 bits | 0x312 0x315 0x318 ? 0x31B - -------------+--------------------------------------------- - (i.e. setenv videomode 317; saveenv; reset;) - - - "videomode=bootargs" all the video parameters are parsed - from the bootargs. (See drivers/video/videomodes.c) - - CONFIG_VIDEO_SED13806 Enable Epson SED13806 driver. This driver supports 8bpp and 16bpp modes defined by CONFIG_VIDEO_SED13806_8BPP diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig index 84be16e6a2bf10e2973810fae3c838acd78d18ea..b5f4d93890148fb1d4b27b1077eefdc47eb1bbf8 100644 --- a/configs/MIP405T_defconfig +++ b/configs/MIP405T_defconfig @@ -16,3 +16,4 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y +CONFIG_VIDEO_CT69000=y diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig index 9c77df8233a766c179545476c40957f53a40d2ae..4eb1856decddc9d65aa97c146de95875ea17454e 100644 --- a/configs/MIP405_defconfig +++ b/configs/MIP405_defconfig @@ -19,3 +19,4 @@ CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_VIDEO_CT69000=y diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig index 114bdcb6e6e4b47fa479e37622f0b1b5d60b58fc..2a42dc02e6380324032aea83f2c0894cef5d431a 100644 --- a/configs/PIP405_defconfig +++ b/configs/PIP405_defconfig @@ -19,3 +19,4 @@ CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_VIDEO_CT69000=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index d3e0a1a9a03928fc206518afc7dbec35f07a3daf..f43053fbf61a60db8ec3b859a295207bdbe32e79 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -493,6 +493,33 @@ config CFB_CONSOLE_ANSI erase functions and limited graphics rendition control). Normal output from U-Boot will pass through this filter. +config VIDEO_CT69000 + bool "Enable Chips & Technologies 69000 video driver" + depends on VIDEO + help + This enables a frame buffer driver for the Chips & Technologies + ct69000, a fairly old graphics device (circa 2000) which is used + on some hardware. It operates over the ISA bus, and supports + some acceleration features. + + For the CT69000 and SMI_LYNXEM drivers, videomode is + selected via environment 'videomode'. Two different ways + are possible: + - "videomode=num" 'num' is a standard LiLo mode numbers. + Following standard modes are supported (* is default): + + Colors 640x480 800x600 1024x768 1152x864 1280x1024 + -------------+--------------------------------------------- + 8 bits | 0x301* 0x303 0x305 0x161 0x307 + 15 bits | 0x310 0x313 0x316 0x162 0x319 + 16 bits | 0x311 0x314 0x317 0x163 0x31A + 24 bits | 0x312 0x315 0x318 ? 0x31B + -------------+--------------------------------------------- + (i.e. setenv videomode 317; saveenv; reset;) + + - "videomode=bootargs" all the video parameters are parsed + from the bootargs. (See drivers/video/videomodes.c) + config LCD bool "Enable legacy LCD support" help diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index ce3071c7a6832946325123804013d9dcc7b916a3..11f16c5c73d8cc549bc071c1385325d444b55369 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -339,7 +339,6 @@ /************************************************************ * Video support ************************************************************/ -#define CONFIG_VIDEO_CT69000 #define CONFIG_VIDEO_LOGO #define CONFIG_CONSOLE_EXTRA_INFO #define CONFIG_VGA_AS_SINGLE_DEVICE diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 85701fd717282a9affb8bdf5ed97b8b28301e61b..f43f221104bbdb050badf76e17aa0507e19d2ebc 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -299,7 +299,6 @@ /************************************************************ * Video support ************************************************************/ -#define CONFIG_VIDEO_CT69000 #define CONFIG_VIDEO_LOGO #define CONFIG_CONSOLE_EXTRA_INFO #define CONFIG_VGA_AS_SINGLE_DEVICE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index dbc8ca8ffa4675d6c5fc121544587c3226d7b219..745dd541bcab25cd9ccd9085c6291eb96e328c37 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -8260,7 +8260,6 @@ CONFIG_VIDEO_BMP_GZIP CONFIG_VIDEO_BMP_LOGO CONFIG_VIDEO_BMP_RLE8 CONFIG_VIDEO_CORALP -CONFIG_VIDEO_CT69000 CONFIG_VIDEO_DA8XX CONFIG_VIDEO_DT_SIMPLEFB CONFIG_VIDEO_FONT_4X6