[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-20-g3c13eec

[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  3c13eec9389c26ed2e00a165a0794acff0568f89 (commit)
       via  ebda7ea10aa913d2d80feef651ba00bc705457b5 (commit)
       via  cf71fb6425f5f0f6583428445abd89f585d99acf (commit)
      from  b92caf5697096104b47f3c2041dfb9497653c97c (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 3c13eec9389c26ed2e00a165a0794acff0568f89
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Oct 15 22:30:27 2015 +0200

    [TOOLS] Fixes scripts/export_linux_config.sh when kernel has a strange name :-)

commit ebda7ea10aa913d2d80feef651ba00bc705457b5
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Oct 15 22:29:01 2015 +0200

    [LINUX] APF6: 3.10: add some serial USB adapters drivers to default config

commit cf71fb6425f5f0f6583428445abd89f585d99acf
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Oct 15 22:28:00 2015 +0200

    [LINUX] APF6: 3.19+: add USB serial gadget to default configs

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

Summary of changes:
 Makefile.in                                        |    7 ++++++-
 .../device/armadeus/apf6/apf6-linux-3.19.config    |    1 +
 .../device/armadeus/apf6/apf6-linux-4.0.config     |    1 +
 .../armadeus/apf6/apf6legacy-linux-3.10.config     |    4 ++++
 4 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index b480e06..43648e2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,7 +89,12 @@ endif
 ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERSION)
 ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
 ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
-ARMADEUS_LINUX_CONFIG:=$(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
+ifneq ($(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE),)
+TEMP_ARMADEUS_LINUX_CONFIG = $(shell echo $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) | rev | cut -d "/" -f 1 | rev)
+ARMADEUS_LINUX_CONFIG = $(ARMADEUS_BOARD_DIR)/$(TEMP_ARMADEUS_LINUX_CONFIG)
+else
+ARMADEUS_LINUX_CONFIG = $(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
+endif
 ARMADEUS_U_BOOT_CONFIG:=$(BUILDROOT_DIR)/$(shell echo $(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE))
 ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
 ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_HOST_DIR)/usr/bin
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 f96e770..2a02ef9 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
@@ -231,6 +231,7 @@ CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ETH=m
 CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=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 c60ce02..ea980b6 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
@@ -238,6 +238,7 @@ CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ETH=m
 CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=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 5199e23..f683d8c 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
@@ -246,6 +246,10 @@ CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_PHY=y
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_PL2303=m
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y


hooks/post-receive
-- 
armadeus