Pandora Sourcecodes - openembedded.git/blob

   1 From ab6c9baa5cc8ae3a922ae4baef2550d399b41550 Mon Sep 17 00:00:00 2001
   2 From: Martin Jansa <Martin.Jansa@gmail.com>
   3 Date: Sun, 8 Nov 2009 10:48:28 +0100
   4 Subject: [PATCH 4/7] gta02_drm_defconfig: start from gta02_packaging_defconfig
   5
   6 ---
   7  arch/arm/configs/gta02_drm_defconfig |   40 +++++++++++++--------------------
   8  1 files changed, 16 insertions(+), 24 deletions(-)
   9
  10 diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig
  11 index 5349014..e2dbbef 100644
  12 --- a/arch/arm/configs/gta02_drm_defconfig
  13 +++ b/arch/arm/configs/gta02_drm_defconfig
  14 @@ -1,7 +1,7 @@
  15  #
  16  # Automatically generated make config: don't edit
  17  # Linux kernel version: 2.6.29-rc3
  18 -# Thu Jul  2 20:40:33 2009
  19 +# Fri Oct  2 20:51:57 2009
  20  #
  21  CONFIG_ARM=y
  22  CONFIG_HAVE_PWM=y
  23 @@ -35,7 +35,7 @@ CONFIG_EXPERIMENTAL=y
  24  CONFIG_BROKEN_ON_SMP=y
  25  CONFIG_LOCK_KERNEL=y
  26  CONFIG_INIT_ENV_ARG_LIMIT=32
  27 -CONFIG_LOCALVERSION=""
  28 +CONFIG_LOCALVERSION="-mokodev"
  29  # CONFIG_LOCALVERSION_AUTO is not set
  30  CONFIG_SWAP=y
  31  CONFIG_SYSVIPC=y
  32 @@ -180,7 +180,7 @@ CONFIG_S3C24XX_PWM=y
  33  CONFIG_S3C24XX_GPIO_EXTRA=0
  34  CONFIG_S3C2410_DMA=y
  35  # CONFIG_S3C2410_DMA_DEBUG is not set
  36 -# CONFIG_S3C24XX_ADC is not set
  37 +CONFIG_S3C24XX_ADC=y
  38  CONFIG_MACH_SMDK=y
  39  CONFIG_MACH_NEO1973=y
  40  CONFIG_PLAT_S3C=y
  41 @@ -1084,7 +1084,6 @@ CONFIG_I2C=y
  42  CONFIG_I2C_BOARDINFO=y
  43  CONFIG_I2C_CHARDEV=y
  44  CONFIG_I2C_HELPER_AUTO=y
  45 -CONFIG_I2C_ALGOBIT=y
  46
  47  #
  48  # I2C Hardware Bus support
  49 @@ -1181,7 +1180,7 @@ CONFIG_APM_POWER=y
  50  CONFIG_CHARGER_PCF50633=y
  51  CONFIG_BATTERY_BQ27000_HDQ=y
  52  CONFIG_HDQ_GPIO_BITBANG=y
  53 -# CONFIG_BATTERY_GTA01 is not set
  54 +CONFIG_BATTERY_GTA01=m
  55  CONFIG_HWMON=y
  56  # CONFIG_HWMON_VID is not set
  57  # CONFIG_SENSORS_AD7414 is not set
  58 @@ -1283,14 +1282,11 @@ CONFIG_PCF50633_ADC=y
  59  CONFIG_PCF50633_GPIO=y
  60  # CONFIG_MFD_PCF50606 is not set
  61  CONFIG_MFD_GLAMO=y
  62 -
  63 -#
  64 -# SMedia Glamo 336x/337x engine drivers
  65 -#
  66 -# CONFIG_MFD_GLAMO_FB is not set
  67 +CONFIG_MFD_GLAMO_FB=y
  68 +CONFIG_MFD_GLAMO_FB_XGLAMO_WORKAROUND=y
  69  CONFIG_MFD_GLAMO_SPI_GPIO=y
  70 +CONFIG_MFD_GLAMO_SPI_FB=y
  71  CONFIG_MFD_GLAMO_MCI=y
  72 -CONFIG_MFD_GLAMO_DRM=y
  73
  74  #
  75  # Multimedia devices
  76 @@ -1312,7 +1308,6 @@ CONFIG_DAB=y
  77  #
  78  # Graphics support
  79  #
  80 -CONFIG_DRM=y
  81  # CONFIG_VGASTATE is not set
  82  CONFIG_VIDEO_OUTPUT_CONTROL=y
  83  CONFIG_FB=y
  84 @@ -1790,17 +1785,14 @@ CONFIG_STAGING=y
  85  #
  86  # Android
  87  #
  88 -CONFIG_ANDROID=y
  89 -CONFIG_ANDROID_BINDER_IPC=y
  90 -CONFIG_ANDROID_LOGGER=y
  91 -CONFIG_ANDROID_RAM_CONSOLE=y
  92 -CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
  93 -# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set
  94 -# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
  95 -CONFIG_ANDROID_TIMED_GPIO=y
  96 -CONFIG_ANDROID_LOW_MEMORY_KILLER=y
  97 +# CONFIG_ANDROID is not set
  98 +# CONFIG_ANDROID_BINDER_IPC is not set
  99 +# CONFIG_ANDROID_LOGGER is not set
 100 +# CONFIG_ANDROID_RAM_CONSOLE is not set
 101 +# CONFIG_ANDROID_TIMED_GPIO is not set
 102 +# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 103  # CONFIG_ANDROID_WAKELOCK is not set
 104 -CONFIG_ANDROID_PARANOID_NETWORK=y
 105 +# CONFIG_ANDROID_PARANOID_NETWORK is not set
 106
 107  #
 108  # File systems
 109 @@ -1958,7 +1950,7 @@ CONFIG_NLS_CODEPAGE_850=m
 110  # CONFIG_NLS_CODEPAGE_863 is not set
 111  # CONFIG_NLS_CODEPAGE_864 is not set
 112  # CONFIG_NLS_CODEPAGE_865 is not set
 113 -# CONFIG_NLS_CODEPAGE_866 is not set
 114 +CONFIG_NLS_CODEPAGE_866=m
 115  # CONFIG_NLS_CODEPAGE_869 is not set
 116  CONFIG_NLS_CODEPAGE_936=m
 117  CONFIG_NLS_CODEPAGE_950=m
 118 @@ -1967,7 +1959,7 @@ CONFIG_NLS_CODEPAGE_950=m
 119  # CONFIG_NLS_CODEPAGE_874 is not set
 120  # CONFIG_NLS_ISO8859_8 is not set
 121  # CONFIG_NLS_CODEPAGE_1250 is not set
 122 -# CONFIG_NLS_CODEPAGE_1251 is not set
 123 +CONFIG_NLS_CODEPAGE_1251=m
 124  # CONFIG_NLS_ASCII is not set
 125  CONFIG_NLS_ISO8859_1=y
 126  # CONFIG_NLS_ISO8859_2 is not set
 127 --
 128 1.6.5.2
 129