summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-06-15 22:25:15 +0100
committerAndy Green <andy.green@linaro.org>2011-06-15 22:25:15 +0100
commitd65a8ef1151bfbf6d82ef814eea87e1b825f9c4e (patch)
tree09a116a7affe6f9edb9e8bf395e5eab93863a3b7
parent211d3508555ffbc1c358d816b8abbc1d3acca87c (diff)
sgx config use correct framebuffer type for android
With this boot.scr, we get workable sgx on Android $ cat boot.txt setenv bootcmd 'fatload mmc 0:1 0x80200000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80200000 0x81600000' setenv bootargs 'console=tty0 console=ttyO2,115200n8 rootwait ro fixrtc nocompcache loglevel=5 mem=456M@0x80000000 mem=512M@0xA0000000 init=/init androidboot.console=ttyO2 vram=32M omapfb.vram=0:16M,1:16M omapdss.def_disp=hdmi consoleblank=0 omapdss.debug=y omapfb.debug=y' boot Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--arch/arm/configs/android_omap4_defconfig10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/configs/android_omap4_defconfig b/arch/arm/configs/android_omap4_defconfig
index dccbc9c8dab..570f3cb1b4b 100644
--- a/arch/arm/configs/android_omap4_defconfig
+++ b/arch/arm/configs/android_omap4_defconfig
@@ -131,23 +131,28 @@ CONFIG_TWL4030_WATCHDOG=y
CONFIG_REGULATOR_TWL4030=y
CONFIG_REGULATOR_TPS65023=y
CONFIG_REGULATOR_TPS6507X=y
-CONFIG_DRM=y
-CONFIG_DRM_OMAP_NUM_CRTCS=2
CONFIG_SGX540=y
+CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
+CONFIG_OMAP2_DSS=y
CONFIG_OMAP2_VRAM_SIZE=32
+# CONFIG_OMAP2_DSS_DEBUG_SUPPORT is not set
# CONFIG_OMAP2_DSS_VENC is not set
CONFIG_OMAP2_DSS_SDI=y
CONFIG_OMAP2_DSS_DSI=y
CONFIG_OMAP2_DSS_FAKE_VSYNC=y
+CONFIG_FB_OMAP2=y
+# CONFIG_FB_OMAP2_DEBUG_SUPPORT is not set
+CONFIG_FB_OMAP2_NUM_FBS=2
CONFIG_PANEL_GENERIC_DPI=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_PLATFORM=y
CONFIG_DISPLAY_SUPPORT=y
CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FONTS=y
CONFIG_FONT_7x14=y
CONFIG_LOGO=y
@@ -201,6 +206,7 @@ CONFIG_ANDROID_LOGGER=y
CONFIG_ANDROID_RAM_CONSOLE=y
CONFIG_ANDROID_TIMED_GPIO=y
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+CONFIG_DMM_DMA_API=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS=y