[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-120-g2a4ba83
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2014-02-17 13:46:47
|
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 2a4ba83105c82a9d76397f1020ab6ec1b2b41b86 (commit)
from 476bd0d7e08a4f8f50fa5a5d7a77ba1c8e2fa2f9 (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 2a4ba83105c82a9d76397f1020ab6ec1b2b41b86
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 17 14:46:18 2014 +0100
[BUILDROOT] APF6: Add a config for building xenomai for the APF6 (kernel 3.10.18)
-----------------------------------------------------------------------
Summary of changes:
.../{apf6_defconfig => apf6xenomai_defconfig} | 10 ++-
...072-armadeus-xenomai-download-adeos-patch.patch | 59 ++++++++++++++++++++
2 files changed, 65 insertions(+), 4 deletions(-)
copy buildroot/configs/{apf6_defconfig => apf6xenomai_defconfig} (71%)
create mode 100644 patches/buildroot/2013.11/072-armadeus-xenomai-download-adeos-patch.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6xenomai_defconfig
similarity index 71%
copy from buildroot/configs/apf6_defconfig
copy to buildroot/configs/apf6xenomai_defconfig
index a1c8478..019da2e 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6xenomai_defconfig
@@ -1,7 +1,6 @@
BR2_arm=y
BR2_cortex_a9=y
BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
@@ -12,14 +11,16 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14-rc3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.18"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/apf6xenomai-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-wandboard imx6dl-apf6dev imx6q-apf6dev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_EXT_XENOMAI=y
+BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.10.18-arm-1.patch"
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
@@ -33,6 +34,7 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_XENOMAI_VERSION="2.6.3"
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_TARGET_ROOTFS_EXT2=y
diff --git a/patches/buildroot/2013.11/072-armadeus-xenomai-download-adeos-patch.patch b/patches/buildroot/2013.11/072-armadeus-xenomai-download-adeos-patch.patch
new file mode 100644
index 0000000..96737ed
--- /dev/null
+++ b/patches/buildroot/2013.11/072-armadeus-xenomai-download-adeos-patch.patch
@@ -0,0 +1,59 @@
+Allows downloading of adeos patch if not present locally
+
+TODO: mark BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH as deprecated in BR before
+submitting mainline.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+
+Index: buildroot/linux/linux-ext-xenomai.mk
+===================================================================
+--- buildroot.orig/linux/linux-ext-xenomai.mk 2014-02-12 17:58:11.097907920 +0100
++++ buildroot/linux/linux-ext-xenomai.mk 2014-02-14 16:42:59.698419136 +0100
+@@ -9,11 +9,20 @@
+ LINUX_DEPENDENCIES += xenomai
+
+ # Adeos patch version
+-XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
++XENOMAI_ADEOS_PATCH_URL = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL))
++XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
++ifneq ($(XENOMAI_ADEOS_PATCH_URL),)
++define XENOMAI_ADEOS_DOWNLOAD_PATCH
++ @$(call MESSAGE,"Download adeos patch")
++ $(call DOWNLOAD,$(XENOMAI_ADEOS_PATCH_URL))
++endef
++LINUX_POST_DOWNLOAD_HOOKS += XENOMAI_ADEOS_DOWNLOAD_PATCH
++endif
++
+ ifeq ($(XENOMAI_ADEOS_PATCH),)
+ XENOMAI_ADEOS_OPT = --default
+ else
+-XENOMAI_ADEOS_OPT = --adeos=$(XENOMAI_ADEOS_PATCH)
++XENOMAI_ADEOS_OPT = --adeos=$(DL_DIR)/$(XENOMAI_ADEOS_PATCH)
+ endif
+
+ # Prepare kernel patch
+Index: buildroot/linux/Config.ext.in
+===================================================================
+--- buildroot.orig/linux/Config.ext.in 2014-02-14 16:44:35.518894282 +0100
++++ buildroot/linux/Config.ext.in 2014-02-14 16:49:25.292331195 +0100
+@@ -21,13 +21,14 @@
+ BR2_bfin || BR2_powerpc || BR2_sh4
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+-config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
++config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL
+ depends on BR2_LINUX_KERNEL_EXT_XENOMAI
+- string "Path for Adeos patch file"
++ string "Path/url for Adeos patch file"
+ help
+- Optionally, explicitly specify the Adeos patch to use.
+- Download it at http://download.gna.org/adeos/patches/v2.6/$(ARCH)/
+- and verify that your kernel version in buildroot matches.
++ Optionally, explicitly specify where to find the Adeos patch to use.
++ Examples http://download.gna.org/adeos/patches/v2.6/arm/adeos-ipipe-2.6.38.8-arm-1.18-09.patch
++ or file:///home/foo/adeos-ipipe-2.6.38.8-arm-1.18-09.patch
++ Please verify that your kernel version in Buildroot matches.
+
+ # RTAI
+ config BR2_LINUX_KERNEL_EXT_RTAI
hooks/post-receive
--
armadeus
|