Patchwork [kernel/3.0.35-4.1.0,8/8] imx6*_defconfig: Sync with Freescale Communit BSP settings

login
register
mail settings
Submitter Otavio Salvador
Date Aug. 30, 2013, 3:50 a.m.
Message ID <1377834634-30465-9-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/57123/
State Awaiting Upstream
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Aug. 30, 2013, 3:50 a.m.
This syncs the kernel config being used in meta-fsl-arm BSP so people
building from source, directly from GIT, can get same features.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 arch/arm/configs/imx6_defconfig  |  9 ++++++++-
 arch/arm/configs/imx6s_defconfig | 10 +++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

Patch

diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index 5f04ae1..fb802f1 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -3,8 +3,10 @@  CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
+CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
@@ -70,6 +72,7 @@  CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_LRO is not set
 # CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
 CONFIG_LLC2=y
 CONFIG_CAN=y
 CONFIG_CAN_RAW=y
@@ -92,7 +95,8 @@  CONFIG_BT_HCIVHCI=y
 CONFIG_CFG80211=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
 CONFIG_MTD_CHAR=y
@@ -128,6 +132,7 @@  CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_EGALAX=y
+CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=y
 CONFIG_TOUCHSCREEN_ELAN=y
 CONFIG_TOUCHSCREEN_MAX11801=y
 CONFIG_INPUT_MISC=y
@@ -278,6 +283,8 @@  CONFIG_NLS_UTF8=m
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
+CONFIG_FTRACE=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_CCM=y
diff --git a/arch/arm/configs/imx6s_defconfig b/arch/arm/configs/imx6s_defconfig
index 00de3f9..5241314 100644
--- a/arch/arm/configs/imx6s_defconfig
+++ b/arch/arm/configs/imx6s_defconfig
@@ -4,8 +4,10 @@  CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
+CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
@@ -65,6 +67,8 @@  CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_LRO is not set
 # CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+CONFIG_LLC2=y
 CONFIG_CAN=y
 CONFIG_CAN_RAW=y
 CONFIG_CAN_BCM=y
@@ -86,7 +90,9 @@  CONFIG_BT_HCIVHCI=y
 CONFIG_CFG80211=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
@@ -167,6 +173,7 @@  CONFIG_BACKLIGHT_PWM=y
 CONFIG_FB_MXC_SEIKO_WVGA_SYNC_PANEL=y
 CONFIG_FB_MXC_SII902X_ELCDIF=y
 CONFIG_FB_MXC_EINK_PANEL=y
+CONFIG_FB_MXC_ELCDIF_FB=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x16=y
@@ -256,6 +263,7 @@  CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=m
 CONFIG_DEBUG_FS=y
 CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_FTRACE=y
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_CBC=y