[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-152-g4c9b9e4
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-152-g4c9b9e4
|
From: Julien B a. A. <ar...@us...> - 2014-02-20 15:57:34
|
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 4c9b9e46606a1c2798e4cfbb44774d737ac55fce (commit)
via a880304be673a7ae1607adb8485d35efe61e0d3b (commit)
from 48e4d8503c853a363a9f6e8a796c1694384fab13 (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 4c9b9e46606a1c2798e4cfbb44774d737ac55fce
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 20 16:56:37 2014 +0100
[BUILDROOT] Add a config to easily compile an APF27 Linux kernel with xenomai/adeos
commit a880304be673a7ae1607adb8485d35efe61e0d3b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 20 16:54:39 2014 +0100
[LINUX] APF27: 2.6.29: Fixes 367-armadeus-gpio-add_spinlock_protection.patch (do not compile with adeos changes)
-----------------------------------------------------------------------
Summary of changes:
.../{apf27_defconfig => apf27xenomai_defconfig} | 12 ++++++------
...367-armadeus-gpio-add_spinlock_protection.patch | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
copy buildroot/configs/{apf27_defconfig => apf27xenomai_defconfig} (92%)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27xenomai_defconfig
similarity index 92%
copy from buildroot/configs/apf27_defconfig
copy to buildroot/configs/apf27xenomai_defconfig
index b865f7a..12038aa 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27xenomai_defconfig
@@ -38,6 +38,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
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_EXT_XENOMAI=y
+BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
@@ -64,7 +66,6 @@ BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
BR2_PACKAGE_PORTMAP=y
-BR2_PACKAGE_UUCP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
@@ -72,10 +73,10 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
+BR2_PACKAGE_XENOMAI_VERSION="2.4.9"
+BR2_PACKAGE_XENOMAI_CONF_OPT="--enable-arm-mach=mx2"
+BR2_PACKAGE_XENOMAI_TESTSUITE=y
BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
@@ -86,8 +87,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-20
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
+BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
diff --git a/patches/linux/2.6.29/367-armadeus-gpio-add_spinlock_protection.patch b/patches/linux/2.6.29/367-armadeus-gpio-add_spinlock_protection.patch
index 4f882db..866e0f9 100644
--- a/patches/linux/2.6.29/367-armadeus-gpio-add_spinlock_protection.patch
+++ b/patches/linux/2.6.29/367-armadeus-gpio-add_spinlock_protection.patch
@@ -15,14 +15,14 @@ Index: linux-2.6.29.6/arch/arm/plat-mxc/gpio.c
u32 l;
+ unsigned long flags;
-+ spin_lock_irqsave(port->lock, flags);
++ spin_lock_irqsave(&port->lock, flags);
l = __raw_readl(port->base + GPIO_GDIR);
if (dir)
l |= 1 << offset;
else
l &= ~(1 << offset);
__raw_writel(l, port->base + GPIO_GDIR);
-+ spin_unlock_irqrestore(port->lock, flags);
++ spin_unlock_irqrestore(&port->lock, flags);
}
static void mxc_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
@@ -32,10 +32,10 @@ Index: linux-2.6.29.6/arch/arm/plat-mxc/gpio.c
u32 l;
+ unsigned long flags;
-+ spin_lock_irqsave(port->lock, flags);
++ spin_lock_irqsave(&port->lock, flags);
l = (__raw_readl(reg) & (~(1 << offset))) | ((value?1:0) << offset);
__raw_writel(l, reg);
-+ spin_unlock_irqrestore(port->lock, flags);
++ spin_unlock_irqrestore(&port->lock, flags);
}
static int mxc_gpio_get(struct gpio_chip *chip, unsigned offset)
hooks/post-receive
--
armadeus
|
