summaryrefslogtreecommitdiff
path: root/recipes/linux/linux-davinci/hawkboard
diff options
context:
space:
mode:
authorRoger Monk <r-monk@ti.com>2010-02-10 22:51:45 +0000
committerKoen Kooi <koen@openembedded.org>2010-04-12 19:43:19 +0200
commit7176279b74b61c8b6144c2d14b9e97560a60fb00 (patch)
treeed3c7f6862c21aa7deadec48bbb6f2c2cdaae524 /recipes/linux/linux-davinci/hawkboard
parent9f68ac692a56c028fe191b4fb37a356ddc326677 (diff)
linux-davinci: Start using multi-kernel flow for da850-omapl138-evm
* Main defconfig now has more options 'angstrom'-like * Note USB gadget disabled while debugging * Update to latest master da850-omapl138 kernel + config mods * All configs add ts driver added (since now multifunction device) * Added 'stats' version with extra pm config options (kernel stats/etc) * new config for uicapture + lcd display * More options + OHCI enabled in 'regular' config * Remove da850-omapl138 merged patches * Add new patches for Hawkboard Kernel * Introduce board file for hawkboard * Remove machine patch * Config update * All peripherals sanity tested * OK - Console, Enet, Audio, Display, USB OHCI, Video Capture, MMC, NAND, SATA * Some Issues - USB OTG disconnect problems * KO - RTC, (PM, etc) * increase kernel partition to 4MiB for hawkboard * dm6467t-evm is SOC_FAMILY=dm6467 Signed-off-by: Roger Monk <r-monk@ti.com> Signed-off-by: Koen Kooi <k-kooi@ti.com>
Diffstat (limited to 'recipes/linux/linux-davinci/hawkboard')
-rw-r--r--recipes/linux/linux-davinci/hawkboard/defconfig841
-rw-r--r--recipes/linux/linux-davinci/hawkboard/patch-2.6.33rc4-psp-to-hawkboard.patch892
-rw-r--r--recipes/linux/linux-davinci/hawkboard/patch_hawk.diff196
3 files changed, 1455 insertions, 474 deletions
diff --git a/recipes/linux/linux-davinci/hawkboard/defconfig b/recipes/linux/linux-davinci/hawkboard/defconfig
index 63ce472d0c..a203146b77 100644
--- a/recipes/linux/linux-davinci/hawkboard/defconfig
+++ b/recipes/linux/linux-davinci/hawkboard/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32-rc6
-# Mon Mar 1 20:45:34 2010
+# Linux kernel version: 2.6.33-rc4
+# Mon Feb 22 11:08:40 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -34,6 +34,12 @@ CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
@@ -50,6 +56,7 @@ CONFIG_TASK_DELAY_ACCT=y
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
@@ -78,7 +85,6 @@ CONFIG_EMBEDDED=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
@@ -102,9 +108,7 @@ CONFIG_COMPAT_BRK=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
+# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
CONFIG_HAVE_KPROBES=y
@@ -115,7 +119,8 @@ CONFIG_HAVE_CLK=y
# GCOV-based kernel profiling
#
# CONFIG_GCOV_KERNEL is not set
-# CONFIG_SLOW_WORK is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_SLOW_WORK_DEBUG is not set
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
@@ -129,21 +134,48 @@ CONFIG_MODVERSIONS=y
CONFIG_BLOCK=y
CONFIG_LBDAF=y
CONFIG_BLK_DEV_BSG=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_INTEGRITY=y
#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-# CONFIG_FREEZER is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_UNLOCK is not set
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_UNLOCK is not set
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_UNLOCK is not set
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+CONFIG_FREEZER=y
#
# System Type
@@ -171,6 +203,7 @@ CONFIG_MMU=y
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_DOVE is not set
# CONFIG_ARCH_KIRKWOOD is not set
# CONFIG_ARCH_LOKI is not set
# CONFIG_ARCH_MV78XX0 is not set
@@ -193,6 +226,7 @@ CONFIG_MMU=y
CONFIG_ARCH_DAVINCI=y
# CONFIG_ARCH_OMAP is not set
# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_U8500 is not set
CONFIG_CP_INTC=y
#
@@ -207,9 +241,12 @@ CONFIG_CP_INTC=y
# CONFIG_ARCH_DAVINCI_DM646x is not set
# CONFIG_ARCH_DAVINCI_DA830 is not set
CONFIG_ARCH_DAVINCI_DA850=y
+CONFIG_DA8XX_MAX_SPEED_300=y
+# CONFIG_DA8XX_MAX_SPEED_372 is not set
+# CONFIG_DA8XX_MAX_SPEED_408 is not set
+# CONFIG_DA8XX_MAX_SPEED_456 is not set
CONFIG_ARCH_DAVINCI_DA8XX=y
# CONFIG_ARCH_DAVINCI_DM365 is not set
-CONFIG_CPPI41=y
#
# DaVinci Board Type
@@ -218,6 +255,8 @@ CONFIG_MACH_DAVINCI_DA850_EVM=y
CONFIG_DA850_UI_NONE=y
# CONFIG_DA850_UI_RMII is not set
# CONFIG_DA850_UI_CLCD is not set
+# CONFIG_DA850_UI_VIDEO_PORT is not set
+CONFIG_MACH_OMAPL138_HAWKBOARD=y
CONFIG_DAVINCI_MUX=y
# CONFIG_DAVINCI_MUX_DEBUG is not set
# CONFIG_DAVINCI_MUX_WARNINGS is not set
@@ -229,7 +268,6 @@ CONFIG_DAVINCI_MCBSP1=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
@@ -286,17 +324,14 @@ CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_SPLIT_PTLOCK_CPUS=999999
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_LEDS=y
-# CONFIG_LEDS_CPU is not set
+# CONFIG_LEDS is not set
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -307,7 +342,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE=" debug "
# CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
#
# CPU Power Management
@@ -316,7 +352,7 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_DEBUG is not set
CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
@@ -346,13 +382,19 @@ CONFIG_CPU_IDLE_GOV_MENU=y
CONFIG_BINFMT_ELF=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_HAVE_AOUT=y
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=m
#
# Power management options
#
-# CONFIG_PM is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_APM_EMULATION is not set
+# CONFIG_PM_RUNTIME is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_NET=y
@@ -410,6 +452,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET6_XFRM_MODE_BEET=m
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_TUNNEL is not set
# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -569,20 +612,136 @@ CONFIG_NET_CLS_ROUTE=y
# Network testing
#
# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+# CONFIG_CAN_MCP251X is not set
+# CONFIG_CAN_SJA1000 is not set
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+# CONFIG_IRNET is not set
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+# CONFIG_GIRBIL_DONGLE is not set
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
# CONFIG_AF_RXRPC is not set
-# CONFIG_WIRELESS is not set
+CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
CONFIG_LIB80211=m
CONFIG_LIB80211_CRYPT_WEP=m
CONFIG_LIB80211_CRYPT_CCMP=m
CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_RC_PID is not set
+CONFIG_MAC80211_RC_MINSTREL=y
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel"
+# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
# CONFIG_NET_9P is not set
#
@@ -600,10 +759,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=m
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CONNECTOR is not set
+CONFIG_CONNECTOR=m
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_TESTS is not set
@@ -630,10 +787,8 @@ CONFIG_MTD_BLOCK=y
#
# RAM/ROM/Flash chip drivers
#
-CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI is not set
# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -644,10 +799,6 @@ CONFIG_MTD_CFI_I1=y
CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_CFI_I4 is not set
# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
# CONFIG_MTD_RAM is not set
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_ABSENT is not set
@@ -656,9 +807,6 @@ CONFIG_MTD_CFI_UTIL=y
# Mapping drivers for chip access
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_PLATRAM is not set
#
@@ -700,12 +848,25 @@ CONFIG_MTD_NAND_DAVINCI=y
#
# UBI - Unsorted block images
#
-# CONFIG_MTD_UBI is not set
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# CONFIG_BLK_DEV_DRBD is not set
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=y
@@ -716,9 +877,12 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_MG_DISK is not set
CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_ISL29003 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
# CONFIG_C2PORT is not set
#
@@ -728,7 +892,8 @@ CONFIG_EEPROM_AT24=y
# CONFIG_EEPROM_AT25 is not set
# CONFIG_EEPROM_LEGACY is not set
# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
+CONFIG_EEPROM_93CX6=m
+# CONFIG_IWMC3200TOP is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -777,10 +942,32 @@ CONFIG_SCSI_LOWLEVEL=y
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_VERBOSE_ERROR=y
-# CONFIG_SATA_PMP is not set
+CONFIG_SATA_PMP=y
CONFIG_SATA_AHCI=y
# CONFIG_ATA_SFF is not set
-# CONFIG_MD is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_RAID6_PQ=m
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
CONFIG_BONDING=m
@@ -799,7 +986,7 @@ CONFIG_PHYLIB=y
CONFIG_LXT_PHY=y
# CONFIG_CICADA_PHY is not set
# CONFIG_VITESSE_PHY is not set
-# CONFIG_SMSC_PHY is not set
+CONFIG_SMSC_PHY=y
# CONFIG_BROADCOM_PHY is not set
# CONFIG_ICPLUS_PHY is not set
# CONFIG_REALTEK_PHY is not set
@@ -833,21 +1020,53 @@ CONFIG_TI_DAVINCI_EMAC=y
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN_80211=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+CONFIG_AT76C50X_USB=m
CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_ATH_COMMON is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
+# CONFIG_IWM is not set
+# CONFIG_LIBERTAS is not set
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WL12XX=m
+CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
+CONFIG_WL1251_SDIO=m
+CONFIG_WL1271=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+# CONFIG_WIMAX_IWMC3200_SDIO is not set
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
#
# USB Network Adapters
@@ -875,6 +1094,7 @@ CONFIG_USB_ARMLINUX=y
# CONFIG_USB_EPSON2888 is not set
# CONFIG_USB_KC2190 is not set
CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_HSO=m
CONFIG_USB_NET_INT51X1=m
# CONFIG_WAN is not set
CONFIG_PPP=m
@@ -903,17 +1123,15 @@ CONFIG_NET_POLL_CONTROLLER=y
CONFIG_INPUT=y
# CONFIG_INPUT_FF_MEMLESS is not set
# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
#
# Userland interfaces
#
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_MOUSEDEV is not set
# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers
@@ -925,6 +1143,7 @@ CONFIG_KEYBOARD_ATKBD=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=y
# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
# CONFIG_KEYBOARD_MAX7359 is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_OPENCORES is not set
@@ -940,6 +1159,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
# CONFIG_TOUCHSCREEN_EETI is not set
# CONFIG_TOUCHSCREEN_FUJITSU is not set
# CONFIG_TOUCHSCREEN_GUNZE is not set
@@ -955,7 +1175,9 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_TSC2004 is not set
# CONFIG_TOUCHSCREEN_W90X900 is not set
+CONFIG_TOUCHSCREEN_TPS6507X=y
# CONFIG_INPUT_MISC is not set
#
@@ -965,6 +1187,7 @@ CONFIG_SERIO=y
CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
# CONFIG_GAMEPORT is not set
#
@@ -1008,7 +1231,7 @@ CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
#
# I2C Hardware Bus support
@@ -1019,7 +1242,7 @@ CONFIG_I2C_ALGOBIT=m
#
CONFIG_I2C_DAVINCI=y
# CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_GPIO=y
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_SIMTEC is not set
@@ -1039,23 +1262,22 @@ CONFIG_I2C_DAVINCI=y
#
# Miscellaneous I2C Chip support
#
-# CONFIG_DS1682 is not set
# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CHIP is not set
CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_MASTER=y
#
# SPI Master Controller Drivers
#
CONFIG_SPI_DAVINCI=y
-CONFIG_SPI_DAVINCI_DMA=y
CONFIG_SPI_BITBANG=y
# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
#
# SPI Protocol Masters
@@ -1069,7 +1291,6 @@ CONFIG_SPI_BITBANG=y
# 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
#
@@ -1082,6 +1303,7 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX732X is not set
CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCF857X=y
+# CONFIG_GPIO_ADP5588 is not set
#
# PCI GPIO expanders:
@@ -1130,12 +1352,14 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_HTC_EGPIO is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_TPS65010 is not set
+CONFIG_TPS6507x=y
# CONFIG_TWL4030_CORE is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_T7L66XB is not set
# CONFIG_MFD_TC6387XB is not set
# CONFIG_MFD_TC6393XB is not set
# CONFIG_PMIC_DA903X is not set
+# CONFIG_PMIC_ADP5520 is not set
# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM831X is not set
# CONFIG_MFD_WM8350_I2C is not set
@@ -1143,6 +1367,8 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_MFD_MC13783 is not set
# CONFIG_AB3100_CORE is not set
# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_88PM8607 is not set
+# CONFIG_AB4500_CORE is not set
CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
@@ -1150,16 +1376,17 @@ CONFIG_REGULATOR=y
# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
# CONFIG_REGULATOR_BQ24022 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_LP3971 is not set
# CONFIG_REGULATOR_TPS65023 is not set
CONFIG_REGULATOR_TPS6507X=y
-CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUPPORT=y
#
# Multimedia core support
#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2_COMMON=y
CONFIG_VIDEO_ALLOW_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_DVB_CORE=m
@@ -1168,6 +1395,8 @@ CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
#
+CONFIG_IR_CORE=y
+CONFIG_VIDEO_IR=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_CUSTOMISE=y
@@ -1188,40 +1417,106 @@ CONFIG_MEDIA_TUNER_XC5000=m
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEOBUF_GEN=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEOBUF_GEN=y
CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DMA_CONTIG=y
CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_IR=m
CONFIG_VIDEO_TVEEPROM=m
CONFIG_VIDEO_TUNER=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TDA9875 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
CONFIG_VIDEO_MSP3400=m
+# CONFIG_VIDEO_CS5345 is not set
CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+
+#
+# RDS decoders
+#
+# CONFIG_VIDEO_SAA6588 is not set
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_SAA7110 is not set
CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7191 is not set
+CONFIG_VIDEO_TVP514X=y
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+
+#
+# Video and audio decoders
+#
CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
CONFIG_VIDEO_CX2341X=m
-# CONFIG_VIDEO_VIVI is not set
-CONFIG_VIDEO_VPSS_SYSTEM=m
-CONFIG_VIDEO_VPFE_CAPTURE=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_VIDEO_AU0828=m
+
+#
+# Video encoders
+#
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+
+#
+# Video improvement chips
+#
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY is not set
+CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE=y
+CONFIG_VIDEO_DAVINCI_VPIF=y
+CONFIG_VIDEO_VIVI=m
+# CONFIG_VIDEO_VPSS_SYSTEM is not set
+# CONFIG_VIDEO_VPFE_CAPTURE is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_VIDEO_AU0828 is not set
# CONFIG_SOC_CAMERA is not set
CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS=y
CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
CONFIG_USB_GSPCA=m
# CONFIG_USB_M5602 is not set
@@ -1236,6 +1531,7 @@ CONFIG_USB_GSPCA=m
# CONFIG_USB_GSPCA_OV519 is not set
# CONFIG_USB_GSPCA_OV534 is not set
# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7302 is not set
# CONFIG_USB_GSPCA_PAC7311 is not set
# CONFIG_USB_GSPCA_SN9C20X is not set
# CONFIG_USB_GSPCA_SONIXB is not set
@@ -1249,6 +1545,7 @@ CONFIG_USB_GSPCA=m
# CONFIG_USB_GSPCA_SQ905 is not set
# CONFIG_USB_GSPCA_SQ905C is not set
# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_STV0680 is not set
# CONFIG_USB_GSPCA_SUNPLUS is not set
# CONFIG_USB_GSPCA_T613 is not set
# CONFIG_USB_GSPCA_TV8532 is not set
@@ -1304,7 +1601,7 @@ CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
CONFIG_DVB_USB_A800=m
CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
CONFIG_DVB_USB_DIBUSB_MC=m
CONFIG_DVB_USB_DIB0700=m
CONFIG_DVB_USB_UMT_010=m
@@ -1329,13 +1626,8 @@ CONFIG_DVB_USB_DTV5100=m
CONFIG_DVB_USB_AF9015=m
CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_FRIIO=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-# CONFIG_SMS_USB_DRV is not set
-# CONFIG_SMS_SDIO_DRV is not set
+CONFIG_DVB_USB_EC168=m
+# CONFIG_SMS_SIANO_MDTV is not set
#
# Supported FlexCopII (B2C2) Adapters
@@ -1348,19 +1640,19 @@ CONFIG_DVB_B2C2_FLEXCOP_USB=m
# Supported DVB Frontends
#
# CONFIG_DVB_FE_CUSTOMISE is not set
-CONFIG_DVB_CX24123=m
+CONFIG_DVB_STB6100=m
CONFIG_DVB_MT312=m
CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
CONFIG_DVB_STV0288=m
CONFIG_DVB_STB6000=m
CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
CONFIG_DVB_TDA826X=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
CONFIG_DVB_CX22702=m
CONFIG_DVB_TDA1004X=m
CONFIG_DVB_NXT6000=m
@@ -1372,21 +1664,17 @@ CONFIG_DVB_DIB7000M=m
CONFIG_DVB_DIB7000P=m
CONFIG_DVB_TDA10048=m
CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
CONFIG_DVB_TDA10021=m
CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
CONFIG_DVB_S5H1411=m
CONFIG_DVB_DIB8000=m
CONFIG_DVB_PLL=m
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6421=m
CONFIG_DVB_LGS8GL5=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -1397,7 +1685,7 @@ CONFIG_USB_DABUSB=m
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FIRMWARE_EDID=y
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
CONFIG_FB_CFB_FILLRECT=y
@@ -1412,12 +1700,13 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
#
# Frame buffer hardware drivers
#
+# CONFIG_FB_UVESA is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_DAVINCI is not set
# CONFIG_FB_VIRTUAL is not set
@@ -1461,32 +1750,36 @@ CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
+CONFIG_SND_HWDEP=y
+CONFIG_SND_RAWMIDI=y
CONFIG_SND_JACK=y
-# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_SEQUENCER=m
+# CONFIG_SND_SEQ_DUMMY is not set
# CONFIG_SND_MIXER_OSS is not set
# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_SEQUENCER_OSS is not set
CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_RAWMIDI_SEQ is not set
+CONFIG_SND_RAWMIDI_SEQ=m
# CONFIG_SND_OPL3_LIB_SEQ is not set
# CONFIG_SND_OPL4_LIB_SEQ is not set
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_DRIVERS=y
# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
CONFIG_SND_ARM=y
CONFIG_SND_SPI=y
CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO=y
CONFIG_SND_USB_CAIAQ=m
CONFIG_SND_USB_CAIAQ_INPUT=y
CONFIG_SND_SOC=y
@@ -1505,7 +1798,7 @@ CONFIG_HIDRAW=y
# USB Input Devices
#
CONFIG_USB_HID=y
-CONFIG_HID_PID=y
+# CONFIG_HID_PID is not set
CONFIG_USB_HIDDEV=y
#
@@ -1536,6 +1829,7 @@ CONFIG_USB_HIDDEV=y
# CONFIG_HID_SMARTJOYPLUS is not set
# CONFIG_HID_TOPSEED is not set
# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
# CONFIG_HID_ZEROPLUS is not set
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
@@ -1551,6 +1845,7 @@ CONFIG_USB=y
# CONFIG_USB_DEVICEFS is not set
# CONFIG_USB_DEVICE_CLASS is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
+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
@@ -1570,17 +1865,14 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_U132_HCD is not set
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_HWA_HCD is not set
CONFIG_USB_MUSB_HDRC=y
CONFIG_USB_MUSB_SOC=y
-# CONFIG_USB_MUSB_HOST is not set
+CONFIG_USB_MUSB_HOST=y
# CONFIG_USB_MUSB_PERIPHERAL is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
# CONFIG_USB_MUSB_OTG is not set
-CONFIG_USB_GADGET_MUSB_HDRC=y
CONFIG_USB_MUSB_HDRC_HCD=y
# CONFIG_MUSB_PIO_ONLY is not set
# CONFIG_USB_INVENTRA_DMA is not set
@@ -1621,72 +1913,13 @@ CONFIG_USB_STORAGE=y
#
# USB Imaging devices
#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
#
# USB port drivers
#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_DEBUG=m
+# CONFIG_USB_SERIAL is not set
#
# USB Miscellaneous drivers
@@ -1713,64 +1946,25 @@ CONFIG_USB_IOWARRIOR=m
# CONFIG_USB_TEST is not set
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_VST is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_PXA25X is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-# CONFIG_USB_GADGET_S3C_HSOTG is not set
-# CONFIG_USB_GADGET_IMX is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_FSL_QE is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_AUDIO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_FILE_STORAGE_TEST=y
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-CONFIG_USB_CDC_COMPOSITE=m
+# CONFIG_USB_GADGET is not set
#
# OTG and related infrastructure
#
CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ULPI is not set
CONFIG_NOP_USB_XCEIV=y
-CONFIG_UWB=m
-# CONFIG_UWB_HWA is not set
-# CONFIG_UWB_WLP is not set
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_UNSAFE_RESUME=y
#
# MMC/SD/SDIO Card Drivers
#
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_SDIO_UART is not set
+CONFIG_SDIO_UART=m
# CONFIG_MMC_TEST is not set
#
@@ -1782,7 +1976,35 @@ CONFIG_MMC_BLOCK_BOUNCE=y
CONFIG_MMC_DAVINCI=y
# CONFIG_MMC_SPI is not set
# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
# CONFIG_ACCESSIBILITY is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
@@ -1812,6 +2034,7 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
# CONFIG_RTC_DRV_S35390A is not set
# CONFIG_RTC_DRV_FM3130 is not set
# CONFIG_RTC_DRV_RX8581 is not set
@@ -1841,7 +2064,9 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_M48T86 is not set
# CONFIG_RTC_DRV_M48T35 is not set
# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
# CONFIG_RTC_DRV_V3020 is not set
#
@@ -1855,7 +2080,41 @@ CONFIG_RTC_DRV_OMAP=y
#
# TI VLYNQ
#
-# CONFIG_STAGING is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+CONFIG_PRISM2_USB=m
+# CONFIG_ECHO is not set
+CONFIG_OTUS=m
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_INPUT_MIMIO is not set
+# CONFIG_TRANZPORT is not set
+
+#
+# Qualcomm MSM Camera And Video
+#
+
+#
+# Camera Sensor Selection
+#
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_PLAN9AUTH is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_VT6656 is not set
+# CONFIG_FB_UDL is not set
+
+#
+# RAR Register Driver
+#
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_IIO is not set
+# CONFIG_RAMZSWAP is not set
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_STRIP is not set
+# CONFIG_FB_SM7XX is not set
#
# File systems
@@ -1871,28 +2130,52 @@ CONFIG_EXT3_FS_XATTR=y
# CONFIG_EXT4_FS is not set
CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+# CONFIG_REISERFS_FS_POSIX_ACL is not set
+# CONFIG_REISERFS_FS_SECURITY is not set
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
CONFIG_FS_POSIX_ACL=y
CONFIG_XFS_FS=m
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
# CONFIG_XFS_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
+CONFIG_GFS2_FS=m
+# CONFIG_GFS2_FS_LOCKING_DLM is not set
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_NILFS2_FS is not set
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
+CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_QUOTA_TREE=m
+# CONFIG_QFMT_V1 is not set
+# CONFIG_QFMT_V2 is not set
+CONFIG_QUOTACTL=y
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=m
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
CONFIG_GENERIC_ACL=y
#
@@ -1903,8 +2186,11 @@ CONFIG_GENERIC_ACL=y
#
# CD-ROM/DVD Filesystems
#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
@@ -1926,12 +2212,12 @@ CONFIG_SYSFS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
+CONFIG_CONFIGFS_FS=m
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
+CONFIG_HFSPLUS_FS=m
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
@@ -1946,8 +2232,16 @@ CONFIG_JFFS2_ZLIB=y
# CONFIG_JFFS2_LZO is not set
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
CONFIG_CRAMFS=y
-# CONFIG_SQUASHFS is not set
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
# CONFIG_VXFS_FS is not set
CONFIG_MINIX_FS=m
# CONFIG_OMFS_FS is not set
@@ -1990,7 +2284,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
+CONFIG_BSD_DISKLABEL=y
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
@@ -2040,7 +2334,7 @@ CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=m
+CONFIG_NLS_UTF8=y
# CONFIG_DLM is not set
#
@@ -2087,13 +2381,7 @@ CONFIG_STACKTRACE=y
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_WRITECOUNT is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
@@ -2114,12 +2402,9 @@ CONFIG_TRACING_SUPPORT=y
# CONFIG_DYNAMIC_DEBUG is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
# CONFIG_ARM_UNWIND is not set
# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_LL is not set
+# CONFIG_OC_ETM is not set
#
# Security options
@@ -2133,20 +2418,20 @@ CONFIG_CRYPTO=y
#
# Crypto core or helper
#
-CONFIG_CRYPTO_ALGAPI=m
-CONFIG_CRYPTO_ALGAPI2=m
-CONFIG_CRYPTO_AEAD2=m
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=m
+CONFIG_CRYPTO_BLKCIPHER2=y
CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_HASH2=m
-CONFIG_CRYPTO_RNG2=m
-CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MANAGER2=m
+CONFIG_CRYPTO_MANAGER2=y
# CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_NULL is not set
-CONFIG_CRYPTO_WORKQUEUE=m
+CONFIG_CRYPTO_WORKQUEUE=y
# CONFIG_CRYPTO_CRYPTD is not set
# CONFIG_CRYPTO_AUTHENC is not set
# CONFIG_CRYPTO_TEST is not set
@@ -2216,16 +2501,16 @@ CONFIG_CRYPTO_ARC4=m
#
# Compression
#
-# CONFIG_CRYPTO_DEFLATE is not set
+CONFIG_CRYPTO_DEFLATE=y
# CONFIG_CRYPTO_ZLIB is not set
-# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_LZO=y
#
# Random Number Generation
#
# CONFIG_CRYPTO_ANSI_CPRNG is not set
# CONFIG_CRYPTO_HW is not set
-CONFIG_BINARY_PRINTF=y
+# CONFIG_BINARY_PRINTF is not set
#
# Library routines
@@ -2233,17 +2518,17 @@ CONFIG_BINARY_PRINTF=y
CONFIG_BITREVERSE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_CRC_CCITT=m
-# CONFIG_CRC16 is not set
-CONFIG_CRC_T10DIF=m
-# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
+CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
diff --git a/recipes/linux/linux-davinci/hawkboard/patch-2.6.33rc4-psp-to-hawkboard.patch b/recipes/linux/linux-davinci/hawkboard/patch-2.6.33rc4-psp-to-hawkboard.patch
new file mode 100644
index 0000000000..be5935b59b
--- /dev/null
+++ b/recipes/linux/linux-davinci/hawkboard/patch-2.6.33rc4-psp-to-hawkboard.patch
@@ -0,0 +1,892 @@
+diff -uNr gitorg/arch/arm/mach-davinci/board-da850-hawk.c git/arch/arm/mach-davinci/board-da850-hawk.c
+--- gitorg/arch/arm/mach-davinci/board-da850-hawk.c 1970-01-01 01:00:00.000000000 +0100
++++ git/arch/arm/mach-davinci/board-da850-hawk.c 2010-02-20 15:01:19.000000000 +0000
+@@ -0,0 +1,726 @@
++/*
++ * TI DA850/OMAP-L138 Hawkboard board
++ *
++ * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * Derived from: arch/arm/mach-davinci/board-da830-hawk.c
++ * Original Copyrights follow:
++ *
++ * 2007, 2009 (c) MontaVista Software, Inc. This file is licensed under
++ * the terms of the GNU General Public License version 2. This program
++ * is licensed "as is" without any warranty of any kind, whether express
++ * or implied.
++ */
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/console.h>
++#include <linux/i2c.h>
++#include <linux/i2c/at24.h>
++#include <linux/i2c/pca953x.h>
++#include <linux/mfd/tps6507x.h>
++#include <linux/gpio.h>
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/nand.h>
++#include <linux/mtd/partitions.h>
++#include <linux/regulator/machine.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/flash.h>
++#include <linux/usb/musb.h>
++#include <linux/i2c-gpio.h>
++
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++
++#include <mach/cp_intc.h>
++#include <mach/da8xx.h>
++#include <mach/nand.h>
++#include <mach/mux.h>
++#include <mach/flash.h>
++#include <mach/vpif.h>
++
++#include <media/tvp514x.h>
++
++// TODO - check - why is this different from EVM? - default modes - check DS
++#define DA850_HAWK_PHY_MASK 0x1 << 7
++#define DA850_HAWK_MDIO_FREQUENCY 2200000 /* PHY bus frequency */
++
++#define DA850_HAWK_MMCSD_CD_PIN GPIO_TO_PIN(3, 12)
++#define DA850_HAWK_MMCSD_WP_PIN GPIO_TO_PIN(3, 13)
++
++#define DA8XX_MSTPRI2_REG 0x118
++
++#define TVP5147_CH0 "tvp514x-0"
++
++#define VPIF_STATUS (0x002C)
++#define VPIF_STATUS_CLR (0x0030)
++
++#if 0
++static struct davinci_pm_config da850_pm_pdata = {
++ .sleepcount = 128,
++};
++
++static struct platform_device da850_pm_device = {
++ .name = "pm-davinci",
++ .dev = {
++ .platform_data = &da850_pm_pdata,
++ },
++ .id = -1,
++};
++#endif
++
++/* DA850/OMAP-L138 Hawkboard includes a 128 MByte large-page NAND flash
++ * (128K blocks) /?? TODO?
++ */
++struct mtd_partition da850_hawk_nandflash_partition[] = {
++ {
++ .name = "u-boot env",
++ .offset = 0,
++ .size = SZ_128K,
++ .mask_flags = MTD_WRITEABLE,
++ },
++ {
++ .name = "UBL",
++ .offset = MTDPART_OFS_APPEND,
++ .size = SZ_128K,
++ .mask_flags = MTD_WRITEABLE,
++ },
++ {
++ .name = "u-boot",
++ .offset = MTDPART_OFS_APPEND,
++ .size = 4 * SZ_128K,
++ .mask_flags = MTD_WRITEABLE,
++ },
++ {
++ .name = "kernel",
++ .offset = 0x200000,
++ .size = SZ_4M,
++ .mask_flags = 0,
++ },
++ {
++ .name = "filesystem",
++ .offset = MTDPART_OFS_APPEND,
++ .size = MTDPART_SIZ_FULL,
++ .mask_flags = 0,
++ },
++};
++
++// TODO - check timings with Data Sheet
++static struct davinci_aemif_timing da850_hawk_nandflash_timing = {
++ .wsetup = 0,
++ .wstrobe = 30,
++ .whold = 30,
++ .rsetup = 20,
++ .rstrobe = 40,
++ .rhold = 0,
++ .ta = 0,
++};
++
++static struct davinci_nand_pdata da850_hawk_nandflash_data = {
++ .parts = da850_hawk_nandflash_partition,
++ .nr_parts = ARRAY_SIZE(da850_hawk_nandflash_partition),
++ .ecc_mode = NAND_ECC_HW,
++ .ecc_bits = 4,
++ .options = NAND_USE_FLASH_BBT,
++ .timing = &da850_hawk_nandflash_timing,
++};
++
++static struct resource da850_hawk_nandflash_resource[] = {
++ {
++ .start = DA8XX_AEMIF_CS3_BASE,
++ .end = DA8XX_AEMIF_CS3_BASE + SZ_512K + 2 * SZ_1K - 1,
++ .flags = IORESOURCE_MEM,
++ },
++ {
++ .start = DA8XX_AEMIF_CTL_BASE,
++ .end = DA8XX_AEMIF_CTL_BASE + SZ_32K - 1,
++ .flags = IORESOURCE_MEM,
++ },
++};
++
++#if 1
++static struct platform_device da850_hawk_nandflash_device = {
++ .name = "davinci_nand",
++ .id = 1,
++ .dev = {
++ .platform_data = &da850_hawk_nandflash_data,
++ },
++ .num_resources = ARRAY_SIZE(da850_hawk_nandflash_resource),
++ .resource = da850_hawk_nandflash_resource,
++};
++
++static struct platform_device *da850_hawk_devices[] __initdata = {
++ &da850_hawk_nandflash_device,
++};
++#endif
++
++#if defined(CONFIG_MMC_DAVINCI) || \
++ defined(CONFIG_MMC_DAVINCI_MODULE)
++#define HAS_MMC 1
++#else
++#define HAS_MMC 0
++#endif
++
++static struct i2c_board_info __initdata da850_hawk_i2c_devices[] = {
++ {
++ I2C_BOARD_INFO("tlv320aic3x", 0x18),
++ },
++// TODO - DDC VGA device I2C?
++};
++
++static struct davinci_uart_config da850_hawk_uart_config __initdata = {
++ .enabled_uarts = 0x7,
++};
++
++/* davinci da850 hawk audio machine driver */
++static u8 da850_iis_serializer_direction[] = {
++ INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
++ INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
++ INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
++ INACTIVE_MODE, TX_MODE, RX_MODE, INACTIVE_MODE,
++};
++
++static struct snd_platform_data da850_hawk_snd_data = {
++ .tx_dma_offset = 0x2000,
++ .rx_dma_offset = 0x2000,
++ .op_mode = DAVINCI_MCASP_IIS_MODE,
++ .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction),
++ .tdm_slots = 2,
++ .serial_dir = da850_iis_serializer_direction,
++ .eventq_no = EVENTQ_1,
++ .version = MCASP_VERSION_2,
++ .txnumevt = 1,
++ .rxnumevt = 1,
++};
++
++static struct davinci_mcbsp_platform_data da850_mcbsp0_config = {
++ .inst = 0,
++};
++
++static struct davinci_mcbsp_platform_data da850_mcbsp1_config = {
++ .inst = 1,
++};
++
++static int da850_hawk_mmc_get_ro(int index)
++{
++ return gpio_get_value(DA850_HAWK_MMCSD_WP_PIN);
++}
++
++static int da850_hawk_mmc_get_cd(int index)
++{
++ return !gpio_get_value(DA850_HAWK_MMCSD_CD_PIN);
++}
++
++static struct davinci_mmc_config da850_mmc_config = {
++ .get_ro = da850_hawk_mmc_get_ro,
++ .get_cd = da850_hawk_mmc_get_cd,
++ .wires = 4,
++ .max_freq = 50000000,
++ .caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
++ .version = MMC_CTLR_VERSION_2,
++};
++
++static int da850_lcd_hw_init(void)
++{
++ void __iomem *cfg_mstpri2_base;
++ u32 val;
++
++ /*
++ * Reconfigure the LCDC priority to the highest to ensure that
++ * the throughput/latency requirements for the LCDC are met.
++ */
++ cfg_mstpri2_base = DA8XX_SYSCFG0_VIRT(DA8XX_MSTPRI2_REG);
++
++ val = __raw_readl(cfg_mstpri2_base);
++ val &= 0x0fffffff;
++ __raw_writel(val, cfg_mstpri2_base);
++
++ return 0;
++}
++
++static int __init da850_hawk_config_emac(void)
++{
++ void __iomem *cfg_chip3_base;
++ int ret;
++ u32 val;
++ struct davinci_soc_info *soc_info = &davinci_soc_info;
++
++ if (!machine_is_omapl138_hawkboard())
++ return 0;
++
++ cfg_chip3_base = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG);
++
++ val = __raw_readl(cfg_chip3_base);
++
++ val &= ~BIT(8);
++ ret = da8xx_pinmux_setup(da850_cpgmac_pins);
++ if (ret)
++ pr_warning("da850_evm_init: cpgmac/rmii mux setup failed: %d\n",
++ ret);
++
++ /* configure the CFGCHIP3 register for MII */
++ __raw_writel(val, cfg_chip3_base);
++
++ soc_info->emac_pdata->phy_mask = DA850_HAWK_PHY_MASK;
++ soc_info->emac_pdata->mdio_max_freq = DA850_HAWK_MDIO_FREQUENCY;
++
++ ret = da8xx_register_emac();
++ if (ret)
++ pr_warning("da850_hawk_init: emac registration failed: %d\n",
++ ret);
++
++ return 0;
++}
++device_initcall(da850_hawk_config_emac);
++
++static int da850_setup_vpif_input_channel_mode(int mux_mode)
++{
++ return 0;
++}
++
++static int da850_vpif_intr_status(void __iomem *vpif_base, int channel)
++{
++ int status = 0;
++ int mask;
++
++ // TODO - only one channel active on hawk?
++ if (channel < 0 || channel > 3)
++ return 0;
++
++ mask = 1 << channel;
++ status = __raw_readl((vpif_base + VPIF_STATUS)) & mask;
++ __raw_writel(status, (vpif_base + VPIF_STATUS_CLR));
++
++ return status;
++}
++
++/* VPIF capture configuration */
++static struct tvp514x_platform_data tvp5146_pdata = {
++ .clk_polarity = 0,
++ .hs_polarity = 1,
++ .vs_polarity = 1
++};
++
++#define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL)
++
++static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = {
++ {
++ .name = TVP5147_CH0,
++ .board_info = {
++ I2C_BOARD_INFO("tvp5146", 0x5d),
++ .platform_data = &tvp5146_pdata,
++ },
++ .input = INPUT_CVBS_VI2B,
++ .output = OUTPUT_10BIT_422_EMBEDDED_SYNC,
++ .can_route = 1,
++ .vpif_if = {
++ .if_type = VPIF_IF_BT656,
++ .hd_pol = 1,
++ .vd_pol = 1,
++ .fid_pol = 0,
++ },
++ },
++};
++
++static const struct vpif_input da850_ch0_inputs[] = {
++ {
++ .input = {
++ .index = 0,
++ .name = "Composite",
++ .type = V4L2_INPUT_TYPE_CAMERA,
++ .std = TVP514X_STD_ALL,
++ },
++ .subdev_name = TVP5147_CH0,
++ },
++};
++
++// TODO - V4L2 device creates 2 device nodes for 2 channels - why?
++// - do we need to set .chan_config[1] to NULL?
++static struct vpif_capture_config da850_vpif_capture_config = {
++ .setup_input_channel_mode = da850_setup_vpif_input_channel_mode,
++ .intr_status = da850_vpif_intr_status,
++ .subdev_info = da850_vpif_capture_sdev_info,
++ .subdev_count = ARRAY_SIZE(da850_vpif_capture_sdev_info),
++ .chan_config[0] = {
++ .inputs = da850_ch0_inputs,
++ .input_count = ARRAY_SIZE(da850_ch0_inputs),
++ },
++};
++
++// TODO - fix all these references to _UI
++
++#if defined(CONFIG_DAVINCI_MCBSP0)
++#define HAS_MCBSP0 1
++#else
++#define HAS_MCBSP0 0
++#endif
++
++#if defined(CONFIG_DAVINCI_MCBSP1)
++#define HAS_MCBSP1 1
++#else
++#define HAS_MCBSP1 0
++#endif
++
++#if defined(CONFIG_TI_DAVINCI_EMAC) || \
++ defined(CONFIG_TI_DAVINCI_EMAC_MODULE)
++#define HAS_EMAC 1
++#else
++#define HAS_EMAC 0
++#endif
++
++//TODO - fix dependence on _EVM
++#if defined(CONFIG_SND_DA850_SOC_EVM) || \
++ defined(CONFIG_SND_DA850_SOC_EVM_MODULE)
++#define HAS_MCASP 1
++#else
++#define HAS_MCASP 0
++#endif
++
++#if defined(CONFIG_DA850_UI_RMII) && (HAS_EMAC)
++#define HAS_RMII 1
++#else
++#define HAS_RMII 0
++#endif
++
++#if defined(CONFIG_DA850_UI_LCD) && defined(CONFIG_FB_DA8XX) ||\
++ defined(CONFIG_FB_DA8XX_MODULE)
++#define HAS_GLCD 1
++#else
++#define HAS_GLCD 0
++#endif
++
++#if defined(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) ||\
++ defined(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY_MODULE)
++#define HAS_VPIF_DISPLAY 1
++#else
++#define HAS_VPIF_DISPLAY 0
++#endif
++
++#if defined(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) ||\
++ defined(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE_MODULE)
++#define HAS_VPIF_CAPTURE 1
++#else
++#define HAS_VPIF_CAPTURE 0
++#endif
++
++#if 0
++static da8xx_ocic_handler_t da850_hawk_usb_ocic_handler;
++
++static int da850_hawk_usb_set_power(unsigned port, int on)
++{
++ gpio_set_value(DA850_HAWK_USB1_VBUS_PIN, on);
++ return 0;
++}
++
++static int da850_hawk_usb_get_power(unsigned port)
++{
++ return gpio_get_value(DA850_HAWK_USB1_VBUS_PIN);
++}
++
++static int da850_hawk_usb_get_oci(unsigned port)
++{
++ return !gpio_get_value(DA850_HAWK_USB1_OC_PIN);
++}
++
++static irqreturn_t da850_hawk_usb_ocic_irq(int, void *);
++
++static int da850_hawk_usb_ocic_notify(da8xx_ocic_handler_t handler)
++{
++ int irq = gpio_to_irq(DA850_HAWK_USB1_OC_PIN);
++ int error = 0;
++
++ if (handler != NULL) {
++ da850_hawk_usb_ocic_handler = handler;
++
++ error = request_irq(irq, da850_hawk_usb_ocic_irq, IRQF_DISABLED |
++ IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
++ "OHCI over-current indicator", NULL);
++ if (error)
++ printk(KERN_ERR "%s: could not request IRQ to watch "
++ "over-current indicator changes\n", __func__);
++ } else
++ free_irq(irq, NULL);
++
++ return error;
++}
++#endif
++
++static struct da8xx_ohci_root_hub da850_hawk_usb11_pdata = {
++#if 0
++// No OC (Over Current) Circuitry hooked up on hawkboard - remove?
++ .set_power = da850_hawk_usb_set_power,
++ .get_power = da850_hawk_usb_get_power,
++ .get_oci = da850_hawk_usb_get_oci,
++ .ocic_notify = da850_hawk_usb_ocic_notify,
++#endif
++
++// TODO - check this?
++ /* TPS2065 switch @ 5V */
++ .potpgt = (3 + 1) / 2, /* 3 ms max */
++};
++
++#if 0
++static irqreturn_t da850_hawk_usb_ocic_irq(int irq, void *dev_id)
++{
++ da850_hawk_usb_ocic_handler(&da850_hawk_usb11_pdata, 1);
++ return IRQ_HANDLED;
++}
++#endif
++
++static struct musb_hdrc_platform_data usb_hawk_data[] = {
++ {
++#ifdef CONFIG_USB_MUSB_OTG
++ .mode = MUSB_OTG,
++#elif defined(CONFIG_USB_MUSB_DUAL_ROLE)
++ .mode = MUSB_DUAL_ROLE,
++#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
++ .mode = MUSB_PERIPHERAL,
++#elif defined(CONFIG_USB_MUSB_HOST)
++ .mode = MUSB_HOST,
++#endif
++ .power = 255,
++ .potpgt = 8,
++ .set_vbus = NULL, /* VBUs is directly controlled by the IP */
++ }
++};
++
++static __init void da850_hawk_usb_init(void)
++{
++ int ret;
++ u32 cfgchip2;
++
++ /*
++ * Setup the Ref. clock frequency for the HAWK at 24 MHz.
++ */
++ cfgchip2 = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
++ cfgchip2 &= ~CFGCHIP2_REFFREQ;
++ cfgchip2 |= CFGCHIP2_REFFREQ_24MHZ;
++ __raw_writel(cfgchip2, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
++
++ da8xx_usb20_configure(usb_hawk_data, ARRAY_SIZE(usb_hawk_data));
++
++ ret = da8xx_register_usb11(&da850_hawk_usb11_pdata);
++ if (ret)
++ pr_warning("%s: USB 1.1 registration failed: %d\n",
++ __func__, ret);
++}
++
++static struct i2c_gpio_platform_data da850_gpio_i2c_pdata = {
++ .sda_pin = GPIO_TO_PIN(1, 4),
++ .scl_pin = GPIO_TO_PIN(1, 5),
++ .udelay = 2, /* 250 KHz */
++};
++
++static struct platform_device da850_gpio_i2c = {
++ .name = "i2c-gpio",
++ .id = 1,
++ .dev = {
++ .platform_data = &da850_gpio_i2c_pdata,
++ },
++};
++
++static __init void da850_hawk_init(void)
++{
++ int ret;
++
++ ret = da8xx_register_edma();
++ if (ret)
++ pr_warning("da850_hawk_init: edma registration failed: %d\n",
++ ret);
++
++ // TODO - check safe to enable alongside MMC
++ ret = da8xx_pinmux_setup(da850_nand_pins);
++ if (ret)
++ pr_warning("da850_hawk_init: nand mux setup failed: "
++ "%d\n", ret);
++
++ platform_add_devices(da850_hawk_devices,
++ ARRAY_SIZE(da850_hawk_devices));
++
++ ret = da8xx_pinmux_setup(da850_i2c0_pins);
++ if (ret)
++ pr_warning("da850_hawk_init: i2c0 mux setup failed: %d\n",
++ ret);
++
++ platform_device_register(&da850_gpio_i2c);
++
++ ret = da8xx_register_watchdog();
++ if (ret)
++ pr_warning("da830_hawk_init: watchdog registration failed: %d\n",
++ ret);
++
++ if (HAS_MMC) {
++ ret = da8xx_pinmux_setup(da850_mmcsd0_pins);
++ if (ret)
++ pr_warning("da850_hawk_init: mmcsd0 mux setup failed:"
++ " %d\n", ret);
++
++ ret = gpio_request(DA850_HAWK_MMCSD_CD_PIN, "MMC CD\n");
++ if (ret)
++ pr_warning("da850_hawk_init: can not open GPIO %d\n",
++ DA850_HAWK_MMCSD_CD_PIN);
++ gpio_direction_input(DA850_HAWK_MMCSD_CD_PIN);
++
++ ret = gpio_request(DA850_HAWK_MMCSD_WP_PIN, "MMC WP\n");
++ if (ret)
++ pr_warning("da850_hawk_init: can not open GPIO %d\n",
++ DA850_HAWK_MMCSD_WP_PIN);
++ gpio_direction_input(DA850_HAWK_MMCSD_WP_PIN);
++
++ ret = da8xx_register_mmcsd0(&da850_mmc_config);
++ if (ret)
++ pr_warning("da850_hawk_init: mmcsd0 registration failed:"
++ " %d\n", ret);
++ }
++
++ davinci_serial_init(&da850_hawk_uart_config);
++
++ i2c_register_board_info(1, da850_hawk_i2c_devices,
++ ARRAY_SIZE(da850_hawk_i2c_devices));
++
++ /*
++ * shut down uart 0 and 1; they are not used on the board and
++ * accessing them causes endless "too much work in irq53" messages
++ * with arago fs
++ */
++ __raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30);
++ __raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30);
++
++ if (HAS_MCBSP0) {
++ if (HAS_EMAC)
++ pr_warning("WARNING: both MCBSP0 and EMAC are "
++ "enabled, but they share pins.\n"
++ "\tDisable one of them.\n");
++
++ ret = da8xx_pinmux_setup(da850_mcbsp0_pins);
++ if (ret)
++ pr_warning("da850_hawk_init: mcbsp0 mux setup failed:"
++ " %d\n", ret);
++
++ ret = da850_init_mcbsp(&da850_mcbsp0_config);
++ if (ret)
++ pr_warning("da850_hawk_init: mcbsp0 registration"
++ "failed: %d\n", ret);
++ }
++
++ if (HAS_MCBSP1) {
++ ret = da8xx_pinmux_setup(da850_mcbsp1_pins);
++ if (ret)
++ pr_warning("da850_hawl_init: mcbsp1 mux setup failed:"
++ " %d\n", ret);
++
++ ret = da850_init_mcbsp(&da850_mcbsp1_config);
++ if (ret)
++ pr_warning("da850_hawk_init: mcbsp1 registration"
++ " failed: %d\n", ret);
++ }
++
++ if (HAS_MCASP) {
++ if ((HAS_MCBSP0 || HAS_MCBSP1))
++ pr_warning("WARNING: both McASP and McBSP are enabled, "
++ "but they share pins.\n"
++ "\tDisable one of them.\n");
++
++ ret = da8xx_pinmux_setup(da850_mcasp_pins);
++ if (ret)
++ pr_warning("da850_hawk_init: mcasp mux setup failed:"
++ "%d\n", ret);
++
++ da8xx_register_mcasp(0, &da850_hawk_snd_data);
++ }
++
++ ret = da8xx_pinmux_setup(da850_lcdcntl_pins);
++ if (ret)
++ pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n",
++ ret);
++
++ ret = da850_lcd_hw_init();
++ if (ret)
++ pr_warning("da850_hawk_init: lcd initialization failed: %d\n",
++ ret);
++
++ ret = da8xx_register_lcdc(&vga_monitor_pdata);
++ if (ret)
++ pr_warning("da850_hawk_init: lcdc registration failed: %d\n",
++ ret);
++
++ __raw_writel(0, IO_ADDRESS(0x01E13028));
++
++
++#if 0
++ // TODO - why RTC hangs at startup?
++ ret = da8xx_register_rtc();
++ if (ret)
++ pr_warning("da850_hawk_init: rtc setup failed: %d\n", ret);
++
++ // TODO - understand PM support
++ ret = da850_register_cpufreq();
++ if (ret)
++ pr_warning("da850_hawk_init: cpufreq registration failed: %d\n",
++ ret);
++
++ ret = da8xx_register_cpuidle();
++ if (ret)
++ pr_warning("da850_hawk_init: cpuidle registration failed: %d\n",
++ ret);
++
++ ret = da850_register_pm(&da850_pm_device);
++ if (ret)
++ pr_warning("da850_hawk_init: suspend registration failed: %d\n",
++ ret);
++#endif
++
++ da850_hawk_usb_init();
++
++ ret = da8xx_register_sata();
++ if (ret)
++ pr_warning("da850_hawk_init: SATA registration failed: %d\n",
++ ret);
++
++ ret = da850_register_vpif();
++ if (ret)
++ pr_warning("da850_hawk_init: VPIF registration failed: "
++ "%d\n", ret);
++
++ ret = da8xx_pinmux_setup(da850_vpif_capture_pins);
++ if (ret)
++ pr_warning("da850_hawk_init: vpif capture mux failed: "
++ "%d\n", ret);
++
++ ret = da850_register_vpif_capture(&da850_vpif_capture_config);
++ if (ret)
++ pr_warning("da850_hawk_init: VPIF registration failed: "
++ "%d\n", ret);
++}
++
++#ifdef CONFIG_SERIAL_8250_CONSOLE
++static int __init da850_hawk_console_init(void)
++{
++ return add_preferred_console("ttyS", 2, "115200");
++}
++console_initcall(da850_hawk_console_init);
++#endif
++
++static __init void da850_hawk_irq_init(void)
++{
++ struct davinci_soc_info *soc_info = &davinci_soc_info;
++
++ cp_intc_init((void __iomem *)DA8XX_CP_INTC_VIRT, DA850_N_CP_INTC_IRQ,
++ soc_info->intc_irq_prios);
++}
++
++static void __init da850_hawk_map_io(void)
++{
++ da850_init();
++}
++
++MACHINE_START(OMAPL138_HAWKBOARD, "DaVinci DA850/OMAP-L138/AM18xx Hawkboard(.org)")
++ .phys_io = IO_PHYS,
++ .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
++ .boot_params = (DA8XX_DDR_BASE + 0x100),
++ .map_io = da850_hawk_map_io,
++ .init_irq = da850_hawk_irq_init,
++ .timer = &davinci_timer,
++ .init_machine = da850_hawk_init,
++MACHINE_END
+diff -uNr gitorg/arch/arm/mach-davinci/da850.c git/arch/arm/mach-davinci/da850.c
+--- gitorg/arch/arm/mach-davinci/da850.c 2010-02-18 11:36:19.000000000 +0000
++++ git/arch/arm/mach-davinci/da850.c 2010-02-19 14:59:39.000000000 +0000
+@@ -720,7 +720,7 @@
+ const short da850_mcasp_pins[] __initdata = {
+ DA850_AHCLKX, DA850_ACLKX, DA850_AFSX,
+ DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE,
+- DA850_AXR_11, DA850_AXR_12,
++ DA850_AXR_11, DA850_AXR_12, DA850_AXR_13, DA850_AXR_14,
+ -1
+ };
+
+diff -uNr gitorg/arch/arm/mach-davinci/devices-da8xx.c git/arch/arm/mach-davinci/devices-da8xx.c
+--- gitorg/arch/arm/mach-davinci/devices-da8xx.c 2010-02-18 11:36:19.000000000 +0000
++++ git/arch/arm/mach-davinci/devices-da8xx.c 2010-02-19 17:38:57.000000000 +0000
+@@ -560,6 +560,12 @@
+ .type = "Sharp_LK043T1DG01",
+ };
+
++struct da8xx_lcdc_platform_data vga_monitor_pdata = {
++ .manu_name = "vga_monitor",
++ .controller_data = &lcd_cfg,
++ .type = "VGA_Monitor",
++};
++
+ #if !defined(CONFIG_FB_DA8XX) && !defined(CONFIG_FB_DA8XX_MODULE)
+ static struct da8xx_clcd_platform_data da8xx_evm_clcd_pdata = {
+ .version = CONFIG_SPACE_1,
+diff -uNr gitorg/arch/arm/mach-davinci/include/mach/da8xx.h git/arch/arm/mach-davinci/include/mach/da8xx.h
+--- gitorg/arch/arm/mach-davinci/include/mach/da8xx.h 2010-02-18 11:36:19.000000000 +0000
++++ git/arch/arm/mach-davinci/include/mach/da8xx.h 2010-02-19 17:06:58.000000000 +0000
+@@ -167,6 +167,8 @@
+ extern struct emac_platform_data da8xx_emac_pdata;
+ extern struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata;
+ extern struct da8xx_lcdc_platform_data sharp_lk043t1dg01_pdata;
++extern struct da8xx_lcdc_platform_data vga_monitor_pdata;
++
+ void da8xx_usb20_configure(struct musb_hdrc_platform_data *pdata, u8 num_inst);
+
+ extern const short da830_emif25_pins[];
+diff -uNr gitorg/arch/arm/mach-davinci/include/mach/debug-macro.S git/arch/arm/mach-davinci/include/mach/debug-macro.S
+--- gitorg/arch/arm/mach-davinci/include/mach/debug-macro.S 2010-02-18 11:36:19.000000000 +0000
++++ git/arch/arm/mach-davinci/include/mach/debug-macro.S 2010-02-20 15:10:41.000000000 +0000
+@@ -27,7 +27,8 @@
+ #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx)
+ #error Cannot enable DaVinci and DA8XX platforms concurrently
+ #elif defined(CONFIG_MACH_DAVINCI_DA830_EVM) || \
+- defined(CONFIG_MACH_DAVINCI_DA850_EVM)
++ defined(CONFIG_MACH_DAVINCI_DA850_EVM) || \
++ defined(CONFIG_MACH_OMAPL138_HAWKBOARD)
+ orr \rx, \rx, #0x00d00000 @ physical base address
+ orr \rx, \rx, #0x0000d000 @ of UART 2
+ #else
+diff -uNr gitorg/arch/arm/mach-davinci/Kconfig git/arch/arm/mach-davinci/Kconfig
+--- gitorg/arch/arm/mach-davinci/Kconfig 2010-02-18 11:36:19.000000000 +0000
++++ git/arch/arm/mach-davinci/Kconfig 2010-02-19 16:36:25.000000000 +0000
+@@ -205,6 +205,13 @@
+ select Video Port Interface.
+ endchoice
+
++config MACH_OMAPL138_HAWKBOARD
++ bool "TI DA850/OMAP-L138/AM18xx Hawkboard(.org) Platform"
++ default ARCH_DAVINCI_DA850
++ depends on ARCH_DAVINCI_DA850
++ help
++ Say Y here to select the TI DA850/OMAP-L138/AM18xx Hawkboard.
++
+ config DAVINCI_MUX
+ bool "DAVINCI multiplexing support"
+ depends on ARCH_DAVINCI
+diff -uNr gitorg/arch/arm/mach-davinci/Makefile git/arch/arm/mach-davinci/Makefile
+--- gitorg/arch/arm/mach-davinci/Makefile 2010-02-18 11:36:19.000000000 +0000
++++ git/arch/arm/mach-davinci/Makefile 2010-02-19 16:37:22.000000000 +0000
+@@ -30,6 +30,7 @@
+ obj-$(CONFIG_MACH_DAVINCI_DM365_EVM) += board-dm365-evm.o
+ obj-$(CONFIG_MACH_DAVINCI_DA830_EVM) += board-da830-evm.o
+ obj-$(CONFIG_MACH_DAVINCI_DA850_EVM) += board-da850-evm.o
++obj-$(CONFIG_MACH_OMAPL138_HAWKBOARD) += board-da850-hawk.o
+
+ # Power Management
+ obj-$(CONFIG_CPU_FREQ) += cpufreq.o
+diff -uNr gitorg/drivers/media/video/Kconfig git/drivers/media/video/Kconfig
+--- gitorg/drivers/media/video/Kconfig 2010-02-18 11:36:34.000000000 +0000
++++ git/drivers/media/video/Kconfig 2010-02-20 14:26:53.000000000 +0000
+@@ -513,11 +513,11 @@
+
+ config VIDEO_DAVINCI_VPIF_CAPTURE
+ tristate "DaVinci Video VPIF Capture"
+- depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM)
++ depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM || MACH_OMAPL138_HAWKBOARD)
+ select VIDEOBUF_DMA_CONTIG
+ select VIDEO_DAVINCI_VPIF
+ help
+- Support for DaVinci VPIF Capture on DM6467 EVM and/or DA850/OMAP-L138/AM18xx EVM.
++ Support for DaVinci VPIF Capture on DM6467 EVM and/or DA850/OMAP-L138/AM18xx EVM/Hawkboard.
+
+ To compile this driver as a module, choose M here: the
+ module will be called vpif_capture.
+diff -uNr gitorg/drivers/video/da8xx-fb.c git/drivers/video/da8xx-fb.c
+--- gitorg/drivers/video/da8xx-fb.c 2010-02-18 11:36:43.000000000 +0000
++++ git/drivers/video/da8xx-fb.c 2010-02-20 12:46:13.000000000 +0000
+@@ -196,6 +196,20 @@
+ .pxl_clk = 7833600,
+ .invert_pxl_clk = 0,
+ },
++ /* CRT Monitor or LCD Screen */
++ [2] = {
++ .name = "VGA_Monitor",
++ .width = 640,
++ .height = 480,
++ .hfp = 48,
++ .hbp = 48,
++ .hsw = 63,
++ .vfp = 11,
++ .vbp = 31,
++ .vsw = 1,
++ .pxl_clk = 25000000,
++ .invert_pxl_clk = 1,
++ },
+ };
+
+ /* Enable the Raster Engine of the LCD Controller */
+diff -uNr gitorg/sound/soc/davinci/davinci-evm.c git/sound/soc/davinci/davinci-evm.c
+--- gitorg/sound/soc/davinci/davinci-evm.c 2010-02-18 11:36:50.000000000 +0000
++++ git/sound/soc/davinci/davinci-evm.c 2010-02-19 15:34:45.000000000 +0000
+@@ -57,7 +57,8 @@
+ sysclk = 12288000;
+
+ else if (machine_is_davinci_da830_evm() ||
+- machine_is_davinci_da850_evm())
++ machine_is_davinci_da850_evm() ||
++ machine_is_omapl138_hawkboard() )
+ sysclk = 24576000;
+
+ else
+@@ -256,7 +257,7 @@
+ } else if (machine_is_davinci_da830_evm()) {
+ evm_snd_dev_data = &da830_evm_snd_devdata;
+ index = 1;
+- } else if (machine_is_davinci_da850_evm()) {
++ } else if (machine_is_davinci_da850_evm() || machine_is_omapl138_hawkboard()) {
+ evm_snd_dev_data = &da850_evm_snd_devdata;
+ index = 0;
+ } else
+diff -uNr gitorg/sound/soc/davinci/Kconfig git/sound/soc/davinci/Kconfig
+--- gitorg/sound/soc/davinci/Kconfig 2010-02-18 11:36:50.000000000 +0000
++++ git/sound/soc/davinci/Kconfig 2010-02-20 14:28:15.000000000 +0000
+@@ -53,11 +53,11 @@
+ DA830/OMAP-L137/AM17xx EVM
+
+ config SND_DA850_SOC_EVM
+- tristate "SoC Audio support for DA850/OMAP-L138/AM18xx EVM"
+- depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA850_EVM
++ tristate "SoC Audio support for DA850/OMAP-L138/AM18xx EVM / Hawkboard"
++ depends on SND_DAVINCI_SOC && (MACH_DAVINCI_DA850_EVM || MACH_OMAPL138_HAWKBOARD)
+ select SND_DAVINCI_SOC_MCASP
+ select SND_SOC_TLV320AIC3X
+ help
+ Say Y if you want to add support for SoC audio on TI
+- DA850/OMAP-L138/AM18xx EVM
++ DA850/OMAP-L138/AM18xx EVM/Hawkboard
+
diff --git a/recipes/linux/linux-davinci/hawkboard/patch_hawk.diff b/recipes/linux/linux-davinci/hawkboard/patch_hawk.diff
deleted file mode 100644
index fb323236ac..0000000000
--- a/recipes/linux/linux-davinci/hawkboard/patch_hawk.diff
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
-index 607dd2d..d7f5dff 100755
---- a/arch/arm/mach-davinci/board-da850-evm.c
-+++ b/arch/arm/mach-davinci/board-da850-evm.c
-@@ -37,14 +37,14 @@
- #include <mach/nand.h>
- #include <mach/mux.h>
-
--#define DA850_EVM_PHY_MASK 0x1
-+#define DA850_EVM_PHY_MASK (1 << 7)
- #define DA850_EVM_MDIO_FREQUENCY 2200000 /* PHY bus frequency */
-
- #define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)
- #define DA850_LCD_BL_PIN GPIO_TO_PIN(2, 15)
-
--#define DA850_MMCSD_CD_PIN GPIO_TO_PIN(4, 0)
--#define DA850_MMCSD_WP_PIN GPIO_TO_PIN(4, 1)
-+#define DA850_MMCSD_CD_PIN GPIO_TO_PIN(3, 12)
-+#define DA850_MMCSD_WP_PIN GPIO_TO_PIN(3, 13)
-
- #define DA850_MII_MDIO_CLKEN_PIN GPIO_TO_PIN(2, 6)
-
-@@ -431,8 +431,8 @@ static struct davinci_uart_config da850_evm_uart_config __initdata = {
- static u8 da850_iis_serializer_direction[] = {
- INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
- INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
-- INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, TX_MODE,
-- RX_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
-+ INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
-+ INACTIVE_MODE, TX_MODE, RX_MODE, INACTIVE_MODE,
- };
-
- static struct snd_platform_data da850_evm_snd_data = {
-@@ -866,11 +866,11 @@ static __init void da850_evm_init(void)
- {
- int ret;
-
-- ret = pmic_tps65070_init();
-+/* ret = pmic_tps65070_init();
- if (ret)
- pr_warning("da850_evm_init: TPS65070 PMIC init failed: %d\n",
- ret);
--
-+*/
- ret = da8xx_register_edma();
- if (ret)
- pr_warning("da850_evm_init: edma registration failed: %d\n",
-@@ -886,12 +886,26 @@ static __init void da850_evm_init(void)
- pr_warning("da850_evm_init: i2c0 registration failed: %d\n",
- ret);
-
-+ davinci_serial_init(&da850_evm_uart_config);
-+
-+ i2c_register_board_info(1, da850_evm_i2c_devices,
-+ ARRAY_SIZE(da850_evm_i2c_devices));
-+
-+ __raw_writel(0, IO_ADDRESS(0x01E13028));
-+
-+ /*
-+ * shut down uart 0 and 1; they are not used on the board and
-+ * accessing them causes endless "too much work in irq53" messages
-+ * with arago fs
-+ */
-+ __raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30);
-+ __raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30);
-
- ret = da8xx_register_watchdog();
- if (ret)
- pr_warning("da830_evm_init: watchdog registration failed: %d\n",
- ret);
--
-+
- if (HAS_MMC) {
- ret = da8xx_pinmux_setup(da850_mmcsd0_pins);
- if (ret)
-@@ -916,19 +930,6 @@ static __init void da850_evm_init(void)
- " %d\n", ret);
- }
-
-- davinci_serial_init(&da850_evm_uart_config);
--
-- i2c_register_board_info(1, da850_evm_i2c_devices,
-- ARRAY_SIZE(da850_evm_i2c_devices));
--
-- /*
-- * shut down uart 0 and 1; they are not used on the board and
-- * accessing them causes endless "too much work in irq53" messages
-- * with arago fs
-- */
-- __raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30);
-- __raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30);
--
- if (HAS_MCBSP0) {
- if (HAS_EMAC)
- pr_warning("WARNING: both MCBSP0 and EMAC are "
-@@ -988,15 +989,17 @@ static __init void da850_evm_init(void)
- pr_warning("da850_evm_init: lcd initialization failed: %d\n",
- ret);
-
-- ret = da8xx_register_lcdc(&sharp_lk043t1dg01_pdata);
-+ ret = da8xx_register_lcdc(&vga_monitor_pdata);
- if (ret)
- pr_warning("da850_evm_init: lcdc registration failed: %d\n",
- ret);
-
-+#if 0
- ret = da8xx_register_rtc();
- if (ret)
- pr_warning("da850_evm_init: rtc setup failed: %d\n", ret);
-
-+
- ret = da850_register_cpufreq();
- if (ret)
- pr_warning("da850_evm_init: cpufreq registration failed: %d\n",
-@@ -1006,6 +1009,7 @@ static __init void da850_evm_init(void)
- if (ret)
- pr_warning("da850_evm_init: cpuidle registration failed: %d\n",
- ret);
-+#endif
-
- ret = da8xx_pinmux_setup(da850_spi1_pins);
- if (ret)
-@@ -1021,6 +1025,7 @@ static __init void da850_evm_init(void)
- if (ret)
- pr_warning("da850_evm_init: SATA registration failed: %d\n",
- ret);
-+
- }
-
- #ifdef CONFIG_SERIAL_8250_CONSOLE
-diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
-index 94355fa..cda39a3 100644
---- a/arch/arm/mach-davinci/da850.c
-+++ b/arch/arm/mach-davinci/da850.c
-@@ -658,7 +658,7 @@ const short da850_rmii_pins[] __initdata = {
- const short da850_mcasp_pins[] __initdata = {
- DA850_AHCLKX, DA850_ACLKX, DA850_AFSX,
- DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE,
-- DA850_AXR_11, DA850_AXR_12,
-+ DA850_AXR_11, DA850_AXR_12, DA850_AXR_13, DA850_AXR_14,
- -1
- };
-
-diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
-index b3f1317..7218539 100755
---- a/arch/arm/mach-davinci/devices-da8xx.c
-+++ b/arch/arm/mach-davinci/devices-da8xx.c
-@@ -396,6 +396,11 @@ struct da8xx_lcdc_platform_data sharp_lk043t1dg01_pdata = {
- .controller_data = &lcd_cfg,
- .type = "Sharp_LK043T1DG01",
- };
-+struct da8xx_lcdc_platform_data vga_monitor_pdata = {
-+ .manu_name = "vga_monitor",
-+ .controller_data = &lcd_cfg,
-+ .type = "VGA_Monitor",
-+};
-
- #if !defined(CONFIG_FB_DA8XX) && !defined(CONFIG_FB_DA8XX_MODULE)
- static struct da8xx_clcd_platform_data da8xx_evm_clcd_pdata = {
-diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
-index 362ff83..8da6983 100644
---- a/arch/arm/mach-davinci/include/mach/da8xx.h
-+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
-@@ -110,6 +110,7 @@ extern struct platform_device da8xx_serial_device;
- extern struct emac_platform_data da8xx_emac_pdata;
- extern struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata;
- extern struct da8xx_lcdc_platform_data sharp_lk043t1dg01_pdata;
-+extern struct da8xx_lcdc_platform_data vga_monitor_pdata;
- void da8xx_usb20_configure(struct musb_hdrc_platform_data *pdata, u8 num_inst);
-
- extern const short da830_emif25_pins[];
-diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
-index 67550e6..5e32391 100644
---- a/drivers/video/da8xx-fb.c
-+++ b/drivers/video/da8xx-fb.c
-@@ -193,6 +193,20 @@ static struct da8xx_panel known_lcd_panels[] = {
- .pxl_clk = 7833600,
- .invert_pxl_clk = 0,
- },
-+ /* CRT Monitor or LCD Screen */
-+ [2] = {
-+ .name = "VGA_Monitor",
-+ .width = 640,
-+ .height = 480,
-+ .hfp = 48,
-+ .hbp = 48,
-+ .hsw = 63,
-+ .vfp = 11,
-+ .vbp = 31,
-+ .vsw = 1,
-+ .pxl_clk = 25000000,
-+ .invert_pxl_clk = 1,
-+ },
- };
-
- /* Disable the Raster Engine of the LCD Controller */