[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-669-gb02a3a9

[Fabien M <fa...@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  b02a3a982e5bbb8fb1c13211822f7582c1e45c6c (commit)
       via  acb02c7df49b6a268ad206d7fd6d72a4d8b145dd (commit)
       via  678297256239d8c26eae332cce73215a43ffa71c (commit)
      from  7ba640d0fc2c5bfd1ce1b6eb6e0613c597df243e (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 b02a3a982e5bbb8fb1c13211822f7582c1e45c6c
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Mar 17 15:18:28 2015 +0100

    [LINUX][APF6]buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config: setting UIO drivers in linux configuration

commit acb02c7df49b6a268ad206d7fd6d72a4d8b145dd
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Mar 17 15:17:54 2015 +0100

    [LINUX][APF6]buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config: setting MSI and pci debug in linux configuration

commit 678297256239d8c26eae332cce73215a43ffa71c
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Mar 17 15:16:26 2015 +0100

    [TOOLS]scripts/export_linux_config.sh: print diff command

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

Summary of changes:
 .../device/armadeus/apf6/apf6-linux-3.19.config    |    5 +++++
 scripts/export_linux_config.sh                     |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

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 d7da2d1..5597aaa 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
@@ -25,6 +25,8 @@ CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_DEBUG=y
 CONFIG_PCI_IMX6=y
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
@@ -228,6 +230,9 @@ CONFIG_RTC_DRV_SNVS=y
 CONFIG_DMADEVICES=y
 CONFIG_IMX_SDMA=y
 CONFIG_MXS_DMA=y
+CONFIG_UIO=y
+CONFIG_UIO_PDRV_GENIRQ=y
+CONFIG_UIO_DMEM_GENIRQ=y
 CONFIG_STAGING=y
 CONFIG_STAGING_MEDIA=y
 # CONFIG_IMX6_CAMERA_OV5642 is not set
diff --git a/scripts/export_linux_config.sh b/scripts/export_linux_config.sh
index 62931a2..edfc09f 100755
--- a/scripts/export_linux_config.sh
+++ b/scripts/export_linux_config.sh
@@ -30,6 +30,7 @@ if [ "$DIFFTOOL" == "" ]; then
 	DIFFTOOL=kompare
 fi
 echo "Using: $DIFFTOOL"
+echo $DIFFTOOL $ARMADEUS_LINUX_DIR/defconfig $ARMADEUS_LINUX_CONFIG
 $DIFFTOOL $ARMADEUS_LINUX_DIR/defconfig $ARMADEUS_LINUX_CONFIG
 
 exit 0


hooks/post-receive
-- 
armadeus