diff options
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/linux/linux-leviathan/defconfig | 100 | ||||
| -rw-r--r-- | recipes/linux/linux-leviathan_git.bb | 7 |
2 files changed, 80 insertions, 27 deletions
diff --git a/recipes/linux/linux-leviathan/defconfig b/recipes/linux/linux-leviathan/defconfig index 4ad5d6b4ca..8440011255 100644 --- a/recipes/linux/linux-leviathan/defconfig +++ b/recipes/linux/linux-leviathan/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32 -# Fri Apr 16 00:42:36 2010 +# Linux kernel version: 2.6.32.9 +# Tue Jul 13 12:08:03 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -191,6 +191,10 @@ CONFIG_ARCH_MSM=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set # CONFIG_ARCH_BCMRING is not set +CONFIG_ARCH_MSM7X00A=y +# CONFIG_ARCH_QSD8X50 is not set +CONFIG_ARCH_MSM_ARM11=y +CONFIG_MSM_MDP22=y CONFIG_MSM_AMSS_VERSION=6225 # CONFIG_MSM_AMSS_VERSION_6210 is not set # CONFIG_MSM_AMSS_VERSION_6220 is not set @@ -208,6 +212,7 @@ CONFIG_MSM_DEBUG_UART_NONE=y CONFIG_MACH_TROUT=y # CONFIG_MACH_SAPPHIRE is not set CONFIG_HTC_HEADSET=y +# CONFIG_HTC_35MM_JACK is not set CONFIG_TROUT_BATTCHG=y CONFIG_TROUT_WIFI=m CONFIG_HTC_PWRSINK=y @@ -239,7 +244,9 @@ CONFIG_MSM_ONCRPCROUTER=y CONFIG_MSM_RPCSERVERS=y # CONFIG_MSM_CPU_FREQ_SCREEN is not set # CONFIG_MSM_HW3D is not set -# CONFIG_HTC_FB_CONSOLE is not set +CONFIG_MSM_ADSP=y +CONFIG_MSM_ADSP_REPORT_EVENTS=y +# CONFIG_MSM_CLOCK_CTRL_DEBUG is not set CONFIG_WIFI_CONTROL_FUNC=y CONFIG_WIFI_MEM_PREALLOC=y # CONFIG_VIRTUAL_KPANIC_PARTITION is not set @@ -298,6 +305,7 @@ CONFIG_AEABI=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_HIGHMEM is not set +CONFIG_VMALLOC_RESERVE=0x08000000 CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -658,18 +666,18 @@ CONFIG_BT_HCIUART_LL=y # CONFIG_AF_RXRPC is not set CONFIG_FIB_RULES=y CONFIG_WIRELESS=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set CONFIG_CFG80211_DEVELOPER_WARNINGS=y CONFIG_CFG80211_REG_DEBUG=y -CONFIG_CFG80211_DEFAULT_PS=y -CONFIG_CFG80211_DEFAULT_PS_VALUE=1 +# CONFIG_CFG80211_DEFAULT_PS is not set +CONFIG_CFG80211_DEFAULT_PS_VALUE=0 # CONFIG_CFG80211_DEBUGFS is not set # CONFIG_WIRELESS_OLD_REGULATORY is not set CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y # CONFIG_LIB80211 is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MAC80211_RC_DEFAULT_PID is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y @@ -767,6 +775,7 @@ CONFIG_MTD_MSM_NAND=y # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND is not set # CONFIG_MTD_ONENAND is not set @@ -788,7 +797,9 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set +# CONFIG_MG_DISK is not set CONFIG_MISC_DEVICES=y +CONFIG_ANDROID_PMEM=y # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_KERNEL_DEBUGGER_CORE is not set @@ -796,7 +807,6 @@ CONFIG_MISC_DEVICES=y CONFIG_UID_STAT=y # CONFIG_WL127X_RFKILL is not set # CONFIG_APANIC is not set -CONFIG_APANIC_PLABEL="kpanic" # CONFIG_C2PORT is not set # @@ -869,10 +879,11 @@ CONFIG_WLAN_80211=y # CONFIG_B43 is not set # CONFIG_B43LEGACY is not set # CONFIG_RT2X00 is not set -CONFIG_WL12XX=y -CONFIG_WL1251=y -CONFIG_WL1251_SDIO=y +CONFIG_WL12XX=m +CONFIG_WL1251=m +CONFIG_WL1251_SDIO=m # CONFIG_IWM is not set +# CONFIG_BCM4329 is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -942,6 +953,7 @@ CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_AD7879_I2C is not set # CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_CYPRESS_TMG is not set # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set @@ -953,9 +965,8 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_MSM is not set CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y -CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI_MT_EXTENSION=y -# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI_MT_PROTOCOL is not set # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set @@ -971,6 +982,8 @@ CONFIG_INPUT_KEYCHORD=y # CONFIG_INPUT_CM109 is not set CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=y +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_CAPELLA_CM3602 is not set # # Hardware I/O ports @@ -1007,6 +1020,7 @@ CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CLOCK_CONTROL=y CONFIG_SERIAL_MSM_RX_WAKEUP=y CONFIG_SERIAL_MSM_HS=y +# CONFIG_SERIAL_BCM_BT_LPM is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set @@ -1052,8 +1066,10 @@ CONFIG_I2C_MSM=y # CONFIG_DS1682 is not set # CONFIG_SENSORS_TSL2550 is not set CONFIG_SENSORS_AKM8976=y +# CONFIG_SENSORS_AKM8973 is not set CONFIG_SENSORS_PCA963X=y # CONFIG_SENSORS_MT9T013 is not set +# CONFIG_VP_A1026 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -1064,12 +1080,40 @@ CONFIG_SENSORS_PCA963X=y # PPS support # # CONFIG_PPS is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# + +# +# AC97 GPIO expanders: +# # CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_DS2784 is not set # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_HWMON is not set @@ -1087,9 +1131,13 @@ CONFIG_SSB_POSSIBLE=y # # CONFIG_MFD_CORE is not set # CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set # CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set # CONFIG_TWL4030_CORE is not set # CONFIG_MFD_TMIO is not set +# CONFIG_MFD_TC6393XB is not set # CONFIG_PMIC_DA903X is not set # CONFIG_MFD_WM8400 is not set # CONFIG_MFD_WM831X is not set @@ -1130,13 +1178,13 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set CONFIG_FB_MSM=y -CONFIG_MSMFB_FBIOBLANK=y CONFIG_FB_MSM_REFRESH=y -CONFIG_FB_MSM_LOGO=y -CONFIG_FB_MSM_LOGO_SOURCE="/logo.rle" -# CONFIG_FB_BROADSHEET is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_PLATFORM is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y @@ -1259,11 +1307,6 @@ CONFIG_USB_ETH_RNDIS=y # # CONFIG_USB_GPIO_VBUS is not set # CONFIG_NOP_USB_XCEIV is not set - -# -# USB Function Support -# -# CONFIG_USB_FUNCTION is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y @@ -1308,6 +1351,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +# CONFIG_LEDS_TRIGGER_GPIO is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set CONFIG_LEDS_TRIGGER_SLEEP=y @@ -1395,6 +1439,14 @@ CONFIG_ANDROID=y CONFIG_ANDROID_TIMED_OUTPUT=y CONFIG_ANDROID_TIMED_GPIO=y # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set + +# +# Qualcomm MSM Camera And Video +# + +# +# Camera Sensor Selection +# # CONFIG_DST is not set # CONFIG_POHMELFS is not set # CONFIG_PLAN9AUTH is not set @@ -1623,6 +1675,7 @@ CONFIG_TIMER_STATS=y # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y @@ -1644,6 +1697,7 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_SYSCTL_SYSCALL_CHECK is not set # CONFIG_PAGE_POISONING is not set CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set # CONFIG_DYNAMIC_DEBUG is not set diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb index f5a7d21e0e..d3d9fc035c 100644 --- a/recipes/linux/linux-leviathan_git.bb +++ b/recipes/linux/linux-leviathan_git.bb @@ -2,16 +2,15 @@ require linux.inc DEPENDS += "android-image-utils-native" PV = "2.6.32+${PR}+gitr${SRCREV}" -PR = "r19" +PR = "r20" COMPATIBLE_MACHINE = "htcdream" CMDLINE = "console=tty1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M" -SRCREV_LAST_GOOD = "2402bb32e564fb3b802c4a23d4a3f1fd0faa8d17" -SRCREV = "636fa4daf243826ef6cebb64dd0509f3b079fcb5" +SRCREV = "1ee84e3fcdf91917842c150ded113c540ece1841" SRC_URI = "\ - git://gitorious.org/htc-msm-2-6-32/leviathan-incoming.git;protocol=git;branch=msm-gnuconform \ + git://gitorious.org/htc-msm-2-6-32/leviathan-incoming.git;protocol=git;branch=android-msm-2.6.32-rebase \ file://defconfig \ " S = "${WORKDIR}/git" |