From: Hans de Goede Date: Wed, 24 Dec 2014 15:00:38 +0000 (+0100) Subject: sunxi: A13-OLinuXino defconfigs: Enable VGA output, add lcd-mode for 7" LCD X-Git-Tag: v2015.04-rc1~135 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5ef5263b9a071cddf9697848b583c6ed5c514ea6;p=u-boot sunxi: A13-OLinuXino defconfigs: Enable VGA output, add lcd-mode for 7" LCD Enable VGA output on the A13-OLinuXino and A13-OLinuXinoM now that we've support for it. Also add LCD timing and gpio info for the Olimex 7" LCD module. We can safely put this in the default config on this boards, since by default we will always use VGA, and the LCD timing info will only get used if the user explicitly sets monitor=lcd in the video-mode env. variable. Signed-off-by: Hans de Goede Acked-by: Ian Campbell --- diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig index be8652b459..1a994180b5 100644 --- a/configs/A13-OLinuXinoM_defconfig +++ b/configs/A13-OLinuXinoM_defconfig @@ -2,8 +2,13 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI" CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb" CONFIG_USB1_VBUS_PIN="PG11" -CONFIG_VIDEO=n -CONFIG_USB_KEYBOARD=n +CONFIG_VIDEO_HDMI=n +CONFIG_VIDEO_VGA_VIA_LCD=y +# For use with the Olimex 7" LCD module, adjust timings for other displays +# Set video-mode=sunxi:800x600-24@60,monitor=lcd in the env. to enable +CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:3,vmode:0" +CONFIG_VIDEO_LCD_POWER="PB10" +CONFIG_VIDEO_LCD_BL_PWM="PB2" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN5I=y diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index 654e12aaa3..7df69517f6 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -2,8 +2,13 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI" CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb" CONFIG_USB1_VBUS_PIN="PG11" -CONFIG_VIDEO=n -CONFIG_USB_KEYBOARD=n +CONFIG_VIDEO_HDMI=n +CONFIG_VIDEO_VGA_VIA_LCD=y +# For use with the Olimex 7" LCD module, adjust timings for other displays +# Set video-mode=sunxi:800x600-24@60,monitor=lcd in the env. to enable +CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:3,vmode:0" +CONFIG_VIDEO_LCD_POWER="AXP0-0" +CONFIG_VIDEO_LCD_BL_PWM="PB2" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN5I=y