[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-673-g3bfdd82

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  3bfdd82104c443ea77c9fcb0b7fb637fbfd3cc10 (commit)
      from  07e290168475691a7e03e358484c73a98c4b5e2b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3bfdd82104c443ea77c9fcb0b7fb637fbfd3cc10
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Mar 17 16:59:55 2015 +0100

    [LINUX] APF6: 3.10, 3.18, 3.19, 4.0: homogenize default configs

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf6/apf6-linux-3.18.config    |    2 +-
 .../device/armadeus/apf6/apf6-linux-3.19.config    |    2 +-
 .../device/armadeus/apf6/apf6-linux-4.0.config     |    2 +-
 .../armadeus/apf6/apf6legacy-linux-3.10.config     |   11 ++++++++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
index a06d80f..1a0d8d7 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
@@ -29,7 +29,7 @@ CONFIG_PCI_MSI=y
 CONFIG_PCI_IMX6=y
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
 CONFIG_VFP=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
index a06d80f..1a0d8d7 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
@@ -29,7 +29,7 @@ CONFIG_PCI_MSI=y
 CONFIG_PCI_IMX6=y
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
 CONFIG_VFP=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
index a06d80f..1a0d8d7 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
@@ -29,7 +29,7 @@ CONFIG_PCI_MSI=y
 CONFIG_PCI_IMX6=y
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
 CONFIG_VFP=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
index c8868a3..51b987b 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
@@ -21,6 +21,9 @@ CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
 CONFIG_WAND_RFKILL=y
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_IMX6=y
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_PREEMPT=y
@@ -137,9 +140,7 @@ CONFIG_KEYBOARD_IMX=y
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_MC13783=y
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_MMA8450=y
 CONFIG_SERIO_SERPORT=m
 CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_LEGACY_PTYS is not set
@@ -223,7 +224,7 @@ CONFIG_SND_SOC=y
 CONFIG_SND_IMX_SOC=y
 CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_IMX_SPDIF=y
-CONFIG_SND_SOC_IMX_MC13783=y
+CONFIG_SND_SOC_IMX_HDMI=y
 CONFIG_USB=y
 CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
@@ -268,10 +269,14 @@ CONFIG_DMADEVICES=y
 CONFIG_MXC_PXP_V2=y
 CONFIG_IMX_SDMA=y
 CONFIG_MXS_DMA=y
+CONFIG_UIO=y
 CONFIG_COMMON_CLK_DEBUG=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_PWM=y
 CONFIG_PWM_IMX=y
+CONFIG_ARMADEUS_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y


hooks/post-receive
-- 
armadeus