From patchwork Fri May 17 04:46:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Salveti de Araujo X-Patchwork-Id: 244496 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id BB2622C00A7 for ; Fri, 17 May 2013 14:47:27 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UdCZX-0001EB-J3; Fri, 17 May 2013 04:47:15 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UdCZS-0001CJ-79 for kernel-team@lists.ubuntu.com; Fri, 17 May 2013 04:47:10 +0000 Received: from [177.110.176.170] (helo=evatp.domonet) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1UdCZR-0008U5-A7; Fri, 17 May 2013 04:47:10 +0000 From: Ricardo Salveti de Araujo To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] Restoring Android related configs needed by Ubuntu Touch Date: Fri, 17 May 2013 01:46:59 -0300 Message-Id: <1368766019-23379-1-git-send-email-ricardo.salveti@canonical.com> X-Mailer: git-send-email 1.8.1.2 Cc: Ricardo Salveti de Araujo X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com These configs are needed to have a working kernel for Ubuntu Touch. Original values from the default CM grouper kernel. Signed-off-by: Ricardo Salveti de Araujo --- debian.grouper/config/armhf/config.flavour.grouper | 2 +- debian.grouper/config/config.common.ubuntu | 67 ++++++++++++++-------- 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/debian.grouper/config/armhf/config.flavour.grouper b/debian.grouper/config/armhf/config.flavour.grouper index 1510379..90a3408 100644 --- a/debian.grouper/config/armhf/config.flavour.grouper +++ b/debian.grouper/config/armhf/config.flavour.grouper @@ -1,3 +1,3 @@ # -# Config options for config.flavour.nexus7 automatically generated by splitconfig.pl +# Config options for config.flavour.grouper automatically generated by splitconfig.pl # diff --git a/debian.grouper/config/config.common.ubuntu b/debian.grouper/config/config.common.ubuntu index 76dab3a..dda40b2 100644 --- a/debian.grouper/config/config.common.ubuntu +++ b/debian.grouper/config/config.common.ubuntu @@ -69,9 +69,9 @@ CONFIG_ALIGNMENT_TRAP=y CONFIG_AMI306=y # CONFIG_AMIGA_PARTITION is not set CONFIG_ANDROID=y -# CONFIG_ANDROID_BINDER_IPC is not set -# CONFIG_ANDROID_LOGGER is not set -# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set +CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ANDROID_LOGGER=y +CONFIG_ANDROID_LOW_MEMORY_KILLER=y # CONFIG_ANDROID_PARANOID_NETWORK is not set CONFIG_ANDROID_RAM_CONSOLE=y # CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set @@ -81,7 +81,7 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE=128 CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE=16 CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE=8 -# CONFIG_ANDROID_TIMED_GPIO is not set +CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_TIMED_OUTPUT=y CONFIG_ANON_INODES=y # CONFIG_APANIC is not set @@ -229,8 +229,8 @@ CONFIG_BCM4330_RFKILL=y # CONFIG_BCMA is not set CONFIG_BCMA_POSSIBLE=y CONFIG_BCMDHD=y -CONFIG_BCMDHD_FW_PATH="/lib/firmware/fw_bcmdhd.bin" -CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/nvram.txt" +CONFIG_BCMDHD_FW_PATH="/system/vendor/firmware/fw_bcmdhd.bin" +CONFIG_BCMDHD_NVRAM_PATH="/system/etc/nvram.txt" # CONFIG_BCM_WIMAX is not set # CONFIG_BE2ISCSI is not set # CONFIG_BEFS_FS is not set @@ -392,7 +392,6 @@ CONFIG_CMDLINE_EXTEND=y # CONFIG_COMPAT_BRK is not set # CONFIG_CONFIGFS_FS is not set # CONFIG_CONNECTOR is not set -CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_CONTEXT_SWITCH_TRACER=y # CONFIG_CORDIC is not set CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y @@ -613,13 +612,13 @@ CONFIG_DRAGONRISE_FF=y # CONFIG_DRM is not set # CONFIG_DS1682 is not set CONFIG_DUMMY=y -CONFIG_DUMMY_CONSOLE=y # CONFIG_DVB_CORE is not set # CONFIG_DW_WATCHDOG is not set # CONFIG_DX_SEP is not set CONFIG_DYNAMIC_DEBUG=y # CONFIG_E1000 is not set # CONFIG_E1000E is not set +CONFIG_EARLYSUSPEND=y # CONFIG_EASYCAP is not set # CONFIG_ECHO is not set # CONFIG_ECONET is not set @@ -687,6 +686,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DDC is not set +CONFIG_FB_EARLYSUSPEND=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set @@ -740,13 +740,7 @@ CONFIG_FIQ_GLUE=y CONFIG_FLATMEM=y CONFIG_FLATMEM_MANUAL=y CONFIG_FLAT_NODE_MEM_MAP=y -# CONFIG_FONTS is not set -CONFIG_FONT_8x16=y -CONFIG_FONT_8x8=y CONFIG_FORCE_MAX_ZONEORDER=11 -CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAME_WARN=1024 CONFIG_FREEZER=y # CONFIG_FSCACHE is not set @@ -807,8 +801,10 @@ CONFIG_GREENASIA_FF=y CONFIG_HARDIRQS_SW_RESEND=y # CONFIG_HARDLOCKUP_DETECTOR is not set CONFIG_HAS_DMA=y +CONFIG_HAS_EARLYSUSPEND=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y +CONFIG_HAS_WAKELOCK=y CONFIG_HAVE_AOUT=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_PFN_VALID=y @@ -914,7 +910,6 @@ CONFIG_HOTPLUG_CPU=y CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set # CONFIG_HWMON_VID is not set -CONFIG_HW_CONSOLE=y CONFIG_HW_PERF_EVENTS=y # CONFIG_HW_RANDOM is not set CONFIG_HZ=100 @@ -1668,6 +1663,7 @@ CONFIG_NOP_TRACER=y # CONFIG_NOP_USB_XCEIV is not set # CONFIG_NOZOMI is not set CONFIG_NO_HZ=y +# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set CONFIG_NR_CPUS=4 # CONFIG_NS83820 is not set # CONFIG_NTFS_DEBUG is not set @@ -2188,7 +2184,29 @@ CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_FM801 is not set # CONFIG_SND_GINA20 is not set # CONFIG_SND_GINA24 is not set -# CONFIG_SND_HDA_INTEL is not set +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CIRRUS=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y +CONFIG_SND_HDA_GENERIC=y +# CONFIG_SND_HDA_HWDEP is not set +# CONFIG_SND_HDA_INPUT_BEEP is not set +# CONFIG_SND_HDA_INPUT_JACK is not set +CONFIG_SND_HDA_INTEL=y +# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_PLATFORM_DRIVER=y +CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA=y +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=10 +CONFIG_SND_HDA_PREALLOC_SIZE=64 # CONFIG_SND_HDSP is not set # CONFIG_SND_HDSPM is not set # CONFIG_SND_HRTIMER is not set @@ -2265,6 +2283,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VIA82XX is not set # CONFIG_SND_VIA82XX_MODEM is not set # CONFIG_SND_VIRTUOSO is not set +CONFIG_SND_VMASTER=y # CONFIG_SND_VX222 is not set # CONFIG_SND_YMFPCI is not set # CONFIG_SOC_CAMERA is not set @@ -2276,7 +2295,6 @@ CONFIG_SOUND=y # CONFIG_SOUND_PRIME is not set # CONFIG_SPARSE_IRQ is not set # CONFIG_SPARSE_RCU_POINTER is not set -# CONFIG_SPEAKUP is not set CONFIG_SPI=y # CONFIG_SPI_ALTERA is not set # CONFIG_SPI_BITBANG is not set @@ -2362,6 +2380,7 @@ CONFIG_TEGRA_CAMERA=y # CONFIG_TEGRA_CARDHU_DSI is not set CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y CONFIG_TEGRA_CLUSTER_CONTROL=y +# CONFIG_TEGRA_CONVSERVATIVE_GOV_ON_EARLYSUPSEND is not set CONFIG_TEGRA_CORE_DVFS=y CONFIG_TEGRA_CPU_DVFS=y CONFIG_TEGRA_CRYPTO_DEV=y @@ -2514,7 +2533,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_USB_BELKIN is not set # CONFIG_USB_C67X00_HCD is not set # CONFIG_USB_CATC is not set -CONFIG_USB_CDC_COMPOSITE=y +# CONFIG_USB_CDC_COMPOSITE is not set # CONFIG_USB_CI13XXX_PCI is not set # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set @@ -2551,7 +2570,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=500 # CONFIG_USB_GOKU is not set # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GSPCA is not set -# CONFIG_USB_G_ANDROID is not set +CONFIG_USB_G_ANDROID=y # CONFIG_USB_G_DBGP is not set # CONFIG_USB_G_HID is not set # CONFIG_USB_G_MULTI is not set @@ -2611,6 +2630,7 @@ CONFIG_USB_NET_SMSC95XX=y CONFIG_USB_OTG=y # CONFIG_USB_OTG_BLACKLIST_HUB is not set CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_OTG_WAKELOCK is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_PEGASUS is not set @@ -2722,6 +2742,7 @@ CONFIG_USB_WDM=y # CONFIG_USB_ZERO is not set # CONFIG_USB_ZR364XX is not set CONFIG_USER_NS=y +CONFIG_USER_WAKELOCK=y CONFIG_USE_GENERIC_SMP_HELPERS=y # CONFIG_USE_OF is not set CONFIG_UTS_NS=y @@ -2768,7 +2789,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y # CONFIG_VIDEO_USBVISION is not set CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_V4L2_COMMON=y -# CONFIG_VIDEO_VIVI is not set # CONFIG_VIRTIO_BALLOON is not set # CONFIG_VIRTIO_PCI is not set # CONFIG_VIRT_DRIVERS is not set @@ -2781,14 +2801,13 @@ CONFIG_VLAN_8021Q_GVRP=y CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VM_EVENT_COUNTERS=y -CONFIG_VT=y +# CONFIG_VT is not set # CONFIG_VT6655 is not set # CONFIG_VT6656 is not set -CONFIG_VT_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_VXFS_FS is not set # CONFIG_W1 is not set -# CONFIG_WAKELOCK is not set +CONFIG_WAKELOCK=y +CONFIG_WAKELOCK_STAT=y # CONFIG_WAN is not set # CONFIG_WAN_ROUTER is not set CONFIG_WATCHDOG=y