Skip to content

Commit

Permalink
t769: Update defconfig in keeping with recent kernel updates.
Browse files Browse the repository at this point in the history
      Re-add S6E63M0_WVGA to Kconfig and Makefile.

Change-Id: I0fa88b50975c3607df99aa6e08c5205cfee80025
  • Loading branch information
UberPinguin committed Oct 1, 2013
1 parent d97e330 commit 7efb34d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 15 deletions.
26 changes: 11 additions & 15 deletions arch/arm/configs/cyanogenmod_t769_defconfig
@@ -1,3 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 3.0.89 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_HAVE_SCHED_CLOCK=y
Expand Down Expand Up @@ -438,21 +442,17 @@ CONFIG_TARGET_SERIES_CELOX=y
CONFIG_TARGET_LOCALE_USA=y
# CONFIG_TARGET_LOCALE_JPN is not set
# CONFIG_TARGET_LOCALE_EUR is not set
# CONFIG_TARGET_LOCALE_HKTW is not set
# CONFIG_USA_OPERATOR_ATT is not set
CONFIG_USA_OPERATOR_TMO=y
# CONFIG_CAN_OPERATOR_RWC is not set
# CONFIG_USA_MODEL_SGH_I717 is not set
# CONFIG_USA_MODEL_SGH_I727 is not set
# CONFIG_USA_MODEL_SGH_I727R is not set
# CONFIG_USA_MODEL_SGH_I757 is not set
# CONFIG_USA_MODEL_SGH_T989 is not set
CONFIG_USA_MODEL_SGH_T769=y
# CONFIG_USA_MODEL_SGH_I957 is not set
# CONFIG_USA_MODEL_SGH_I577 is not set
# CONFIG_SAMSUNG_8X60_TABLET is not set
# CONFIG_SAMSUNG_MEMORY_LAYOUT_ARRANGE is not set
# CONFIG_EUR_MODEL_GT_I9210 is not set
CONFIG_SEC_AUDIO_DEVICE=y
# CONFIG_SEC_EXTRA_VOLUME_SOL is not set
CONFIG_SEC_DVFS=y
Expand Down Expand Up @@ -499,6 +499,7 @@ CONFIG_BT_BCM4330=y
CONFIG_BT_MGMT=y
# CONFIG_MSM_FAKE_BATTERY is not set
CONFIG_MSM_QDSP6_APR=y
CONFIG_MSM_QDSP6_CODECS=y
# CONFIG_MSM_AUDIO_QDSP6 is not set
# CONFIG_VP_A2220 is not set
# CONFIG_MSM_RPC_VIBRATOR is not set
Expand Down Expand Up @@ -1228,9 +1229,7 @@ CONFIG_SEC_MISC=y
# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LIS3_I2C is not set
CONFIG_VIBETONZ=m
CONFIG_PN544=y
# CONFIG_STMPE811_ADC is not set
CONFIG_GENERIC_BLN=y
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set

Expand Down Expand Up @@ -2226,15 +2225,9 @@ CONFIG_MSM_CAMERA=y
# CONFIG_VX6953 is not set
# CONFIG_SENSOR_M5MO is not set
CONFIG_SENSOR_ISX012=y
# CONFIG_SENSOR_S5K5CCAF is not set
CONFIG_SENSOR_S5K6AAFX=y
# CONFIG_SENSOR_S5K5BAFX is not set
# CONFIG_SENSOR_S5K5BAFX_P5 is not set
# CONFIG_SENSOR_SR200PC20M is not set
# CONFIG_MT9M114 is not set
# CONFIG_WEBCAM_OV7692 is not set
# CONFIG_WEBCAM_OV9726 is not set
# CONFIG_VX6953 is not set
# CONFIG_MT9E013 is not set
# CONFIG_IMX074_ACT is not set
# CONFIG_QS_S5K4E1 is not set
Expand Down Expand Up @@ -2289,6 +2282,7 @@ CONFIG_MSM_KGSL_PAGE_TABLE_SIZE=0xFFF0000
CONFIG_MSM_KGSL_PAGE_TABLE_COUNT=24
CONFIG_MSM_KGSL_MMU_PAGE_FAULT=y
# CONFIG_MSM_KGSL_DISABLE_SHADOW_WRITES is not set
CONFIG_KGSL_COMPAT=y
# CONFIG_VGASTATE is not set
CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
Expand Down Expand Up @@ -2638,7 +2632,6 @@ CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
CONFIG_USB_SEC_WHITELIST=y
# CONFIG_USB_MON is not set
# CONFIG_USB_WUSB is not set
# CONFIG_USB_WUSB_CBAF is not set
Expand Down Expand Up @@ -3021,7 +3014,6 @@ CONFIG_MACH_NO_WESTBRIDGE=y
CONFIG_MSM_SSBI=y
# CONFIG_SPS is not set
CONFIG_CLKDEV_LOOKUP=y
CONFIG_ACCESSORY=y

#
# File systems
Expand Down Expand Up @@ -3227,7 +3219,9 @@ CONFIG_DEBUG_FS=y
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set
CONFIG_LOCKUP_DETECTOR=y
# CONFIG_HARDLOCKUP_DETECTOR is not set
# CONFIG_HARDLOCKUP_DETECTOR_NMI is not set
CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU=y
CONFIG_HARDLOCKUP_DETECTOR=y
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
Expand Down Expand Up @@ -3291,6 +3285,7 @@ CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACER_MAX_TRACE=y
CONFIG_RING_BUFFER=y
CONFIG_EVENT_TRACING=y
CONFIG_GPU_TRACEPOINTS=y
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
Expand Down Expand Up @@ -3485,6 +3480,7 @@ CONFIG_CRC16=y
CONFIG_CRC32=y
# CONFIG_CRC7 is not set
CONFIG_LIBCRC32C=y
CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
Expand Down
7 changes: 7 additions & 0 deletions drivers/video/msm/Kconfig
Expand Up @@ -460,6 +460,13 @@ config FB_MSM_LCDC_LD9040_WVGA_PANEL
---help---
Support for LCDC LD9040 WVGA (480x800) panel

config FB_MSM_LCDC_S6E63M0_WVGA_PANEL
depends on FB_MSM_LCDC_HW
bool "LCDC S6B63M0 WVGA Panel"
select FB_MSM_LCDC_S6E63M0_WVGA
---help---
Support for LCDC S6E63M0 WVGA (480x800) panel

config FB_MSM_LCDC_GORDON_VGA_PANEL
depends on FB_MSM_LCDC_HW
bool "LCDC Gordon VGA Panel"
Expand Down

0 comments on commit 7efb34d

Please sign in to comment.