armadeus-commitlog Mailing List for armadeus (Page 127)
Brought to you by:
sszy
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ar...@us...> - 2009-03-22 09:39:01
|
Revision: 1181
http://armadeus.svn.sourceforge.net/armadeus/?rev=1181&view=rev
Author: artemys
Date: 2009-03-22 09:38:51 +0000 (Sun, 22 Mar 2009)
Log Message:
-----------
[LINUX] Add driver for i.MX27 VPU (Video Processing Unit)
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/318-apf27-pengu-mxc_add_vpu_driver.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/319-apf27-pengu-mx2_add_vpu_device.patch
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch 2009-03-21 17:06:05 UTC (rev 1180)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch 2009-03-22 09:38:51 UTC (rev 1181)
@@ -4,8 +4,8 @@
Index: linux-2.6.27.13/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.27.13/arch/arm/mach-mx2/apf27.c 2009-03-13 11:02:49.000000000 +0100
-@@ -0,0 +1,1303 @@
++++ linux-2.6.27.13/arch/arm/mach-mx2/apf27.c 2009-03-20 09:21:52.000000000 +0100
+@@ -0,0 +1,1306 @@
+ /*
+ * apf27.c
+ *
@@ -216,7 +216,7 @@
+#define TSC2101_CS (GPIO_PORTD|21)
+#define MCP251X_CS (GPIO_PORTD|20)
+static int mxc_cspi1_pins[] = {
-+ (TSC2101_CS | GPIO_OUT | GPIO_GPIO ), /* <- Seulement si TSC sélectionné aussi !! */
++ (TSC2101_CS | GPIO_OUT | GPIO_GPIO ), /* <- Only if TSC is selected too !! */
+ (MCP251X_CS | GPIO_OUT | GPIO_GPIO ),
+ //PD19_PF_CSPI2_SS2,
+ //PD20_PF_CSPI2_SS1, /* MCP2515 */
@@ -1034,6 +1034,9 @@
+#endif
+ ALSA_SOUND
+ CPU_FREQUENCY
++#ifdef CONFIG_MXC_VPU
++ &mxc_vpu_device,
++#endif
+};
+
+
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/318-apf27-pengu-mxc_add_vpu_driver.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/318-apf27-pengu-mxc_add_vpu_driver.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/318-apf27-pengu-mxc_add_vpu_driver.patch 2009-03-22 09:38:51 UTC (rev 1181)
@@ -0,0 +1,652 @@
+From: Sascha Hauer <s....@pe...>
+Date: Tue, 11 Nov 2008 12:36:49 +0000 (+0100)
+Subject: MXC: Add vpu driver
+X-Git-Url: http://pasiphae.extern.pengutronix.de/?p=imx%2Flinux-2.6.git;a=commitdiff_plain;h=6fecdadc964f2ac25e445435a2e9c62a0a46e235
+
+MXC: Add vpu driver
+
+This adds support for the VPU (Video Processing unit) found on mx27.
+The patch has been taken nearly 1:1 from the freescale repository, so
+it can use some cleanup. At a first glance this looks for a good usecase
+for UIO.
+
+20081023 convert to use device_create
+
+20081104 let userspace access the codec engine through PAR
+
+ Set Peripheral access register bit for the codec to 0.
+ Freescale invents funny names for this bit in the PAR. It's called
+ 'reserved'. Grumpf.
+
+Signed-off-by: Sascha Hauer <s....@pe...>
+---
+
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 9722f8b..209a53d 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -1268,6 +1268,8 @@ source "drivers/rtc/Kconfig"
+
+ source "drivers/dma/Kconfig"
+
++source "drivers/mxc/Kconfig"
++
+ source "drivers/dca/Kconfig"
+
+ source "drivers/auxdisplay/Kconfig"
+diff --git a/drivers/Makefile b/drivers/Makefile
+index fceb71a..99c847c 100644
+--- a/drivers/Makefile
++++ b/drivers/Makefile
+@@ -102,3 +102,4 @@ obj-$(CONFIG_SSB) += ssb/
+ obj-$(CONFIG_VIRTIO) += virtio/
+ obj-$(CONFIG_REGULATOR) += regulator/
+ obj-$(CONFIG_STAGING) += staging/
++obj-y += mxc/
+\ No newline at end of file
+diff --git a/drivers/mxc/Kconfig b/drivers/mxc/Kconfig
+new file mode 100644
+index 0000000..90fcfd1
+--- /dev/null
++++ b/drivers/mxc/Kconfig
+@@ -0,0 +1,13 @@
++# drivers/video/mxc/Kconfig
++
++if ARCH_MXC
++
++menu "MXC support drivers"
++
++#if MACH_MX27
++source "drivers/mxc/vpu/Kconfig"
++#endif
++
++endmenu
++
++endif
+diff --git a/drivers/mxc/Makefile b/drivers/mxc/Makefile
+new file mode 100644
+index 0000000..619ae8f
+--- /dev/null
++++ b/drivers/mxc/Makefile
+@@ -0,0 +1,3 @@
++#
++obj-$(CONFIG_MXC_VPU) += vpu/
++
+diff --git a/drivers/mxc/vpu/Kconfig b/drivers/mxc/vpu/Kconfig
+new file mode 100644
+index 0000000..4dae100
+--- /dev/null
++++ b/drivers/mxc/vpu/Kconfig
+@@ -0,0 +1,21 @@
++#
++# Codec configuration
++#
++
++menu "MXC VPU(Video Processing Unit) support"
++
++config MXC_VPU
++ tristate "Support for MXC VPU(Video Processing Unit)"
++ depends on MACH_MX27
++ ---help---
++ The VPU codec device provides codec function for H.264/MPEG4/H.263
++
++config MXC_VPU_DEBUG
++ bool "MXC VPU debugging"
++ depends on MXC_VPU
++ help
++ This is an option for the developers; most people should
++ say N here. This enables MXC VPU driver debugging.
++
++endmenu
++
+diff --git a/drivers/mxc/vpu/Makefile b/drivers/mxc/vpu/Makefile
+new file mode 100644
+index 0000000..ad96730
+--- /dev/null
++++ b/drivers/mxc/vpu/Makefile
+@@ -0,0 +1,10 @@
++#
++# Makefile for the VPU drivers.
++#
++
++obj-$(CONFIG_MXC_VPU) += vpu.o
++vpu-objs := mxc_vpu.o
++
++ifeq ($(CONFIG_MXC_VPU_DEBUG),y)
++EXTRA_CFLAGS += -DDEBUG
++endif
+diff --git a/drivers/mxc/vpu/mxc_vpu.c b/drivers/mxc/vpu/mxc_vpu.c
+new file mode 100644
+index 0000000..e77601c
+--- /dev/null
++++ b/drivers/mxc/vpu/mxc_vpu.c
+@@ -0,0 +1,501 @@
++/*
++ * Copyright 2006-2007 Freescale Semiconductor, Inc. All Rights Reserved.
++ */
++
++/*
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/*!
++ * @file mxc_vpu.c
++ *
++ * @brief VPU system initialization and file operation implementation
++ *
++ * @ingroup VPU
++ */
++
++#include <linux/kernel.h>
++#include <linux/fs.h>
++#include <linux/mm.h>
++#include <linux/interrupt.h>
++#include <linux/autoconf.h>
++#include <linux/ioport.h>
++#include <linux/stat.h>
++#include <linux/platform_device.h>
++#include <linux/kdev_t.h>
++#include <linux/dma-mapping.h>
++#include <linux/wait.h>
++#include <linux/list.h>
++#include <linux/clk.h>
++#include <linux/io.h>
++
++#include <asm/uaccess.h>
++#include <asm/sizes.h>
++#include <asm/dma-mapping.h>
++
++#include <mach/hardware.h>
++
++#include "mxc_vpu.h"
++
++#define BIT_INT_CLEAR 0x00C
++#define BIT_INT_STATUS 0x010
++#define BIT_INT_ENABLE 0x170
++
++typedef struct vpu_t {
++ struct fasync_struct *async_queue;
++} vpu_t;
++
++/* To track the allocated memory buffer */
++typedef struct memalloc_record {
++ struct list_head list;
++ vpu_mem_desc mem;
++} memalloc_record;
++
++static DEFINE_SPINLOCK(vpu_lock);
++static LIST_HEAD(head);
++
++static int vpu_major = 0;
++static struct class *vpu_class;
++static struct vpu_t vpu_data;
++static u8 open_count = 0;
++static struct clk *vpu_clk;
++
++/* implement the blocking ioctl */
++static int codec_done = 0;
++static wait_queue_head_t vpu_queue;
++static int wait_intr_cnt = 0;
++
++/*!
++ * Private function to free buffers
++ * @return status 0 success.
++ */
++static int vpu_free_buffers(void)
++{
++ struct memalloc_record *rec, *n;
++ vpu_mem_desc mem;
++
++ spin_lock(&vpu_lock);
++ list_for_each_entry_safe(rec, n, &head, list) {
++ mem = rec->mem;
++ if (mem.cpu_addr != 0) {
++ dma_free_coherent(0, PAGE_ALIGN(mem.size),
++ (void *)mem.cpu_addr, mem.phy_addr);
++ pr_debug("[FREE] freed paddr=0x%08X\n", mem.phy_addr);
++
++ /* delete from list */
++ list_del(&rec->list);
++ kfree(rec);
++ }
++ }
++ spin_unlock(&vpu_lock);
++
++ return 0;
++}
++
++/*!
++ * @brief vpu interrupt handler
++ */
++static irqreturn_t vpu_irq_handler(int irq, void *dev_id)
++{
++ struct vpu_t *dev;
++ dev = (struct vpu_t *)dev_id;
++ __raw_readl(IO_ADDRESS(VPU_BASE_ADDR + BIT_INT_STATUS));
++ __raw_writel(0x1, IO_ADDRESS(VPU_BASE_ADDR + BIT_INT_CLEAR));
++ if (dev->async_queue)
++ kill_fasync(&dev->async_queue, SIGIO, POLL_IN);
++
++ codec_done = 1;
++ wake_up_interruptible(&vpu_queue);
++
++ return IRQ_HANDLED;
++}
++
++/*!
++ * @brief vpu hardware enable function
++ *
++ * @return 0 on success or negative error code on error
++ */
++static int vpu_hardware_enable(void)
++{
++ u32 tmp;
++
++ clk_enable(vpu_clk);
++
++ /* Let userspace access the codec engine through the
++ * peripheral access register.
++ */
++ tmp = __raw_readl(IO_ADDRESS(AIPI_BASE_ADDR + 0x00020008));
++ __raw_writel(tmp & ~(1 << 3), IO_ADDRESS(AIPI_BASE_ADDR + 0x00020008));
++
++ return 0;
++}
++
++/*!
++ * @brief vpu hardware disable function
++ *
++ * @return 0 on success or negative error code on error
++ */
++static int vpu_hardware_disable(void)
++{
++ clk_disable(vpu_clk);
++ return 0;
++
++}
++
++/*!
++ * @brief open function for vpu file operation
++ *
++ * @return 0 on success or negative error code on error
++ */
++static int vpu_open(struct inode *inode, struct file *filp)
++{
++ if (open_count++ == 0) {
++ filp->private_data = (void *)(&vpu_data);
++ vpu_hardware_enable();
++ } else {
++ printk(KERN_ERR "VPU has already been opened.\n");
++ return -EACCES;
++ }
++
++ return 0;
++}
++
++/*!
++ * @brief IO ctrl function for vpu file operation
++ * @param cmd IO ctrl command
++ * @return 0 on success or negative error code on error
++ */
++static int vpu_ioctl(struct inode *inode, struct file *filp, u_int cmd,
++ u_long arg)
++{
++ int ret = 0;
++
++ switch (cmd) {
++ case VPU_IOC_PHYMEM_ALLOC:
++ {
++ struct memalloc_record *rec;
++
++ rec = kzalloc(sizeof(*rec), GFP_KERNEL);
++ if (!rec)
++ return -ENOMEM;
++
++ ret = copy_from_user(&(rec->mem), (vpu_mem_desc *) arg,
++ sizeof(vpu_mem_desc));
++ if (ret) {
++ kfree(rec);
++ return -EFAULT;
++ }
++
++ pr_debug("[ALLOC] mem alloc size = 0x%x\n",
++ rec->mem.size);
++ rec->mem.cpu_addr = (unsigned long)
++ dma_alloc_coherent(NULL,
++ PAGE_ALIGN(rec->mem.size),
++ (dma_addr_t
++ *) (&(rec->mem.phy_addr)),
++ GFP_DMA | GFP_KERNEL);
++ pr_debug("[ALLOC] mem alloc cpu_addr = 0x%x\n",
++ rec->mem.cpu_addr);
++ if ((void *)(rec->mem.cpu_addr) == NULL) {
++ kfree(rec);
++ printk(KERN_ERR
++ "Physical memory allocation error!\n");
++ ret = -1;
++ break;
++ }
++ ret = copy_to_user((void __user *)arg, &(rec->mem),
++ sizeof(vpu_mem_desc));
++ if (ret) {
++ kfree(rec);
++ ret = -EFAULT;
++ break;
++ }
++
++ spin_lock(&vpu_lock);
++ list_add(&rec->list, &head);
++ spin_unlock(&vpu_lock);
++
++ break;
++ }
++ case VPU_IOC_PHYMEM_FREE:
++ {
++ struct memalloc_record *rec, *n;
++ vpu_mem_desc vpu_mem;
++
++ ret = copy_from_user(&vpu_mem, (vpu_mem_desc *) arg,
++ sizeof(vpu_mem_desc));
++ if (ret)
++ return -EACCES;
++
++ pr_debug("[FREE] mem freed cpu_addr = 0x%x\n",
++ vpu_mem.cpu_addr);
++ if ((void *)vpu_mem.cpu_addr != NULL) {
++ dma_free_coherent(NULL,
++ PAGE_ALIGN(vpu_mem.size),
++ (void *)vpu_mem.cpu_addr,
++ (dma_addr_t) vpu_mem.
++ phy_addr);
++ }
++
++ spin_lock(&vpu_lock);
++ list_for_each_entry_safe(rec, n, &head, list) {
++ if (rec->mem.cpu_addr == vpu_mem.cpu_addr) {
++ /* delete from list */
++ list_del(&rec->list);
++ kfree(rec);
++ break;
++ }
++ }
++ spin_unlock(&vpu_lock);
++
++ break;
++ }
++ case VPU_IOC_WAIT4INT:
++ {
++ u_long timeout = (u_long) arg;
++ if (!wait_event_interruptible_timeout
++ (vpu_queue, codec_done != 0,
++ msecs_to_jiffies(timeout))) {
++ printk(KERN_WARNING "VPU blocking: timeout.\n");
++ ret = -ETIME;
++ return ret;
++ } else if (signal_pending(current)) {
++ if (wait_intr_cnt == 0) {
++ printk(KERN_WARNING "VPU interrupt received.\n");
++ }
++ wait_intr_cnt++;
++ ret = -ERESTARTSYS;
++ return ret;
++ }
++
++ codec_done = 0;
++ break;
++
++ }
++/* RMW: this is not portable across platforms */
++#ifdef CONFIG_ARCH_MX27
++ /* set/clear LHD (Latency Hiding Disable) bit in ESDCFG0 reg.
++ Tends to fix MPEG4 issue on MX27 TO2 */
++ case VPU_IOC_LHD:
++ {
++ u_int disable = (u_int) arg;
++ u_int reg;
++ u_int reg_addr;
++
++ reg_addr = IO_ADDRESS(SDRAMC_BASE_ADDR + 0x10);
++ reg = __raw_readl(reg_addr);
++ pr_debug("ESDCFG0: [ 0x%08x ]\n", reg);
++
++ if (disable == 0) {
++ __raw_writel(reg & ~0x00000020, reg_addr);
++ pr_debug("Latency Hiding Disable\n");
++ } else {
++ __raw_writel(reg | 0x00000020, reg_addr);
++ pr_debug("Latency Hiding Enable\n");
++ }
++
++ pr_debug("ESDCFG0: [ 0x%08x ]\n",
++ __raw_readl(reg_addr));
++
++ break;
++ }
++#endif
++ case VPU_IOC_VL2CC_FLUSH:
++ break;
++ case VPU_IOC_REG_DUMP:
++ break;
++ case VPU_IOC_PHYMEM_DUMP:
++ break;
++ default:
++ {
++ printk(KERN_ERR "No such IOCTL, cmd is %d\n", cmd);
++ break;
++ }
++ }
++ return ret;
++}
++
++/*!
++ * @brief Release function for vpu file operation
++ * @return 0 on success or negative error code on error
++ */
++static int vpu_release(struct inode *inode, struct file *filp)
++{
++ if (--open_count == 0) {
++ vpu_free_buffers();
++ vpu_hardware_disable();
++ }
++
++ return 0;
++}
++
++/*!
++ * @brief fasync function for vpu file operation
++ * @return 0 on success or negative error code on error
++ */
++static int vpu_fasync(int fd, struct file *filp, int mode)
++{
++ struct vpu_t *dev = (struct vpu_t *)filp->private_data;
++ return fasync_helper(fd, filp, mode, &dev->async_queue);
++}
++
++/*!
++ * @brief memory map function of harware registers for vpu file operation
++ * @return 0 on success or negative error code on error
++ */
++static int vpu_map_hwregs(struct file *fp, struct vm_area_struct *vm)
++{
++ unsigned long pfn;
++
++ vm->vm_flags |= VM_IO | VM_RESERVED;
++ vm->vm_page_prot = pgprot_noncached(vm->vm_page_prot);
++ pfn = VPU_BASE_ADDR >> PAGE_SHIFT;
++ pr_debug("size=0x%x, page no.=0x%x\n",
++ (int)(vm->vm_end - vm->vm_start), (int)pfn);
++ return remap_pfn_range(vm, vm->vm_start, pfn, vm->vm_end - vm->vm_start,
++ vm->vm_page_prot) ? -EAGAIN : 0;
++}
++
++/*!
++ * @brief memory map function of memory for vpu file operation
++ * @return 0 on success or negative error code on error
++ */
++static int vpu_map_mem(struct file *fp, struct vm_area_struct *vm)
++{
++ int request_size;
++ request_size = vm->vm_end - vm->vm_start;
++
++ pr_debug(" start=0x%x, pgoff=0x%x, size=0x%x\n",
++ (unsigned int)(vm->vm_start), (unsigned int)(vm->vm_pgoff),
++ request_size);
++
++ vm->vm_flags |= VM_IO | VM_RESERVED;
++ vm->vm_page_prot = pgprot_noncached(vm->vm_page_prot);
++
++ return remap_pfn_range(vm, vm->vm_start, vm->vm_pgoff,
++ request_size, vm->vm_page_prot) ? -EAGAIN : 0;
++
++}
++
++/*!
++ * @brief memory map interface for vpu file operation
++ * @return 0 on success or negative error code on error
++ */
++static int vpu_mmap(struct file *fp, struct vm_area_struct *vm)
++{
++ if (vm->vm_pgoff)
++ return vpu_map_mem(fp, vm);
++ else
++ return vpu_map_hwregs(fp, vm);
++}
++
++struct file_operations vpu_fops = {
++ .owner = THIS_MODULE,
++ .open = vpu_open,
++ .ioctl = vpu_ioctl,
++ .release = vpu_release,
++ .fasync = vpu_fasync,
++ .mmap = vpu_mmap,
++};
++
++/*!
++ * This function is called by the driver framework to initialize the vpu device.
++ * @param dev The device structure for the vpu passed in by the framework.
++ * @return 0 on success or negative error code on error
++ */
++static int vpu_dev_probe(struct platform_device *pdev)
++{
++ int err = 0;
++ struct device *temp_device;
++ struct resource *res;
++
++ vpu_major = register_chrdev(vpu_major, "mxc_vpu", &vpu_fops);
++ if (vpu_major < 0) {
++ printk(KERN_ERR "vpu: unable to get a major for VPU\n");
++ err = -EBUSY;
++ goto error;
++ }
++
++ vpu_class = class_create(THIS_MODULE, "mxc_vpu");
++ if (IS_ERR(vpu_class)) {
++ err = PTR_ERR(vpu_class);
++ goto err_out_chrdev;
++ }
++
++ temp_device = device_create(vpu_class, NULL,
++ MKDEV(vpu_major, 0), NULL, "mxc_vpu");
++ if (IS_ERR(temp_device)) {
++ err = PTR_ERR(temp_device);
++ goto err_out_class;
++ }
++
++ vpu_clk = clk_get(&pdev->dev, "vpu_clk");
++ if (IS_ERR(vpu_clk)) {
++ err = -ENOENT;
++ goto err_out_class;
++ }
++
++ err = request_irq(MXC_INT_VPU, vpu_irq_handler, 0, "VPU_CODEC_IRQ",
++ (void *)(&vpu_data));
++ if (err)
++ goto err_out_class;
++
++ printk(KERN_INFO "VPU initialized\n");
++ goto out;
++
++ err_out_class:
++ device_destroy(vpu_class, MKDEV(vpu_major, 0));
++ class_destroy(vpu_class);
++ err_out_chrdev:
++ unregister_chrdev(vpu_major, "mxc_vpu");
++ error:
++ out:
++ return err;
++}
++
++/*! Driver definition
++ *
++ */
++static struct platform_driver mxcvpu_driver = {
++ .driver = {
++ .name = "mxc_vpu",
++ },
++ .probe = vpu_dev_probe,
++};
++
++static int __init vpu_init(void)
++{
++ int ret = platform_driver_register(&mxcvpu_driver);
++
++ init_waitqueue_head(&vpu_queue);
++
++ return ret;
++}
++
++static void __exit vpu_exit(void)
++{
++ free_irq(MXC_INT_VPU, (void *)(&vpu_data));
++ if (vpu_major > 0) {
++ device_destroy(vpu_class, MKDEV(vpu_major, 0));
++ class_destroy(vpu_class);
++ unregister_chrdev(vpu_major, "mxc_vpu");
++ vpu_major = 0;
++ }
++
++ clk_put(vpu_clk);
++
++ platform_driver_unregister(&mxcvpu_driver);
++ return;
++}
++
++MODULE_AUTHOR("Freescale Semiconductor, Inc.");
++MODULE_DESCRIPTION("Linux VPU driver for Freescale i.MX27");
++MODULE_LICENSE("GPL");
++
++module_init(vpu_init);
++module_exit(vpu_exit);
+diff --git a/drivers/mxc/vpu/mxc_vpu.h b/drivers/mxc/vpu/mxc_vpu.h
+new file mode 100644
+index 0000000..df3b99f
+--- /dev/null
++++ b/drivers/mxc/vpu/mxc_vpu.h
+@@ -0,0 +1,22 @@
++typedef struct vpu_mem_desc {
++ u32 size;
++ dma_addr_t phy_addr;
++ u32 cpu_addr; /* cpu address to free the dma mem */
++ u32 virt_uaddr; /* virtual user space address */
++} vpu_mem_desc;
++
++#define VPU_IOC_MAGIC 'V'
++
++#define VPU_IOC_PHYMEM_ALLOC _IO(VPU_IOC_MAGIC, 0)
++#define VPU_IOC_PHYMEM_FREE _IO(VPU_IOC_MAGIC, 1)
++#define VPU_IOC_WAIT4INT _IO(VPU_IOC_MAGIC, 2)
++#define VPU_IOC_PHYMEM_DUMP _IO(VPU_IOC_MAGIC, 3)
++#define VPU_IOC_REG_DUMP _IO(VPU_IOC_MAGIC, 4)
++#define VPU_IOC_LHD _IO(VPU_IOC_MAGIC, 5)
++#define VPU_IOC_VL2CC_FLUSH _IO(VPU_IOC_MAGIC, 6)
++
++int vl2cc_init(u32 vl2cc_hw_base);
++void vl2cc_enable(void);
++void vl2cc_flush(void);
++void vl2cc_disable(void);
++void vl2cc_cleanup(void);
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/319-apf27-pengu-mx2_add_vpu_device.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/319-apf27-pengu-mx2_add_vpu_device.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/319-apf27-pengu-mx2_add_vpu_device.patch 2009-03-22 09:38:51 UTC (rev 1181)
@@ -0,0 +1,19 @@
+From: Sascha Hauer <s....@pe...>
+Date: Tue, 11 Nov 2008 14:46:05 +0000 (+0100)
+Subject: MX2: Add VPU (video processing unit) device
+X-Git-Url: http://pasiphae.extern.pengutronix.de/?p=imx%2Flinux-2.6.git;a=commitdiff_plain;h=362e97c9b0a6fa4b861462958ccdfcbdf8d3a118
+
+MX2: Add VPU (video processing unit) device
+
+Signed-off-by: Sascha Hauer <s....@pe...>
+---
+
+diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h
+index 64bb85b..c3c3a81 100644
+--- a/arch/arm/mach-mx2/devices.h
++++ b/arch/arm/mach-mx2/devices.h
+@@ -28,3 +28,4 @@ extern struct platform_device imx_i2c_device0;
+ extern struct platform_device imx_i2c_device1;
+ extern struct platform_device mx27_camera_device;
+ extern struct platform_device mxc_fb_device;
++extern struct platform_device mxc_vpu_device;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-03-21 17:06:23
|
Revision: 1180
http://armadeus.svn.sourceforge.net/armadeus/?rev=1180&view=rev
Author: jorasse
Date: 2009-03-21 17:06:05 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
[BUILDROOT] Added directory to store custom configurations
Added Paths:
-----------
trunk/buildroot/local/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-03-21 17:03:24
|
Revision: 1179
http://armadeus.svn.sourceforge.net/armadeus/?rev=1179&view=rev
Author: jorasse
Date: 2009-03-21 17:03:14 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
[U-BOOT] change patch release to 2.1 and environment variable compatibility version
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf27/apf27.h
trunk/software/uboot_recover/apf27-u-boot.bin
Modified: trunk/buildroot/target/device/armadeus/apf27/apf27.h
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27.h 2009-03-20 19:51:56 UTC (rev 1178)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27.h 2009-03-21 17:03:14 UTC (rev 1179)
@@ -32,8 +32,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_ENV_VERSION "1.5"
-#define CONFIG_IDENT_STRING " apf27 patch 2.0"
+#define CONFIG_ENV_VERSION "1.6"
+#define CONFIG_IDENT_STRING " apf27 patch 2.1"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
#define CONFIG_IMX27 1 /* in a Freescale i.MX27 Chip */
Modified: trunk/software/uboot_recover/apf27-u-boot.bin
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gwe...@us...> - 2009-03-20 19:52:08
|
Revision: 1178
http://armadeus.svn.sourceforge.net/armadeus/?rev=1178&view=rev
Author: gwenhael
Date: 2009-03-20 19:51:56 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
[BUILDROOT] Xenomai is dependent host-fakeroot
Modified Paths:
--------------
trunk/buildroot/package/xenomai/xenomai.mk
Modified: trunk/buildroot/package/xenomai/xenomai.mk
===================================================================
--- trunk/buildroot/package/xenomai/xenomai.mk 2009-03-20 10:50:23 UTC (rev 1177)
+++ trunk/buildroot/package/xenomai/xenomai.mk 2009-03-20 19:51:56 UTC (rev 1178)
@@ -82,7 +82,7 @@
echo "/usr/xenomai/lib" > $(TARGET_DIR)/etc/ld.so.conf
echo -e 'export PATH=/usr/xenomai/bin:$${PATH}' >> $(TARGET_DIR)/etc/profile
-xenomai: uclibc kernel-headers $(TARGET_DIR)/$(XENOMAI_TARGET_BINARY)
+xenomai: uclibc host-fakeroot kernel-headers $(TARGET_DIR)/$(XENOMAI_TARGET_BINARY)
xenomai-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) uninstall
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gwe...@us...> - 2009-03-20 10:50:34
|
Revision: 1177
http://armadeus.svn.sourceforge.net/armadeus/?rev=1177&view=rev
Author: gwenhael
Date: 2009-03-20 10:50:23 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
[LINUX] Suppres DEBUG preproc
Modified Paths:
--------------
trunk/target/linux/modules/gpio/core.c
Modified: trunk/target/linux/modules/gpio/core.c
===================================================================
--- trunk/target/linux/modules/gpio/core.c 2009-03-20 10:44:37 UTC (rev 1176)
+++ trunk/target/linux/modules/gpio/core.c 2009-03-20 10:50:23 UTC (rev 1177)
@@ -22,7 +22,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-#define DEBUG 1
+
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gwe...@us...> - 2009-03-20 10:44:44
|
Revision: 1176
http://armadeus.svn.sourceforge.net/armadeus/?rev=1176&view=rev
Author: gwenhael
Date: 2009-03-20 10:44:37 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
[LINUX] gpio proc entries (portXirq, portXpullup) has not good types : corrects that
Modified Paths:
--------------
trunk/target/linux/modules/gpio/core.c
Modified: trunk/target/linux/modules/gpio/core.c
===================================================================
--- trunk/target/linux/modules/gpio/core.c 2009-03-20 07:38:51 UTC (rev 1175)
+++ trunk/target/linux/modules/gpio/core.c 2009-03-20 10:44:37 UTC (rev 1176)
@@ -22,7 +22,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-
+#define DEBUG 1
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
@@ -854,7 +854,7 @@
/* Create proc file to handle GPIO interrupt settings */
for (i = 0; i < NB_PORTS; i++) {
sprintf(proc_config[i].name, "%s/%sirq", GPIO_PROC_DIRNAME, port_name[i]);
- proc_config[i].type = DIRECTION;
+ proc_config[i].type = INTERRUPT;
}
if ((ret = initialize_proc_entry(proc_config)))
@@ -864,7 +864,7 @@
/* Create proc file to handle GPIO pullup settings */
for (i = 0; i < NB_PORTS; i++) {
sprintf(proc_config[i].name, "%s/%spullup", GPIO_PROC_DIRNAME, port_name[i]);
- proc_config[i].type = DIRECTION;
+ proc_config[i].type = PULL_UP;
}
if ((ret = initialize_proc_entry(proc_config)))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-20 07:39:06
|
Revision: 1175
http://armadeus.svn.sourceforge.net/armadeus/?rev=1175&view=rev
Author: artemys
Date: 2009-03-20 07:38:51 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
[BUILD] Add ARMADEUS_STAGING_DIR & ARMADEUS_TOOLCHAIN_PATH envt variables
Modified Paths:
--------------
trunk/Makefile
trunk/Makefile.in
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-03-19 13:03:48 UTC (rev 1174)
+++ trunk/Makefile 2009-03-20 07:38:51 UTC (rev 1175)
@@ -164,6 +164,8 @@
@echo ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_ROOTFS_DIR=$(ARMADEUS_ROOTFS_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_ROOTFS_TAR=$(ARMADEUS_ROOTFS_TAR) >> $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_STAGING_DIR=$(ARMADEUS_STAGING_DIR) >> $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_TOOLCHAIN_PATH=$(ARMADEUS_TOOLCHAIN_PATH) >> $(ARMADEUS_ENV_FILE)
PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2009-03-19 13:03:48 UTC (rev 1174)
+++ trunk/Makefile.in 2009-03-20 07:38:51 UTC (rev 1175)
@@ -28,6 +28,8 @@
ARMADEUS_BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)/
ARMADEUS_ROOTFS_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_BOARD_NAME)/root
ARMADEUS_ROOTFS_TAR=$(BUILDROOT_DIR)/binaries/$(ARMADEUS_BOARD_NAME)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
+ARMADEUS_STAGING_DIR=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)/staging_dir
+ARMADEUS_TOOLCHAIN_PATH=$(ARMADEUS_STAGING_DIR)/usr/bin
ARMADEUS_BUILD_DIR=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)
ARMADEUS_SDL_DIR=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2009-03-19 13:03:57
|
Revision: 1174
http://armadeus.svn.sourceforge.net/armadeus/?rev=1174&view=rev
Author: thom25
Date: 2009-03-19 13:03:48 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
[U-BOOT] fix reinitialization of network before each ping (ticket 40)
Modified Paths:
--------------
trunk/buildroot/target/u-boot/u-boot-1.3.4-300-imx27.patch
Modified: trunk/buildroot/target/u-boot/u-boot-1.3.4-300-imx27.patch
===================================================================
--- trunk/buildroot/target/u-boot/u-boot-1.3.4-300-imx27.patch 2009-03-19 12:10:26 UTC (rev 1173)
+++ trunk/buildroot/target/u-boot/u-boot-1.3.4-300-imx27.patch 2009-03-19 13:03:48 UTC (rev 1174)
@@ -2441,7 +2441,7 @@
+#########################################################################
--- ref/u-boot-1.3.4/cpu/arm926ejs/imx27/miiphy.c 1970-01-01 01:00:00.000000000 +0100
+++ u-boot-1.3.4/cpu/arm926ejs/imx27/miiphy.c 2008-12-29 16:27:49.000000000 +0100
-@@ -0,0 +1,124 @@
+@@ -0,0 +1,126 @@
+/*
+ * miiphy.c - generic phy abstraction
+ *
@@ -2466,46 +2466,48 @@
+ */
+
+#include <common.h>
-+#include "miiphy.h"
++#include "miiphy.h"
+
+int miiphy_restart_aneg(struct miiphy_device *mdev)
+{
+ uint16_t status;
+ int timeout;
+
-+ /*
-+ * Wake up from sleep if necessary
-+ * Reset PHY, then delay 300ns
-+ */
-+ mdev->write(mdev, mdev->address, MII_SPECIAL, 0x00FF);
-+ mdev->write(mdev, mdev->address, MII_BMCR, BMCR_RESET);
-+ udelay(1000);
++ mdev->read(mdev, mdev->address, MII_SPECIAL, &status);
++ if( status != 0xff){
++ /*
++ * Wake up from sleep if necessary
++ * Reset PHY, then delay 300ns
++ */
++ mdev->write(mdev, mdev->address, MII_SPECIAL, 0x00FF);
++ mdev->write(mdev, mdev->address, MII_BMCR, BMCR_RESET);
++ udelay(1000);
+
-+ if (mdev->flags & MIIPHY_FORCE_10) {
-+ printf("Forcing 10 Mbps ethernet link... ");
-+ mdev->read(mdev, mdev->address, MII_BMSR, &status);
-+ mdev->write(mdev, mdev->address, MII_BMCR, BMCR_FULLDPLX | BMCR_CTST);
-+
-+ timeout = 20;
-+ do { /* wait for link status to go down */
-+ udelay(10000);
-+ if ((timeout--) == 0) {
-+#if (DEBUG & 0x2)
-+ printf("hmmm, should not have waited...");
-+#endif
-+ break;
-+ }
++ if (mdev->flags & MIIPHY_FORCE_10) {
++ printf("Forcing 10 Mbps ethernet link... ");
+ mdev->read(mdev, mdev->address, MII_BMSR, &status);
-+ } while (status & BMSR_LSTATUS);
++ mdev->write(mdev, mdev->address, MII_BMCR, BMCR_FULLDPLX | BMCR_CTST);
+
-+ } else { /* MII100 */
-+ /*
-+ * Set the auto-negotiation advertisement register bits
-+ */
-+ mdev->write(mdev, mdev->address, MII_ADVERTISE, ADVERTISE_ALL);
-+ mdev->write(mdev, mdev->address, MII_BMCR, BMCR_ANENABLE | BMCR_ANRESTART);
++ timeout = 20;
++ do { /* wait for link status to go down */
++ udelay(10000);
++ if ((timeout--) == 0) {
++ #if (DEBUG & 0x2)
++ printf("hmmm, should not have waited...");
++ #endif
++ break;
++ }
++ mdev->read(mdev, mdev->address, MII_BMSR, &status);
++ } while (status & BMSR_LSTATUS);
++
++ } else { /* MII100 */
++ /*
++ * Set the auto-negotiation advertisement register bits
++ */
++ mdev->write(mdev, mdev->address, MII_ADVERTISE, ADVERTISE_ALL);
++ mdev->write(mdev, mdev->address, MII_BMCR, BMCR_ANENABLE | BMCR_ANRESTART);
++ }
+ }
-+
+ return 0;
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2009-03-19 12:10:28
|
Revision: 1173
http://armadeus.svn.sourceforge.net/armadeus/?rev=1173&view=rev
Author: FabM
Date: 2009-03-19 12:10:26 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
[LINUX] Suppress useless fpgaaccess driver
Modified Paths:
--------------
trunk/target/linux/modules/fpga/dev_tools/Kconfig
trunk/target/linux/modules/fpga/dev_tools/Makefile
Removed Paths:
-------------
trunk/target/linux/modules/fpga/dev_tools/fpgaaccess/
Modified: trunk/target/linux/modules/fpga/dev_tools/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/Kconfig 2009-03-19 09:23:29 UTC (rev 1172)
+++ trunk/target/linux/modules/fpga/dev_tools/Kconfig 2009-03-19 12:10:26 UTC (rev 1173)
@@ -6,4 +6,3 @@
depends on ARMADEUS_FPGA_DRIVERS
source "drivers/armadeus/fpga/dev_tools/loader/Kconfig"
-#source "drivers/armadeus/fpga/dev_tools/fpgaaccess/Kconfig"
Modified: trunk/target/linux/modules/fpga/dev_tools/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/Makefile 2009-03-19 09:23:29 UTC (rev 1172)
+++ trunk/target/linux/modules/fpga/dev_tools/Makefile 2009-03-19 12:10:26 UTC (rev 1173)
@@ -9,7 +9,6 @@
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS) += loader/
-#obj-$(CONFIG_ARMADEUS_FPGAACCESS_DRIVER) += fpgaaccess/
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-19 09:23:37
|
Revision: 1172
http://armadeus.svn.sourceforge.net/armadeus/?rev=1172&view=rev
Author: artemys
Date: 2009-03-19 09:23:29 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
[LINUX] fpgaloader was not correctly built: corrects that
Modified Paths:
--------------
trunk/target/linux/modules/fpga/dev_tools/Makefile
Modified: trunk/target/linux/modules/fpga/dev_tools/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/Makefile 2009-03-18 13:36:50 UTC (rev 1171)
+++ trunk/target/linux/modules/fpga/dev_tools/Makefile 2009-03-19 09:23:29 UTC (rev 1172)
@@ -8,7 +8,7 @@
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_FPGA_LOADER_DRIVER) += loader/
+obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS) += loader/
#obj-$(CONFIG_ARMADEUS_FPGAACCESS_DRIVER) += fpgaaccess/
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gwe...@us...> - 2009-03-18 13:41:56
|
Revision: 1171
http://armadeus.svn.sourceforge.net/armadeus/?rev=1171&view=rev
Author: gwenhael
Date: 2009-03-18 13:36:50 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
[BUILDROOT] xenomai : Using fakeroot for "make install"
Modified Paths:
--------------
trunk/buildroot/package/xenomai/xenomai.mk
Removed Paths:
-------------
trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch
Deleted: trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch
===================================================================
--- trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch 2009-03-18 13:05:11 UTC (rev 1170)
+++ trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch 2009-03-18 13:36:50 UTC (rev 1171)
@@ -1,12 +0,0 @@
-diff -u a/Makefile.in b/Makefile.in
---- a/Makefile.in 2009-03-12 15:16:41.000000000 +0100
-+++ b/Makefile.in 2009-03-12 15:16:54.000000000 +0100
-@@ -228,7 +228,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I config
--SUDO = sudo
-+SUDO = fakeroot
- SUBDIRS = src include config @XENO_MAYBE_DOCDIR@ scripts
- EXTRA_DIST = CREDITS README.INSTALL TROUBLESHOOTING ksrc examples debian
- all: all-recursive
Modified: trunk/buildroot/package/xenomai/xenomai.mk
===================================================================
--- trunk/buildroot/package/xenomai/xenomai.mk 2009-03-18 13:05:11 UTC (rev 1170)
+++ trunk/buildroot/package/xenomai/xenomai.mk 2009-03-18 13:36:50 UTC (rev 1171)
@@ -48,13 +48,7 @@
$(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-$(XENOMAI_DIR)/.patched.makefile: $(XENOMAI_DIR)/.unpacked
- toolchain/patch-kernel.sh $(XENOMAI_DIR) package/xenomai \
- 02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch
- touch $@
-
-
-$(KERN_DIR)/.patched.xenomai: $(KERN_DIR)/.patched.adeos $(XENOMAI_DIR)/.patched.makefile
+$(KERN_DIR)/.patched.xenomai: $(KERN_DIR)/.patched.adeos $(XENOMAI_DIR)/.unpacked
$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
--linux=$(LINUX26_DIR) \
--arch=$(BR2_ARCH)
@@ -81,7 +75,7 @@
$(TARGET_DIR)/$(XENOMAI_TARGET_BINARY): $(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY)
echo $@
- $(MAKE) -C $(XENOMAI_DIR) \
+ $(STAGING_DIR)/usr/bin/fakeroot $(MAKE) -C $(XENOMAI_DIR) \
CC=$(TARGET_CC) LD=$(TARGET_LD) \
DESTDIR=$(TARGET_DIR) install
rm -rf $(TARGET_DIR)/xenodoc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2009-03-18 13:05:21
|
Revision: 1170
http://armadeus.svn.sourceforge.net/armadeus/?rev=1170&view=rev
Author: FabM
Date: 2009-03-18 13:05:11 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
[U-BOOT] Changing timing for fpga communication, strength for bus controls signals and CLK0 frequency (now the same frequency as weim bus -> 133MHz)
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf27/apf27.h
Modified: trunk/buildroot/target/device/armadeus/apf27/apf27.h
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27.h 2009-03-18 10:29:37 UTC (rev 1169)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27.h 2009-03-18 13:05:11 UTC (rev 1170)
@@ -176,6 +176,9 @@
"then echo Flashing of Firmware succeed;" \
"else echo Flashing of Firmware failed;" \
"fi\0" \
+ "fpga_config=tftpboot ${fileaddr} $firmware_name;"\
+ "run flash_firmware;"\
+ "fpga load 0 ${fileaddr} ${firmware_len};\0"\
"flash_kernel=nand erase ${kernel_offset} ${kernel_len};" \
"if nand write.jffs2 ${fileaddr} ${kernel_offset} ${filesize} ;"\
"then echo Flashing of kernel succeed;" \
@@ -325,6 +328,8 @@
#define CONFIG_SSI2_FREQ 66 /* 66.50 MHz SSI2*/
#define CONFIG_MSHC_FREQ 66 /* 66.50 MHz MSHC*/
#define CONFIG_H264_FREQ 66 /* 66.50 MHz H264*/
+#define CONFIG_CLK0_DIV 0 /* Divide CLK0 by 1 */
+#define CONFIG_CLK0_EN 1 /* CLK0 enabled */
/* external bus frequency (have to be a CONFIG_HCLK_FREQ ratio) */
#define CONFIG_NFC_FREQ 44 /* NFC Clock up to 44 MHz wh 133MHz*/
@@ -660,7 +665,7 @@
#define CFG_CS4A_VAL 0
/* FPGA 16 bit data bus */
-#define CFG_CS5U_VAL 0x00000600
+#define CFG_CS5U_VAL 0x00000500
#define CFG_CS5L_VAL 0x00000D01
#define CFG_CS5A_VAL 0
@@ -668,13 +673,13 @@
/* FPGA specific settings */
/* CLKO */
-#define CFG_CCSR_VAL 0x00000307
+#define CFG_CCSR_VAL 0x00000308
/* drive strength CLKO set to 2*/
#define CFG_DSCR10_VAL 0x00020000
/* drive strength A1..A12 set to 2*/
#define CFG_DSCR3_VAL 0x02AAAAA8
/* drive strength ctrl*/
-#define CFG_DSCR7_VAL 0x008A08A0
+#define CFG_DSCR7_VAL 0x00020880
/* drive strength data*/
#define CFG_DSCR2_VAL 0xAAAAAAAA
@@ -823,11 +828,12 @@
/* SSIx CLKO NFC H264 MSHC */
#define CFG_PCDR0_VAL\
- (0x02C00000 \
- |((((CONFIG_SYS_CLK_FREQ/CONFIG_MSHC_FREQ)-1)&0x3F)<<0) \
+ (((((CONFIG_SYS_CLK_FREQ/CONFIG_MSHC_FREQ)-1)&0x3F)<<0) \
|((((CONFIG_HCLK_FREQ/CONFIG_NFC_FREQ)-1)&0x0F)<<6) \
|(((((CONFIG_SYS_CLK_FREQ/CONFIG_H264_FREQ)-2)*2)&0x3F)<<10)\
|(((((CONFIG_SYS_CLK_FREQ/CONFIG_SSI1_FREQ)-2)*2)&0x3F)<<16)\
+ |(((CONFIG_CLK0_DIV)&0x07)<<22)\
+ |(((CONFIG_CLK0_EN)&0x01)<<25)\
|(((((CONFIG_SYS_CLK_FREQ/CONFIG_SSI2_FREQ)-2)*2)&0x3F)<<26))
/* PERCLKx */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-18 10:29:49
|
Revision: 1169
http://armadeus.svn.sourceforge.net/armadeus/?rev=1169&view=rev
Author: artemys
Date: 2009-03-18 10:29:37 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
[LINUX] fpgaloader.sh script is no more needed
Removed Paths:
-------------
trunk/target/linux/modules/fpga/dev_tools/loader/fpgaloader.sh
Deleted: trunk/target/linux/modules/fpga/dev_tools/loader/fpgaloader.sh
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/loader/fpgaloader.sh 2009-03-18 08:21:39 UTC (rev 1168)
+++ trunk/target/linux/modules/fpga/dev_tools/loader/fpgaloader.sh 2009-03-18 10:29:37 UTC (rev 1169)
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Load FPGA main module
-modprobe fpgaloader fpga_descriptor=0
-
-FPGA_MAJOR=`cat /proc/devices | grep fpgaloader | cut -d " " -f 1`
-mkdir -p /dev/fpga
-
-# For general usage
-if [ ! -e /dev/fpga/fpgaloader ] ; then
- mknod /dev/fpga/fpgaloader c $FPGA_MAJOR 0
-fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-18 08:22:07
|
Revision: 1168
http://armadeus.svn.sourceforge.net/armadeus/?rev=1168&view=rev
Author: artemys
Date: 2009-03-18 08:21:39 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
[LINUX] Some fpga modules were not correctly installed on target rootfs (due to recent regression); so corrects that
Modified Paths:
--------------
trunk/target/linux/modules/fpga/dev_tools/Makefile
trunk/target/linux/modules/fpga/dev_tools/loader/Makefile
trunk/target/linux/modules/fpga/others/Makefile
Modified: trunk/target/linux/modules/fpga/dev_tools/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/Makefile 2009-03-16 20:17:50 UTC (rev 1167)
+++ trunk/target/linux/modules/fpga/dev_tools/Makefile 2009-03-18 08:21:39 UTC (rev 1168)
@@ -8,8 +8,8 @@
# Part executed when called from kernel build system:
-obj-$(ARMADEUS_FPGA_LOADER_DRIVER) += loader/
-#obj-$(ARMADEUS_FPGAACCESS_DRIVER) += fpgaaccess/
+obj-$(CONFIG_ARMADEUS_FPGA_LOADER_DRIVER) += loader/
+#obj-$(CONFIG_ARMADEUS_FPGAACCESS_DRIVER) += fpgaaccess/
else
Modified: trunk/target/linux/modules/fpga/dev_tools/loader/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/loader/Makefile 2009-03-16 20:17:50 UTC (rev 1167)
+++ trunk/target/linux/modules/fpga/dev_tools/loader/Makefile 2009-03-18 08:21:39 UTC (rev 1168)
@@ -5,12 +5,11 @@
ifneq ($(KERNELRELEASE),)
obj-$(CONFIG_ARMADEUS_FPGA_LOADER_DRIVER) += fpgaloader.o
-ifneq ($(CONFIG_MACH_APF27),)
fpgaloader-objs := xilinx-fpga-loader.o fpga-loader.o
+ifneq ($(CONFIG_MACH_APF27),)
obj-y += apf27-fpga-loader.o
endif
ifneq ($(CONFIG_MACH_APF9328),)
-fpgaloader-objs := xilinx-fpga-loader.o fpga-loader.o
obj-y += apf9328-fpga-loader.o
endif
Modified: trunk/target/linux/modules/fpga/others/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/Makefile 2009-03-16 20:17:50 UTC (rev 1167)
+++ trunk/target/linux/modules/fpga/others/Makefile 2009-03-18 08:21:39 UTC (rev 1168)
@@ -8,7 +8,7 @@
# Part executed when called from kernel build system:
-obj-$(ARMADEUS_I2C_OCORE_IRQMNG) += i2ctest/
+obj-$(CONFIG_ARMADEUS_I2C_OCORE_IRQMNG) += i2ctest/
obj-$(CONFIG_ARMADEUS_PS2KBD_DRIVER) += ps2keyboard/
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-16 20:17:55
|
Revision: 1167
http://armadeus.svn.sourceforge.net/armadeus/?rev=1167&view=rev
Author: artemys
Date: 2009-03-16 20:17:50 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
[LINUX] Change init method of source buffer in DMA test driver
Modified Paths:
--------------
trunk/target/linux/modules/dma_test/dma.c
Modified: trunk/target/linux/modules/dma_test/dma.c
===================================================================
--- trunk/target/linux/modules/dma_test/dma.c 2009-03-16 15:43:20 UTC (rev 1166)
+++ trunk/target/linux/modules/dma_test/dma.c 2009-03-16 20:17:50 UTC (rev 1167)
@@ -91,7 +91,7 @@
if (nb_done > nb_todo) {
stop_time = (unsigned int)jiffies;
printk("%s: done (%d) at time 0x%08x\n", __func__, nb_done, stop_time);
- printk("0x%08x 0x%08x\n", dma_dest_buffer.cpu_mem[0], dma_dest_buffer.cpu_mem[1024]);
+ printk("0x%08x 0x%08x\n", dma_dest_buffer.cpu_mem[0], dma_dest_buffer.cpu_mem[4096]);
printk("Tranferred %d Bytes in %d msecs\n", (buffer_size * nb_done), (stop_time - start_time)*10);
printk(" --> %d Bytes/secs\n", ((buffer_size * nb_done) / ((stop_time - start_time)*10)) * 1000);
nb_done = 0;
@@ -196,7 +196,7 @@
int __init dma_test_init(void)
{
int err, dma_req;
- unsigned int burstlen;
+ unsigned int burstlen, i;
static struct proc_dir_entry *proc_active;
/* Allocate memory buffers */
@@ -214,7 +214,9 @@
return -ENOMEM;
}
- memset(dma_source_buffer.cpu_mem, 0xa5, buffer_size);
+ for (i = 0; i < (buffer_size/sizeof(u32)); i++) {
+ dma_source_buffer.cpu_mem[i] = i;
+ }
printk("DMA source virt: 0x%p phys: 0x%08x\n", dma_source_buffer.cpu_mem, dma_source_buffer.dma_mem);
memset(dma_dest_buffer.cpu_mem, 0, buffer_size);
printk("DMA dest virt: 0x%p phys: 0x%08x\n", dma_dest_buffer.cpu_mem, dma_dest_buffer.dma_mem);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-16 15:43:34
|
Revision: 1166
http://armadeus.svn.sourceforge.net/armadeus/?rev=1166&view=rev
Author: artemys
Date: 2009-03-16 15:43:20 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
[LINUX] Add a driver to test DMA throughput
Added Paths:
-----------
trunk/target/linux/modules/dma_test/
trunk/target/linux/modules/dma_test/Makefile
trunk/target/linux/modules/dma_test/dma.c
Added: trunk/target/linux/modules/dma_test/Makefile
===================================================================
--- trunk/target/linux/modules/dma_test/Makefile (rev 0)
+++ trunk/target/linux/modules/dma_test/Makefile 2009-03-16 15:43:20 UTC (rev 1166)
@@ -0,0 +1,24 @@
+#
+# Makefile for the DMA throughput test driver
+#
+
+# Part executed when called from kernel build system:
+ifneq ($(KERNELRELEASE),)
+
+obj-m += dma.o
+
+# Part executed when called from standard make in this directory:
+# (preferably use Makefile in parent directory)
+else
+
+ARMADEUS_BASE_DIR=../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR := $(ARMADEUS_LINUX_DIR)
+PWD := $(shell pwd)
+
+# Armadeus custom drivers common targets:
+include ../Makefile.in
+
+endif
+
Property changes on: trunk/target/linux/modules/dma_test/Makefile
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/target/linux/modules/dma_test/dma.c
===================================================================
--- trunk/target/linux/modules/dma_test/dma.c (rev 0)
+++ trunk/target/linux/modules/dma_test/dma.c 2009-03-16 15:43:20 UTC (rev 1166)
@@ -0,0 +1,280 @@
+/*
+ * Driver to test DMA throughput
+ *
+ * Copyright (C) 2008 Armadeus Systems <jul...@ar...>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#define DEBUG
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <asm/types.h>
+#include <linux/proc_fs.h>
+#include <asm/uaccess.h> /* get_user,copy_to_user */
+
+#ifdef CONFIG_ARCH_MX2
+#include <mach/dma-mx1-mx2.h>
+#define DMA_DIMR 0x08 /* Interrupt mask Register */
+#define DMA_CCR(x) (0x8c + ((x) << 6)) /* Control Registers */
+#define CCR_FRC (1<<1)
+#define CCR_CEN (1<<0)
+#else
+#include <mach/imx-dma.h>
+#endif
+
+
+#define DRIVER_NAME "dma-test"
+
+
+struct dma_buffer {
+ u32* cpu_mem;
+ dma_addr_t dma_mem;
+};
+
+struct dma_buffer dma_source_buffer, dma_dest_buffer;
+
+static unsigned int nb_todo = 0;
+static unsigned int nb_done = 0;
+
+static int channel;
+
+unsigned int buffer_size = 512 * 1024;
+
+static unsigned int start_time = 0;
+static unsigned int stop_time = 0;
+
+
+static void inline dma_test_trig_transfer(void)
+{
+ /* Activate interrupts for channel */
+ __raw_writel(__raw_readl(DMA_BASE + DMA_DIMR) & ~(1<<channel),
+ DMA_BASE + DMA_DIMR);
+ /* Manually trigger DMA transfer */
+ __raw_writel(__raw_readl(DMA_BASE + DMA_CCR(channel)) | CCR_FRC | CCR_CEN,
+ DMA_BASE + DMA_CCR(channel));
+}
+
+/* Called by the DMA framework when a period has elapsed (scatter-gather */
+/*static void dma_test_progression(int channel, void *data,
+ struct scatterlist *sg)
+{
+ if (sg) {
+ ;
+ }
+}*/
+
+/* called when the DMA unit has finished the buffer (single mode) */
+static void dma_test_callback(int channel, void *data)
+{
+ if (nb_done > nb_todo) {
+ stop_time = (unsigned int)jiffies;
+ printk("%s: done (%d) at time 0x%08x\n", __func__, nb_done, stop_time);
+ printk("0x%08x 0x%08x\n", dma_dest_buffer.cpu_mem[0], dma_dest_buffer.cpu_mem[1024]);
+ printk("Tranferred %d Bytes in %d msecs\n", (buffer_size * nb_done), (stop_time - start_time)*10);
+ printk(" --> %d Bytes/secs\n", ((buffer_size * nb_done) / ((stop_time - start_time)*10)) * 1000);
+ nb_done = 0;
+ } else {
+ dma_source_buffer.cpu_mem[0] &= 0xffff0000;
+ dma_source_buffer.cpu_mem[0] |= nb_done;
+ nb_done++;
+ dma_test_trig_transfer();
+ }
+}
+
+/* Called by the DMA framework when an error has occured */
+static void dma_test_err_handler(int channel, void *data, int err)
+{
+ printk("%s %d %d\n", __func__, channel, err);
+
+ printk("DMA timeout on channel %d -%s%s%s%s%s\n",
+ channel,
+ err & IMX_DMA_ERR_BURST ? " burst":"",
+ err & IMX_DMA_ERR_REQUEST ? " request":"",
+ err & IMX_DMA_ERR_TRANSFER ? " transfer":"",
+ err & IMX_DMA_ERR_BUFFER ? " buffer":"",
+ err & IMX_DMA_ERR_TIMEOUT ? " hw_chain_watchdog":"");
+
+ imx_dma_disable(channel);
+}
+
+/* configure DMA channel of a given substream */
+static int dma_request(void)
+{
+ int err=0, chan=0;
+
+ chan = imx_dma_request_by_prio(DRIVER_NAME, DMA_PRIO_HIGH);
+ if (chan < 0) {
+ printk(KERN_ERR "Unable to grab a DMA channel\n");
+ err = chan;
+ goto on_error_1;
+ }
+
+ err = imx_dma_setup_handlers(chan,
+ dma_test_callback,
+ dma_test_err_handler, NULL /* private data comes here */);
+ if (err < 0) {
+ printk(KERN_ERR "Unable to setup DMA handler for channel %d\n", chan);
+ err = -EIO;
+ goto on_error_2;
+ }
+
+/* err = imx_dma_setup_progression_handler(chan,
+ dma_test_progression);
+ if (err != 0) {
+ pr_err("Failed to setup the DMA progression handler\n");
+ err = -EIO;
+ goto on_error_2;
+ } */
+
+ printk("DMA channel %d setup\n", chan);
+ imx_dma_disable(chan);
+
+ return chan;
+
+on_error_2:
+ imx_dma_free(chan);
+on_error_1:
+ return err;
+}
+
+
+static int dma_test_proc_write( __attribute__ ((unused)) struct file *file, const char *buf, unsigned long count, void *data)
+{
+ int len;
+ char given_param[16];
+ int loops;
+
+ if (count <= 0) {
+ printk("Empty string transmitted !\n");
+ return 0;
+ }
+ if (count > 4) {
+ len = 4;
+ printk("Only 4x[0-9] decimal values supported !\n");
+ } else {
+ len = count;
+ }
+
+ if (copy_from_user(given_param, buf, len)) {
+ return -EFAULT;
+ }
+
+ loops = simple_strtol(given_param, 0, 10);
+ /* start transfer */
+ printk("Launching %d DMA transfers (mem to mem) at time 0x%08x\n", loops, (unsigned int)jiffies);
+ nb_todo = loops;
+ start_time = (unsigned int)jiffies;
+ dma_test_trig_transfer();
+
+ return len;
+}
+
+
+
+int __init dma_test_init(void)
+{
+ int err, dma_req;
+ unsigned int burstlen;
+ static struct proc_dir_entry *proc_active;
+
+ /* Allocate memory buffers */
+ dma_source_buffer.cpu_mem = dma_alloc_coherent(0,
+ buffer_size,
+ &(dma_source_buffer.dma_mem),
+ GFP_DMA | GFP_KERNEL);
+ dma_dest_buffer.cpu_mem = dma_alloc_coherent(0,
+ buffer_size,
+ &(dma_dest_buffer.dma_mem),
+ GFP_DMA | GFP_KERNEL);
+
+ if ((!dma_source_buffer.cpu_mem) || (!dma_dest_buffer.cpu_mem)) {
+ printk("Failed to allocate buffers !\n");
+ return -ENOMEM;
+ }
+
+ memset(dma_source_buffer.cpu_mem, 0xa5, buffer_size);
+ printk("DMA source virt: 0x%p phys: 0x%08x\n", dma_source_buffer.cpu_mem, dma_source_buffer.dma_mem);
+ memset(dma_dest_buffer.cpu_mem, 0, buffer_size);
+ printk("DMA dest virt: 0x%p phys: 0x%08x\n", dma_dest_buffer.cpu_mem, dma_dest_buffer.dma_mem);
+
+ burstlen = 64;
+ dma_req = 0; /* no hw req for mem to mem DMA */
+
+ /* request DMA channel */
+ channel = dma_request();
+ if (channel < 0)
+ return channel;
+
+ /* configure i.MX DMA control register for given channel */
+ err = imx_dma_config_channel(channel,
+ IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR,
+ IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR,
+ dma_req, 1);
+ if (err < 0) {
+ printk("Cannot configure DMA for channel %d\n", channel);
+ }
+
+ /* configure DMA burst length for channel */
+ imx_dma_config_burstlen(channel, burstlen);
+
+ err = imx_dma_setup_single(channel, dma_source_buffer.dma_mem,
+ buffer_size, dma_dest_buffer.dma_mem,
+ DMA_MODE_WRITE);
+ if (err < 0) {
+ printk("Cannot setup DMA for channel %d\n", channel);
+ }
+
+ /* create proc files */
+ proc_active = create_proc_entry( "driver/dma_test", S_IWUSR | S_IRGRP | S_IROTH, NULL);
+ if ((proc_active == NULL)) {
+ printk(KERN_ERR DRIVER_NAME ": Could not register one /proc file. Terminating\n");
+ return -ENOMEM;
+ } else {
+ proc_active->write_proc = dma_test_proc_write;
+ }
+
+ return 0;
+}
+
+void __exit dma_test_exit(void)
+{
+ imx_dma_disable(channel);
+ imx_dma_free(channel);
+
+ remove_proc_entry("driver/dma_test", NULL);
+
+ dma_free_coherent(0, buffer_size, dma_source_buffer.cpu_mem,
+ dma_source_buffer.dma_mem);
+ dma_free_coherent(0, buffer_size, dma_dest_buffer.cpu_mem,
+ dma_dest_buffer.dma_mem);
+}
+
+
+module_init(dma_test_init);
+module_exit(dma_test_exit);
+
+MODULE_AUTHOR("Julien Boibessot");
+MODULE_DESCRIPTION("APF27 DMA test");
+MODULE_LICENSE("GPL");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gwe...@us...> - 2009-03-16 08:57:35
|
Revision: 1165
http://armadeus.svn.sourceforge.net/armadeus/?rev=1165&view=rev
Author: gwenhael
Date: 2009-03-16 08:57:29 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
[BUILDROOT] xenomai patch moved to the Makefile.advanced end
Modified Paths:
--------------
trunk/patches/072-buildroot-xenomai-package.diff
Modified: trunk/patches/072-buildroot-xenomai-package.diff
===================================================================
--- trunk/patches/072-buildroot-xenomai-package.diff 2009-03-16 08:19:30 UTC (rev 1164)
+++ trunk/patches/072-buildroot-xenomai-package.diff 2009-03-16 08:57:29 UTC (rev 1165)
@@ -13,13 +13,13 @@
diff -urN buildroot/target/linux/Makefile.in.advanced buildroot.new/target/linux/Makefile.in.advanced
--- buildroot/target/linux/Makefile.in.advanced 2009-02-24 11:42:16.000000000 +0100
+++ buildroot.new/target/linux/Makefile.in.advanced 2009-02-24 11:40:07.000000000 +0100
-@@ -278,6 +278,9 @@
- toolchain/patch-kernel.sh $(LINUX26_DIR) package/openswan \
- linux-$(LINUX26_VERSION)\*.patch{,.gz,.bz2}
+@@ -382,6 +382,9 @@
+ $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
+ (cd $(LINUX_DIR)/drivers; ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ armadeus)
endif
+ifeq ($(BR2_PACKAGE_XENOMAI),y)
-+ make -C ../buildroot xenomai-patch-kernel
++ make -C ../buildroot xenomai-patch-kernel
+endif
+ $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig
touch $@
-
- $(LINUX26_DIR)/.patched.arch: $(LINUX26_DIR)/.patched
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-16 08:19:45
|
Revision: 1164
http://armadeus.svn.sourceforge.net/armadeus/?rev=1164&view=rev
Author: artemys
Date: 2009-03-16 08:19:30 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
[BUILD] Add a script to makes Armadeus Linux patches series usable with quilt
Added Paths:
-----------
trunk/scripts/
trunk/scripts/quilt.sh
Added: trunk/scripts/quilt.sh
===================================================================
--- trunk/scripts/quilt.sh (rev 0)
+++ trunk/scripts/quilt.sh 2009-03-16 08:19:30 UTC (rev 1164)
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+make shell_env
+. armadeus_env.sh
+
+
+if [ "$1" == "export" ]; then
+ echo "Exporting your work (patches) from $ARMADEUS_LINUX_DIR/patches/ to $ARMADEUS_LINUX_PATCH_DIR"
+ cp -f $ARMADEUS_LINUX_DIR/patches/*.patch $ARMADEUS_LINUX_PATCH_DIR/
+ echo -e "\n--- You can now check your work before commiting in $ARMADEUS_LINUX_PATCH_DIR/ \n"
+ exit 0
+fi
+
+
+# else import patches:
+
+echo "Updating your SVN view"
+svn update
+
+echo "I will delete this directory: $ARMADEUS_LINUX_DIR"
+echo " Ok ? (y/n)"
+
+read response
+
+if [ "$response" != "y" ]; then
+ exit 1
+fi
+
+rm -rf $ARMADEUS_LINUX_DIR
+make linux26-unpacked
+
+
+pushd $ARMADEUS_LINUX_DIR
+mkdir patches
+
+PATCHES=`ls -ar $ARMADEUS_LINUX_PATCH_DIR/*.patch`
+
+for patch in $PATCHES; do
+ quilt import $patch
+done
+
+quilt push -a
+
+quilt series >> .applied_patches_list
+
+touch .unpacked
+touch .patched
+touch .patched.arch
+touch .patched.board
+
+echo -e "\n--- Your kernel is \"quiltified\" ! I will now compile it...\n"
+sleep 2
+
+popd
+make
+
+echo -e "\n--- Your can now go to $ARMADEUS_LINUX_DIR\nHappy hacking ! ;-)\n"
+echo -e "__ Don't forget to do a \"$0 export\" after your modifications __\n"
+
+exit 0
Property changes on: trunk/scripts/quilt.sh
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gwe...@us...> - 2009-03-13 15:22:49
|
Revision: 1163
http://armadeus.svn.sourceforge.net/armadeus/?rev=1163&view=rev
Author: gwenhael
Date: 2009-03-13 15:22:39 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
[BUIDROOT] xenomai : correct patch problem with dirclean + typo
Modified Paths:
--------------
trunk/buildroot/package/xenomai/xenomai.mk
Added Paths:
-----------
trunk/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch
trunk/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch
trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch
trunk/buildroot/package/xenomai/xeno-kernel.config
Removed Paths:
-------------
trunk/buildroot/package/xenomai/01-adeos-2.6.27-1.12-00.patch
trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch
trunk/buildroot/package/xenomai/04-suppr-patch.patch
trunk/buildroot/package/xenomai/configXenoKernel
Copied: trunk/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch (from rev 1162, trunk/buildroot/package/xenomai/04-suppr-patch.patch)
===================================================================
--- trunk/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch (rev 0)
+++ trunk/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imx-regs.h
++++ b/arch/arm/mach-imx/include/mach/imx-regs.h
+@@ -411,7 +411,6 @@
+ #define PCR_BPIX_8 (3<<25)
+ #define PCR_BPIX_12 (4<<25)
+ #define PCR_BPIX_16 (4<<25)
+-#define PCR_BPIX_MASK (7<<25)
+ #define PCR_PIXPOL (1<<24)
+ #define PCR_FLMPOL (1<<23)
+ #define PCR_LPPOL (1<<22)
Copied: trunk/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch (from rev 1162, trunk/buildroot/package/xenomai/01-adeos-2.6.27-1.12-00.patch)
===================================================================
--- trunk/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch (rev 0)
+++ trunk/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -0,0 +1,24 @@
+diff -ru a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
+--- a/arch/arm/mach-imx/irq.c 2009-02-17 11:32:52.000000000 +0100
++++ b/arch/arm/mach-imx/irq.c 2009-02-23 14:12:43.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include <asm/io.h>
+
+ #include <asm/mach/irq.h>
+-#include <asm/arch/imx-regs.h>
++#include <mach/imx-regs.h>
+
+
+ /* Used for IMX INTERRUPT priority: Still Experimental */
+diff -ru a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
+--- a/arch/arm/mach-imx/time.c 2009-02-25 17:03:34.000000000 +0100
++++ b/arch/arm/mach-imx/time.c 2009-02-25 16:36:16.000000000 +0100
+@@ -294,6 +294,8 @@
+ #ifdef CONFIG_IPIPE
+ void __ipipe_mach_acktimer(void)
+ {
++ uint32_t tstat;
++ tstat = IMX_TSTAT(TIMER_BASE);
+ IMX_TSTAT(TIMER_BASE) = 0;
+ }
+
Deleted: trunk/buildroot/package/xenomai/01-adeos-2.6.27-1.12-00.patch
===================================================================
--- trunk/buildroot/package/xenomai/01-adeos-2.6.27-1.12-00.patch 2009-03-13 14:56:36 UTC (rev 1162)
+++ trunk/buildroot/package/xenomai/01-adeos-2.6.27-1.12-00.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -1,24 +0,0 @@
-diff -ru a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
---- a/arch/arm/mach-imx/irq.c 2009-02-17 11:32:52.000000000 +0100
-+++ b/arch/arm/mach-imx/irq.c 2009-02-23 14:12:43.000000000 +0100
-@@ -35,7 +35,7 @@
- #include <asm/io.h>
-
- #include <asm/mach/irq.h>
--#include <asm/arch/imx-regs.h>
-+#include <mach/imx-regs.h>
-
-
- /* Used for IMX INTERRUPT priority: Still Experimental */
-diff -ru a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
---- a/arch/arm/mach-imx/time.c 2009-02-25 17:03:34.000000000 +0100
-+++ b/arch/arm/mach-imx/time.c 2009-02-25 16:36:16.000000000 +0100
-@@ -294,6 +294,8 @@
- #ifdef CONFIG_IPIPE
- void __ipipe_mach_acktimer(void)
- {
-+ uint32_t tstat;
-+ tstat = IMX_TSTAT(TIMER_BASE);
- IMX_TSTAT(TIMER_BASE) = 0;
- }
-
Copied: trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch (from rev 1162, trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch)
===================================================================
--- trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch (rev 0)
+++ trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -0,0 +1,12 @@
+diff -u a/Makefile.in b/Makefile.in
+--- a/Makefile.in 2009-03-12 15:16:41.000000000 +0100
++++ b/Makefile.in 2009-03-12 15:16:54.000000000 +0100
+@@ -228,7 +228,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I config
+-SUDO = sudo
++SUDO = fakeroot
+ SUBDIRS = src include config @XENO_MAYBE_DOCDIR@ scripts
+ EXTRA_DIST = CREDITS README.INSTALL TROUBLESHOOTING ksrc examples debian
+ all: all-recursive
Deleted: trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch
===================================================================
--- trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch 2009-03-13 14:56:36 UTC (rev 1162)
+++ trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -1,12 +0,0 @@
-diff -u a/Makefile.in b/Makefile.in
---- a/Makefile.in 2009-03-12 15:16:41.000000000 +0100
-+++ b/Makefile.in 2009-03-12 15:16:54.000000000 +0100
-@@ -228,7 +228,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I config
--SUDO = sudo
-+SUDO = fakeroot
- SUBDIRS = src include config @XENO_MAYBE_DOCDIR@ scripts
- EXTRA_DIST = CREDITS README.INSTALL TROUBLESHOOTING ksrc examples debian
- all: all-recursive
Deleted: trunk/buildroot/package/xenomai/04-suppr-patch.patch
===================================================================
--- trunk/buildroot/package/xenomai/04-suppr-patch.patch 2009-03-13 14:56:36 UTC (rev 1162)
+++ trunk/buildroot/package/xenomai/04-suppr-patch.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -1,10 +0,0 @@
---- a/arch/arm/mach-imx/include/mach/imx-regs.h
-+++ b/arch/arm/mach-imx/include/mach/imx-regs.h
-@@ -411,7 +411,6 @@
- #define PCR_BPIX_8 (3<<25)
- #define PCR_BPIX_12 (4<<25)
- #define PCR_BPIX_16 (4<<25)
--#define PCR_BPIX_MASK (7<<25)
- #define PCR_PIXPOL (1<<24)
- #define PCR_FLMPOL (1<<23)
- #define PCR_LPPOL (1<<22)
Deleted: trunk/buildroot/package/xenomai/configXenoKernel
===================================================================
--- trunk/buildroot/package/xenomai/configXenoKernel 2009-03-13 14:56:36 UTC (rev 1162)
+++ trunk/buildroot/package/xenomai/configXenoKernel 2009-03-13 15:22:39 UTC (rev 1163)
@@ -1,59 +0,0 @@
-CONFIG_XENOMAI=y
-CONFIG_XENO_OPT_NUCLEUS=y
-CONFIG_XENO_OPT_PERVASIVE=y
-# CONFIG_XENO_OPT_ISHIELD is not set
-CONFIG_XENO_OPT_PRIOCPL=y
-CONFIG_XENO_OPT_PIPELINE_HEAD=y
-CONFIG_XENO_OPT_PIPE_NRDEV=32
-CONFIG_XENO_OPT_REGISTRY_NRSLOTS=512
-CONFIG_XENO_OPT_SYS_HEAPSZ=128
-CONFIG_XENO_OPT_SYS_STACKPOOLSZ=32
-CONFIG_XENO_OPT_STATS=y
-# CONFIG_XENO_OPT_DEBUG is not set
-# CONFIG_XENO_OPT_SHIRQ is not set
-CONFIG_XENO_OPT_TIMING_PERIODIC=y
-CONFIG_XENO_OPT_TIMING_SCHEDLAT=0
-# CONFIG_XENO_OPT_SCALABLE_SCHED is not set
-CONFIG_XENO_OPT_TIMER_LIST=y
-# CONFIG_XENO_OPT_TIMER_HEAP is not set
-# CONFIG_XENO_OPT_TIMER_WHEEL is not set
-CONFIG_XENO_HW_FPU=y
-CONFIG_XENO_SKIN_NATIVE=y
-CONFIG_XENO_OPT_NATIVE_PERIOD=0
-CONFIG_XENO_OPT_NATIVE_PIPE=y
-CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ=1024
-CONFIG_XENO_OPT_NATIVE_SEM=y
-CONFIG_XENO_OPT_NATIVE_EVENT=y
-CONFIG_XENO_OPT_NATIVE_MUTEX=y
-CONFIG_XENO_OPT_NATIVE_COND=y
-CONFIG_XENO_OPT_NATIVE_QUEUE=y
-CONFIG_XENO_OPT_NATIVE_HEAP=y
-CONFIG_XENO_OPT_NATIVE_ALARM=y
-CONFIG_XENO_OPT_NATIVE_MPS=y
-CONFIG_XENO_OPT_NATIVE_INTR=y
-CONFIG_XENO_SKIN_POSIX=y
-CONFIG_XENO_OPT_POSIX_PERIOD=0
-# CONFIG_XENO_OPT_POSIX_SHM is not set
-# CONFIG_XENO_OPT_POSIX_INTR is not set
-# CONFIG_XENO_OPT_POSIX_SELECT is not set
-# CONFIG_XENO_OPT_DEBUG_POSIX is not set
-# CONFIG_XENO_SKIN_PSOS is not set
-# CONFIG_XENO_SKIN_UITRON is not set
-# CONFIG_XENO_SKIN_VRTX is not set
-# CONFIG_XENO_SKIN_VXWORKS is not set
-# CONFIG_XENO_SKIN_RTAI is not set
-CONFIG_XENO_SKIN_RTDM=y
-CONFIG_XENO_OPT_RTDM_PERIOD=0
-CONFIG_XENO_OPT_RTDM_FILDES=128
-CONFIG_XENO_OPT_RTDM_SELECT=y
-# CONFIG_XENO_DRIVERS_16550A is not set
-CONFIG_XENO_DRIVERS_TIMERBENCH=m
-CONFIG_XENO_DRIVERS_KLATENCY=m
-CONFIG_XENO_DRIVERS_IRQBENCH=m
-CONFIG_XENO_DRIVERS_SWITCHTEST=m
-# CONFIG_XENO_DRIVERS_CAN is not set
-# CONFIG_ARM_FCSE is not set
-CONFIG_IPIPE=y
-CONFIG_IPIPE_DOMAINS=4
-CONFIG_IPIPE_COMPAT=y
-# CONFIG_IPIPE_DEBUG is not set
\ No newline at end of file
Copied: trunk/buildroot/package/xenomai/xeno-kernel.config (from rev 1162, trunk/buildroot/package/xenomai/configXenoKernel)
===================================================================
--- trunk/buildroot/package/xenomai/xeno-kernel.config (rev 0)
+++ trunk/buildroot/package/xenomai/xeno-kernel.config 2009-03-13 15:22:39 UTC (rev 1163)
@@ -0,0 +1,59 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
+CONFIG_XENO_OPT_PERVASIVE=y
+# CONFIG_XENO_OPT_ISHIELD is not set
+CONFIG_XENO_OPT_PRIOCPL=y
+CONFIG_XENO_OPT_PIPELINE_HEAD=y
+CONFIG_XENO_OPT_PIPE_NRDEV=32
+CONFIG_XENO_OPT_REGISTRY_NRSLOTS=512
+CONFIG_XENO_OPT_SYS_HEAPSZ=128
+CONFIG_XENO_OPT_SYS_STACKPOOLSZ=32
+CONFIG_XENO_OPT_STATS=y
+# CONFIG_XENO_OPT_DEBUG is not set
+# CONFIG_XENO_OPT_SHIRQ is not set
+CONFIG_XENO_OPT_TIMING_PERIODIC=y
+CONFIG_XENO_OPT_TIMING_SCHEDLAT=0
+# CONFIG_XENO_OPT_SCALABLE_SCHED is not set
+CONFIG_XENO_OPT_TIMER_LIST=y
+# CONFIG_XENO_OPT_TIMER_HEAP is not set
+# CONFIG_XENO_OPT_TIMER_WHEEL is not set
+CONFIG_XENO_HW_FPU=y
+CONFIG_XENO_SKIN_NATIVE=y
+CONFIG_XENO_OPT_NATIVE_PERIOD=0
+CONFIG_XENO_OPT_NATIVE_PIPE=y
+CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ=1024
+CONFIG_XENO_OPT_NATIVE_SEM=y
+CONFIG_XENO_OPT_NATIVE_EVENT=y
+CONFIG_XENO_OPT_NATIVE_MUTEX=y
+CONFIG_XENO_OPT_NATIVE_COND=y
+CONFIG_XENO_OPT_NATIVE_QUEUE=y
+CONFIG_XENO_OPT_NATIVE_HEAP=y
+CONFIG_XENO_OPT_NATIVE_ALARM=y
+CONFIG_XENO_OPT_NATIVE_MPS=y
+CONFIG_XENO_OPT_NATIVE_INTR=y
+CONFIG_XENO_SKIN_POSIX=y
+CONFIG_XENO_OPT_POSIX_PERIOD=0
+# CONFIG_XENO_OPT_POSIX_SHM is not set
+# CONFIG_XENO_OPT_POSIX_INTR is not set
+# CONFIG_XENO_OPT_POSIX_SELECT is not set
+# CONFIG_XENO_OPT_DEBUG_POSIX is not set
+# CONFIG_XENO_SKIN_PSOS is not set
+# CONFIG_XENO_SKIN_UITRON is not set
+# CONFIG_XENO_SKIN_VRTX is not set
+# CONFIG_XENO_SKIN_VXWORKS is not set
+# CONFIG_XENO_SKIN_RTAI is not set
+CONFIG_XENO_SKIN_RTDM=y
+CONFIG_XENO_OPT_RTDM_PERIOD=0
+CONFIG_XENO_OPT_RTDM_FILDES=128
+CONFIG_XENO_OPT_RTDM_SELECT=y
+# CONFIG_XENO_DRIVERS_16550A is not set
+CONFIG_XENO_DRIVERS_TIMERBENCH=m
+CONFIG_XENO_DRIVERS_KLATENCY=m
+CONFIG_XENO_DRIVERS_IRQBENCH=m
+CONFIG_XENO_DRIVERS_SWITCHTEST=m
+# CONFIG_XENO_DRIVERS_CAN is not set
+# CONFIG_ARM_FCSE is not set
+CONFIG_IPIPE=y
+CONFIG_IPIPE_DOMAINS=4
+CONFIG_IPIPE_COMPAT=y
+# CONFIG_IPIPE_DEBUG is not set
\ No newline at end of file
Modified: trunk/buildroot/package/xenomai/xenomai.mk
===================================================================
--- trunk/buildroot/package/xenomai/xenomai.mk 2009-03-13 14:56:36 UTC (rev 1162)
+++ trunk/buildroot/package/xenomai/xenomai.mk 2009-03-13 15:22:39 UTC (rev 1163)
@@ -35,32 +35,35 @@
xenomai-source: $(DL_DIR)/$(ADEOS_SOURCE)
-$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(ADEOS_SOURCE) $(DL_DIR)/$(XENOMAI_SOURCE)
+$(KERN_DIR)/.patched.adeos: $(DL_DIR)/$(ADEOS_SOURCE)
+ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
+ 00-adeos-compatibility_with_armadeus.patch
+ toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) \
+ $(ADEOS_SOURCE)
+ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
+ 01-adeos-$(ADEOS_VERSION)-imx_compatibility.patch
+ touch $@
+
+$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
$(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-$(XENOMAI_DIR)/.patched: $(XENOMAI_DIR)/.unpacked
+$(XENOMAI_DIR)/.patched.makefile: $(XENOMAI_DIR)/.unpacked
toolchain/patch-kernel.sh $(XENOMAI_DIR) package/xenomai \
- 02-xenomai-supprSudo.patch
+ 02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch
touch $@
-$(KERN_DIR)/.patch_xenomai: $(XENOMAI_DIR)/.patched
- toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
- 04-suppr-patch.patch
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) \
- $(ADEOS_SOURCE)
- toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
- 01-adeos-2.6.27-1.12-00.patch
+$(KERN_DIR)/.patched.xenomai: $(KERN_DIR)/.patched.adeos $(XENOMAI_DIR)/.patched.makefile
$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
--linux=$(LINUX26_DIR) \
--arch=$(BR2_ARCH)
- cat package/xenomai/configXenoKernel >> $(LINUX26_DIR)/.config
+ cat package/xenomai/xeno-kernel.config >> $(LINUX26_DIR)/.config
touch $@
-
-xenomai-patch-kernel: $(KERN_DIR)/.patch_xenomai
-$(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patch_xenomai
+xenomai-patch-kernel: $(KERN_DIR)/.patched.xenomai
+
+$(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patched.xenomai
(cd $(XENOMAI_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-13 14:56:53
|
Revision: 1162
http://armadeus.svn.sourceforge.net/armadeus/?rev=1162&view=rev
Author: artemys
Date: 2009-03-13 14:56:36 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
[BUILDROOT] Minor changes in Xenomai makefile
Modified Paths:
--------------
trunk/buildroot/package/xenomai/xenomai.mk
Modified: trunk/buildroot/package/xenomai/xenomai.mk
===================================================================
--- trunk/buildroot/package/xenomai/xenomai.mk 2009-03-13 13:44:38 UTC (rev 1161)
+++ trunk/buildroot/package/xenomai/xenomai.mk 2009-03-13 14:56:36 UTC (rev 1162)
@@ -26,6 +26,7 @@
ADEOS_SOURCE:=adeos-ipipe-$(shell echo $(BR2_KERNEL_THIS_VERSION))-arm-$(ADEOS_VERSION).patch
ADEOS_SITE:=http://download.gna.org/adeos/patches/v2.6/arm/older/
+
$(DL_DIR)/$(XENOMAI_SOURCE):
$(WGET) -P $(DL_DIR) $(XENOMAI_SITE)/$(XENOMAI_SOURCE)
@@ -38,16 +39,13 @@
$(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-
-
-$(XENOMAI_DIR)/.patchXeno: $(XENOMAI_DIR)/.unpacked
+$(XENOMAI_DIR)/.patched: $(XENOMAI_DIR)/.unpacked
toolchain/patch-kernel.sh $(XENOMAI_DIR) package/xenomai \
02-xenomai-supprSudo.patch
- touch $(XENOMAI_DIR)/.patchXeno
+ touch $@
-$(KERN_DIR)/.patch_xenomai: $(XENOMAI_DIR)/.patchXeno
- @echo "$@"
+$(KERN_DIR)/.patch_xenomai: $(XENOMAI_DIR)/.patched
toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
04-suppr-patch.patch
toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) \
@@ -55,8 +53,8 @@
toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
01-adeos-2.6.27-1.12-00.patch
$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
- --linux=${LINUX_DIR} \
- --arch=arm
+ --linux=$(LINUX26_DIR) \
+ --arch=$(BR2_ARCH)
cat package/xenomai/configXenoKernel >> $(LINUX26_DIR)/.config
touch $@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-13 13:44:53
|
Revision: 1161
http://armadeus.svn.sourceforge.net/armadeus/?rev=1161&view=rev
Author: artemys
Date: 2009-03-13 13:44:38 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
[LINUX] Corrects commit 1153 + cleanup a little FPGA drivers configuration
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config
trunk/target/linux/modules/Kconfig
trunk/target/linux/modules/fpga/dev_tools/Kconfig
trunk/target/linux/modules/fpga/dev_tools/Makefile
trunk/target/linux/modules/fpga/dev_tools/fpgaaccess/Kconfig
trunk/target/linux/modules/fpga/dev_tools/loader/Kconfig
trunk/target/linux/modules/fpga/others/Kconfig
trunk/target/linux/modules/fpga/others/Makefile
trunk/target/linux/modules/fpga/others/i2ctest/Kconfig
trunk/target/linux/modules/fpga/others/ps2keyboard/Kconfig
Modified: trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config 2009-03-13 13:44:38 UTC (rev 1161)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.13
-# Fri Mar 13 10:20:10 2009
+# Fri Mar 13 14:31:08 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1100,6 +1100,10 @@
# Armadeus specific drivers
#
CONFIG_ARMADEUS_DRIVERS=y
+
+#
+# Misc.
+#
# CONFIG_ARMADEUS_GENERIC_DRIVER is not set
# CONFIG_ARMADEUS_GPIO_DRIVER is not set
# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
@@ -1113,10 +1117,17 @@
# FPGA Drivers
#
CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_TEST=y
+
+#
+# Drivers for configuring and testing the FPGA
+#
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
-# CONFIG_ARMADEUS_FPGAACCESS_DRIVER is not set
-# CONFIG_ARMADEUS_FPGA_OTHERS_DRIVERS is not set
+
+#
+# Others drivers for the FPGA
+#
+# CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
+# CONFIG_ARMADEUS_PS2KBD_DRIVER is not set
# CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS is not set
# CONFIG_POD_DRIVERS is not set
@@ -1127,7 +1138,7 @@
CONFIG_IMX_BACKLIGHT=m
#
-# Communication bus related:
+# Communication bus related
#
# CONFIG_ARMADEUS_ISP1761 is not set
CONFIG_MMC=y
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config 2009-03-13 13:44:38 UTC (rev 1161)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.2
-# Mon Feb 23 14:11:31 2009
+# Linux kernel version: 2.6.27.13
+# Fri Mar 13 14:22:46 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1106,6 +1106,10 @@
# Armadeus specific drivers
#
CONFIG_ARMADEUS_DRIVERS=y
+
+#
+# Misc.
+#
# CONFIG_ARMADEUS_GENERIC_DRIVER is not set
CONFIG_ARMADEUS_GPIO_DRIVER=m
CONFIG_ARMADEUS_PPDEV_DRIVER=m
@@ -1119,15 +1123,19 @@
#
# FPGA Drivers
#
-CONFIG_ARMADEUS_FPGA_DRIVERS=n
-# CONFIG_ARMADEUS_BUTTON_DRIVER is not set
-# CONFIG_ARMADEUS_LED_DRIVER is not set
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS=n
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER=n
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_LED_DRIVER=n
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=n
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+
+#
+# Drivers for configuring and testing the FPGA
+#
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
+
+#
+# Others drivers for the FPGA
+#
# CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
CONFIG_ARMADEUS_PS2KBD_DRIVER=m
+# CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS is not set
# CONFIG_POD_DRIVERS is not set
#
@@ -1137,7 +1145,7 @@
CONFIG_IMX_BACKLIGHT=m
#
-# Communication bus related:
+# Communication bus related
#
CONFIG_ARMADEUS_ISP1761=y
CONFIG_MMC=y
Modified: trunk/target/linux/modules/Kconfig
===================================================================
--- trunk/target/linux/modules/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -9,6 +9,9 @@
boolean "Support for specific Armadeus drivers"
default n
---help---
+
+comment "Misc."
+ depends on ARMADEUS_DRIVERS
source "drivers/armadeus/generic/Kconfig"
@@ -30,7 +33,7 @@
source "drivers/armadeus/backlight/Kconfig"
-comment "Communication bus related:"
+comment "Communication bus related"
depends on ARMADEUS_DRIVERS
source "drivers/armadeus/isp1761/Kconfig"
Modified: trunk/target/linux/modules/fpga/dev_tools/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/dev_tools/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -1,12 +1,9 @@
#
-# Armadeus custom drivers configuration
+# FPGA devt drivers configuration
#
-config ARMADEUS_FPGA_TEST
- boolean "Driver for configuring and testing FPGA"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
+
+comment "Drivers for configuring and testing the FPGA"
+ depends on ARMADEUS_FPGA_DRIVERS
source "drivers/armadeus/fpga/dev_tools/loader/Kconfig"
-source "drivers/armadeus/fpga/dev_tools/fpgaaccess/Kconfig"
+#source "drivers/armadeus/fpga/dev_tools/fpgaaccess/Kconfig"
Modified: trunk/target/linux/modules/fpga/dev_tools/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/Makefile 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/dev_tools/Makefile 2009-03-13 13:44:38 UTC (rev 1161)
@@ -8,7 +8,8 @@
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_FPGA_TEST) += loader/ fpgaaccess/
+obj-$(ARMADEUS_FPGA_LOADER_DRIVER) += loader/
+#obj-$(ARMADEUS_FPGAACCESS_DRIVER) += fpgaaccess/
else
Modified: trunk/target/linux/modules/fpga/dev_tools/fpgaaccess/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/fpgaaccess/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/dev_tools/fpgaaccess/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -2,7 +2,8 @@
#
config ARMADEUS_FPGAACCESS_DRIVER
- tristate "fpgaaccess driver"
- default n
- depends on ARMADEUS_FPGA_TEST
- ---help---
+ tristate "fpgaaccess driver"
+ default n
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+
Modified: trunk/target/linux/modules/fpga/dev_tools/loader/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/loader/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/dev_tools/loader/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -4,6 +4,8 @@
config ARMADEUS_FPGA_LOADER_DRIVER
tristate "Armadeus FPGA configuration driver (= loader)"
default n
- depends on ARMADEUS_FPGA_TEST
+ depends on ARMADEUS_FPGA_DRIVERS
---help---
+ With this driver you will be able to (re)load the configuration
+ of your FPGA directly from Linux userspace.
Modified: trunk/target/linux/modules/fpga/others/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/others/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/others/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -3,13 +3,8 @@
#
#
-#
-config ARMADEUS_FPGA_OTHERS_DRIVERS
- boolean "Others drivers for FPGA"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
+comment "Others drivers for the FPGA"
+ depends on ARMADEUS_FPGA_DRIVERS
source "drivers/armadeus/fpga/others/i2ctest/Kconfig"
source "drivers/armadeus/fpga/others/ps2keyboard/Kconfig"
Modified: trunk/target/linux/modules/fpga/others/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/Makefile 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/others/Makefile 2009-03-13 13:44:38 UTC (rev 1161)
@@ -8,7 +8,8 @@
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_FPGA_OTHERS_DRIVERS) += i2ctest/ ps2keyboard/
+obj-$(ARMADEUS_I2C_OCORE_IRQMNG) += i2ctest/
+obj-$(CONFIG_ARMADEUS_PS2KBD_DRIVER) += ps2keyboard/
else
Modified: trunk/target/linux/modules/fpga/others/i2ctest/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/others/i2ctest/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/others/i2ctest/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -4,5 +4,5 @@
config ARMADEUS_I2C_OCORE_IRQMNG
tristate "Driver for testing wishbone i2c-ocore-irq_mng"
default n
- depends on ARMADEUS_FPGA_OTHERS_DRIVERS
+ depends on ARMADEUS_FPGA_DRIVERS
---help---
Modified: trunk/target/linux/modules/fpga/others/ps2keyboard/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/others/ps2keyboard/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/others/ps2keyboard/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -4,7 +4,7 @@
config ARMADEUS_PS2KBD_DRIVER
tristate "Armadeus PS/2 driver"
default n
- depends on ARMADEUS_FPGA_OTHERS_DRIVERS
+ depends on ARMADEUS_FPGA_DRIVERS
---help---
If you have the corresponding IP loaded in the FPGA then this
driver will allow you to use PS/2 keyboard with your Armadeus
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-13 10:32:20
|
Revision: 1160
http://armadeus.svn.sourceforge.net/armadeus/?rev=1160&view=rev
Author: artemys
Date: 2009-03-13 10:32:14 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
[LINUX] Add a kernel option to select APF27Dev LED/switch usage with Power Management + remove compilation warnings in apf27.c + better indentation
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/317-apf27-armadeus-add_kconfig_option_to_use_imx_led_and_switch_for_powermanagement_test.patch
Modified: trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config 2009-03-13 10:13:46 UTC (rev 1159)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config 2009-03-13 10:32:14 UTC (rev 1160)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.13
-# Sun Mar 8 22:58:54 2009
+# Fri Mar 13 10:20:10 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -301,6 +301,8 @@
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_SUSPEND_FREEZER=y
# CONFIG_APM_EMULATION is not set
+# CONFIG_USE_APF27DEV_IMX_LED_FOR_PM is not set
+# CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_NET=y
@@ -1024,6 +1026,7 @@
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
CONFIG_USB_EHCI_MXC=y
# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch 2009-03-13 10:13:46 UTC (rev 1159)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch 2009-03-13 10:32:14 UTC (rev 1160)
@@ -1,9 +1,11 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.27.13.original/arch/arm/mach-mx2/apf27.c
-+++ linux-2.6.27.13.mod/arch/arm/mach-mx2/apf27.c
-@@ -0,0 +1,1329 @@
+Index: linux-2.6.27.13/arch/arm/mach-mx2/apf27.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.27.13/arch/arm/mach-mx2/apf27.c 2009-03-13 11:02:49.000000000 +0100
+@@ -0,0 +1,1303 @@
+ /*
+ * apf27.c
+ *
@@ -147,7 +149,7 @@
+static struct i2c_board_info apf27_i2c_devices_bus0[] = {
+ [0] = {
+ .type = "ds1374",
-+ .flags = 0, /* FIXME */
++ .flags = 0, /* FIXME */
+ .addr = 0x68, /* E0=0, E1=1, E2=0 */
+ .platform_data = NULL,
+ .irq = 0
@@ -158,24 +160,24 @@
+#define AD9889_INT 15
+
+static int ad9889_pins[] = {
-+ (GPIO_PORTC | GPIO_IN | GPIO_GPIO | AD9889_INT),
++ (GPIO_PORTC | GPIO_IN | GPIO_GPIO | AD9889_INT),
+};
+
+static int ad9889_init(void)
+{
-+ return mxc_gpio_setup_multiple(ad9889_pins, ARRAY_SIZE(ad9889_pins), "AD9889");
++ return mxc_gpio_setup_multiple(ad9889_pins, ARRAY_SIZE(ad9889_pins), "AD9889");
+}
+
+static int ad9889_exit(void)
+{
-+ mxc_gpio_release_multiple(ad9889_pins, ARRAY_SIZE(ad9889_pins));
-+ return 0;
++ mxc_gpio_release_multiple(ad9889_pins, ARRAY_SIZE(ad9889_pins));
++ return 0;
+}
+
+static struct ad9889_config apf27_ad9889_config = {
-+ .init = ad9889_init,
-+ .exit = ad9889_exit,
-+ .EDID_I2C_addr = 0x3f
++ .init = ad9889_init,
++ .exit = ad9889_exit,
++ .EDID_I2C_addr = 0x3f
+};
+
+#endif /* CONFIG_VIDEO_AD9889 */
@@ -183,26 +185,26 @@
+static struct i2c_board_info apf27_i2c_devices_bus1[] = {
+ [0] = {
+ .type = "24c02",
-+ .flags = 0, /* FIXME */
++ .flags = 0, /* FIXME */
+ .addr = 0x50, /* E0=0, E1=1, E2=0 */
+ .platform_data = NULL,
+ .irq = 0
+ },
+#ifdef CONFIG_VIDEO_AD9889
-+ [1] = {
-+ .type = "ad9889",
-+ .flags = 0,
-+ .addr = 0x39,
-+ .platform_data = &apf27_ad9889_config,
-+ .irq = IRQ_GPIOC(AD9889_INT)
-+ },
++ [1] = {
++ .type = "ad9889",
++ .flags = 0,
++ .addr = 0x39,
++ .platform_data = &apf27_ad9889_config,
++ .irq = IRQ_GPIOC(AD9889_INT)
++ },
+#endif /* CONFIG_VIDEO_AD9889 */
+};
+#endif /* CONFIG_I2C */
+
+
+#ifdef CONFIG_SPI
-+#define MAX1027_CS (GPIO_PORTD | 28)
++#define MAX1027_CS (GPIO_PORTD | 28)
+static int mxc_cspi0_pins[] = {
+ (MAX1027_CS | GPIO_OUT | GPIO_GPIO ),
+ //PD28_PF_CSPI1_SS0, /* MAX1027 */
@@ -214,19 +216,19 @@
+#define TSC2101_CS (GPIO_PORTD|21)
+#define MCP251X_CS (GPIO_PORTD|20)
+static int mxc_cspi1_pins[] = {
-+ (TSC2101_CS | GPIO_OUT | GPIO_GPIO ), /* <- Seulement si TSC sélectionné aussi !! */
-+ (MCP251X_CS | GPIO_OUT | GPIO_GPIO ),
-+ //PD19_PF_CSPI2_SS2,
-+ //PD20_PF_CSPI2_SS1, /* MCP2515 */
-+ //PD21_PF_CSPI2_SS0, /*TSC2101 */
-+ PD22_PF_CSPI2_SCLK,
-+ PD23_PF_CSPI2_MISO,
-+ PD24_PF_CSPI2_MOSI
++ (TSC2101_CS | GPIO_OUT | GPIO_GPIO ), /* <- Seulement si TSC sélectionné aussi !! */
++ (MCP251X_CS | GPIO_OUT | GPIO_GPIO ),
++ //PD19_PF_CSPI2_SS2,
++ //PD20_PF_CSPI2_SS1, /* MCP2515 */
++ //PD21_PF_CSPI2_SS0, /*TSC2101 */
++ PD22_PF_CSPI2_SCLK,
++ PD23_PF_CSPI2_MISO,
++ PD24_PF_CSPI2_MOSI
+};
+
+static int gpio_spi0_active(struct platform_device *pdev)
+{
-+ gpio_set_value(MAX1027_CS, 1);
++ gpio_set_value(MAX1027_CS, 1);
+ return mxc_gpio_setup_multiple(mxc_cspi0_pins, ARRAY_SIZE(mxc_cspi0_pins), "CSPI0");
+}
+
@@ -339,10 +341,10 @@
+ mxc_gpio_setup_multiple(mxc_fec_pins, ARRAY_SIZE(mxc_fec_pins), "FEC");
+}
+
-+static void gpio_fec_inactive(void)
++/* static void gpio_fec_inactive(void)
+{
+ mxc_gpio_release_multiple(mxc_fec_pins, ARRAY_SIZE(mxc_fec_pins));
-+}
++} */
+
+#ifdef CONFIG_FB_MXC
+static int mxc_lcd_pins[] = {
@@ -564,7 +566,7 @@
+
+#ifdef CONFIG_SPI_TSC2102
+#define TSC2101_INT 17
-+static int tsc2101_init_gpio(struct spi_device *spi)
++static int tsc2101_init_gpio(void)
+{
+ /* configure int pin as GPIO */
+ mxc_gpio_mode( GPIO_PORTF | TSC2101_INT | GPIO_IN | GPIO_GPIO );
@@ -589,7 +591,7 @@
+ .mclk = 12288000, /* MCLK value in Master mode */
+ .use_internal = 1, /* -> use internal voltage reference */
+ .monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP,
-+ .init = tsc2101_init_gpio
++ .init = tsc2101_init_gpio,
+/* .apm_report = palmte_get_power_status,
+ .alsa_config = &palmte_alsa_config,*/
+};
@@ -831,7 +833,7 @@
+static int gpio_ssi1_active(struct platform_device *pdev)
+{
+ int err;
-+
++
+ err = mxc_gpio_setup_multiple(mxc_ssi1_pins,
+ ARRAY_SIZE(mxc_ssi1_pins), "mx2-sound");
+ if (err < 0)
@@ -851,30 +853,7 @@
+ .exit = gpio_ssi1_inactive
+};
+
-+static struct imx_sound_platform_data apf27_alsa_sound = {
-+ .connection = {
-+ [0] = {
-+ .cpu_port = 1, /* SSI1_* pin group */
-+ .dev_port = 1 /* connected to port 1 of the PMIC */
-+ },
-+// [1] = {
-+// .cpu_port = 4, /* SSI4_* pin group */
-+// .dev_port = 2 /* connected to port 2 of the PMIC */
-+// }
-+ },
-+};
+
-+static struct platform_device apf27_alsa_sound_device = {
-+ .name = "imx-alsa",
-+ .id = 0,
-+ .dev = {
-+ .platform_data = &apf27_alsa_sound,
-+ .coherent_dma_mask = DMA_BIT_MASK(32)
-+ }
-+};
-+// #define ALSA_SOUND &apf27_alsa_sound_device,
-+
-+
+static int apf27_late_init(void)
+{
+ mxc_register_device(&mxc_dam_device, NULL);
@@ -897,13 +876,13 @@
+};
+
+static struct platform_device tsc2101_alsa_device = {
-+ .name = "tsc210x-alsa", // Should be the same as the driver name
-+ .id = 0,
-+ .num_resources = ARRAY_SIZE(ssi_resources),
-+ .resource = ssi_resources,
-+ .dev = {
-+ .platform_data = &tsc2101_alsa_pdata,
-+ }
++ .name = "tsc210x-alsa", /* Should be the same as the driver name */
++ .id = 0,
++ .num_resources = ARRAY_SIZE(ssi_resources),
++ .resource = ssi_resources,
++ .dev = {
++ .platform_data = &tsc2101_alsa_pdata,
++ }
+};
+# define ALSA_SOUND &tsc2101_alsa_device,
+# endif /* CONFIG_SND_IMX_TSC2102 || CONFIG_SND_IMX_TSC2102_MODULE */
@@ -1059,8 +1038,6 @@
+
+
+/* APF27 power management stuff */
-+#define CONFIG_USE_LED_FOR_PM
-+#define CONFIG_USE_SWITCH_FOR_PM
+
+
+#define APF27DEV_USER_SWITCH (GPIO_PORTF | 13)
@@ -1070,10 +1047,10 @@
+
+static int apf27dev_pwr_ctl_pins[] = {
+ (APF27DEV_POWER_DOWN_NOT | GPIO_OUT | GPIO_GPIO),
-+#ifdef CONFIG_USE_SWITCH_FOR_PM
++#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
+ (APF27DEV_USER_SWITCH | GPIO_IN | GPIO_GPIO),
+#endif
-+#ifdef CONFIG_USE_LED_FOR_PM
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
+ (APF27DEV_USER_LED | GPIO_OUT | GPIO_GPIO),
+#endif
+};
@@ -1088,29 +1065,29 @@
+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 0);
+}
+
-+#ifdef CONFIG_USE_SWITCH_FOR_PM
++#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
+static irqreturn_t apf27dev_user_switch_irq_handler(int irq, void *dev_id)
+{
-+ return IRQ_HANDLED;
++ return IRQ_HANDLED;
+}
+#endif
+
+static int gpio_pwr_ctl_active(void)
+{
+ int err;
-+
-+#ifdef CONFIG_FB_MXC
++
++#ifdef CONFIG_FB_MXC
+ int i;
+ /* force LCD data/control lines to 0 before powering the LCD
+ otherwise start up conditions may not be respected */
-+ for( i=5; i <= 31; i++ ){
-+ if( i!=30 ){
-+ gpio_set_value(GPIO_PORTA | i, 0);
-+ mxc_gpio_mode( GPIO_PORTA | i | GPIO_OUT| GPIO_GPIO );
-+ }
++ for (i = 5; i <= 31; i++) {
++ if (i != 30) {
++ gpio_set_value(GPIO_PORTA | i, 0);
++ mxc_gpio_mode(GPIO_PORTA | i | GPIO_OUT| GPIO_GPIO);
++ }
+ }
+ /* wait a few milli */
-+ mdelay(100);
++ mdelay(100);
+#endif
+
+ err = mxc_gpio_setup_multiple(apf27dev_pwr_ctl_pins,
@@ -1119,10 +1096,10 @@
+ pr_err("Failed to register power control pins !\n");
+
+ apf27dev_power_up();
-+#ifdef CONFIG_USE_LED_FOR_PM
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
+ gpio_set_value(GPIO_PORTF | 14, 0);
+#endif
-+#ifdef CONFIG_USE_SWITCH_FOR_PM
++#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
+ err = request_irq(APF27DEV_USER_SWITCH_IRQ, apf27dev_user_switch_irq_handler,
+ IRQF_TRIGGER_FALLING,
+ "PM irq", NULL);
@@ -1133,10 +1110,9 @@
+ return err;
+}
+
++
+#ifdef CONFIG_PM
+
-+
-+
+#ifdef APF27_PM_DEBUG
+#define CCM_PCCR0 (IO_ADDRESS(CCM_BASE_ADDR) + 0x20)
+#define CCM_PCCR1 (IO_ADDRESS(CCM_BASE_ADDR) + 0x24)
@@ -1157,7 +1133,7 @@
+static void dump_gpio_port(int id)
+{
+ u32 reg;
-+
++
+ reg = __raw_readl(VA_GPIO_BASE + MXC_DDIR(id));
+ printk("DDIR_%c: 0x%08x\n", port[id], reg);
+ reg = __raw_readl(VA_GPIO_BASE + MXC_DR(id));
@@ -1219,7 +1195,7 @@
+ isp1504_suspend((void __iomem *)(IO_ADDRESS(OTG_BASE_ADDR + 0x170)));
+#endif
+ apf27dev_power_down();
-+#ifdef CONFIG_USE_LED_FOR_PM
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
+ gpio_set_value(GPIO_PORTF | 14, 1);
+#endif
+#ifdef APF27_PM_DEBUG
@@ -1237,7 +1213,7 @@
+ printk("___ %s\n", __func__);
+
+ apf27dev_power_up();
-+#ifdef CONFIG_USE_LED_FOR_PM
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
+ gpio_set_value(GPIO_PORTF | 14, 0);
+#endif
+
@@ -1274,7 +1250,7 @@
+ mxc_register_device(&mxc_uart_device2, &uart_pdata[1]);
+ /*mxc_register_device(&mxc_uart_device2, &uart_pdata[2]);*/
+ mxc_register_device(&mxc_nand_device, &apf27_nand_board_info);
-+#ifdef CONFIG_WATCHDOG
++#ifdef CONFIG_WATCHDOG
+ mxc_register_device(&mxc_wdt, NULL);
+#endif
+#ifdef CONFIG_USB_EHCI_MXC
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/317-apf27-armadeus-add_kconfig_option_to_use_imx_led_and_switch_for_powermanagement_test.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/317-apf27-armadeus-add_kconfig_option_to_use_imx_led_and_switch_for_powermanagement_test.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/317-apf27-armadeus-add_kconfig_option_to_use_imx_led_and_switch_for_powermanagement_test.patch 2009-03-13 10:32:14 UTC (rev 1160)
@@ -0,0 +1,22 @@
+Index: linux-2.6.27.13/kernel/power/Kconfig
+===================================================================
+--- linux-2.6.27.13.orig/kernel/power/Kconfig 2009-03-13 09:33:23.000000000 +0100
++++ linux-2.6.27.13/kernel/power/Kconfig 2009-03-13 10:09:37.000000000 +0100
+@@ -204,3 +204,17 @@
+ random kernel OOPSes or reboots that don't seem to be related to
+ anything, try disabling/enabling this option (or disabling/enabling
+ APM in your BIOS).
++
++config USE_APF27DEV_IMX_LED_FOR_PM
++ bool "Use IMX LED of the APF27Dev for PM test"
++ depends on PM && MACH_APF27
++ help
++ Use IMX LED of the APF27Dev board to show user when the system is
++ out of sleep (LED on) or sleeping (LED off).
++
++config USE_APF27DEV_IMX_SWITCH_FOR_PM
++ bool "Use IMX switch of the APF27Dev for PM test"
++ depends on PM && MACH_APF27
++ help
++ Use IMX switch of the APF27Dev board to leave sleep mode.
++
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gwe...@us...> - 2009-03-13 10:13:59
|
Revision: 1159
http://armadeus.svn.sourceforge.net/armadeus/?rev=1159&view=rev
Author: gwenhael
Date: 2009-03-13 10:13:46 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
[BUILDROOT] Xenomai: Makefile correct and addition of a default configuration for the kernel
Modified Paths:
--------------
trunk/buildroot/package/xenomai/xenomai.mk
Added Paths:
-----------
trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch
trunk/buildroot/package/xenomai/configXenoKernel
Added: trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch
===================================================================
--- trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch (rev 0)
+++ trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch 2009-03-13 10:13:46 UTC (rev 1159)
@@ -0,0 +1,12 @@
+diff -u a/Makefile.in b/Makefile.in
+--- a/Makefile.in 2009-03-12 15:16:41.000000000 +0100
++++ b/Makefile.in 2009-03-12 15:16:54.000000000 +0100
+@@ -228,7 +228,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I config
+-SUDO = sudo
++SUDO = fakeroot
+ SUBDIRS = src include config @XENO_MAYBE_DOCDIR@ scripts
+ EXTRA_DIST = CREDITS README.INSTALL TROUBLESHOOTING ksrc examples debian
+ all: all-recursive
Added: trunk/buildroot/package/xenomai/configXenoKernel
===================================================================
--- trunk/buildroot/package/xenomai/configXenoKernel (rev 0)
+++ trunk/buildroot/package/xenomai/configXenoKernel 2009-03-13 10:13:46 UTC (rev 1159)
@@ -0,0 +1,59 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
+CONFIG_XENO_OPT_PERVASIVE=y
+# CONFIG_XENO_OPT_ISHIELD is not set
+CONFIG_XENO_OPT_PRIOCPL=y
+CONFIG_XENO_OPT_PIPELINE_HEAD=y
+CONFIG_XENO_OPT_PIPE_NRDEV=32
+CONFIG_XENO_OPT_REGISTRY_NRSLOTS=512
+CONFIG_XENO_OPT_SYS_HEAPSZ=128
+CONFIG_XENO_OPT_SYS_STACKPOOLSZ=32
+CONFIG_XENO_OPT_STATS=y
+# CONFIG_XENO_OPT_DEBUG is not set
+# CONFIG_XENO_OPT_SHIRQ is not set
+CONFIG_XENO_OPT_TIMING_PERIODIC=y
+CONFIG_XENO_OPT_TIMING_SCHEDLAT=0
+# CONFIG_XENO_OPT_SCALABLE_SCHED is not set
+CONFIG_XENO_OPT_TIMER_LIST=y
+# CONFIG_XENO_OPT_TIMER_HEAP is not set
+# CONFIG_XENO_OPT_TIMER_WHEEL is not set
+CONFIG_XENO_HW_FPU=y
+CONFIG_XENO_SKIN_NATIVE=y
+CONFIG_XENO_OPT_NATIVE_PERIOD=0
+CONFIG_XENO_OPT_NATIVE_PIPE=y
+CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ=1024
+CONFIG_XENO_OPT_NATIVE_SEM=y
+CONFIG_XENO_OPT_NATIVE_EVENT=y
+CONFIG_XENO_OPT_NATIVE_MUTEX=y
+CONFIG_XENO_OPT_NATIVE_COND=y
+CONFIG_XENO_OPT_NATIVE_QUEUE=y
+CONFIG_XENO_OPT_NATIVE_HEAP=y
+CONFIG_XENO_OPT_NATIVE_ALARM=y
+CONFIG_XENO_OPT_NATIVE_MPS=y
+CONFIG_XENO_OPT_NATIVE_INTR=y
+CONFIG_XENO_SKIN_POSIX=y
+CONFIG_XENO_OPT_POSIX_PERIOD=0
+# CONFIG_XENO_OPT_POSIX_SHM is not set
+# CONFIG_XENO_OPT_POSIX_INTR is not set
+# CONFIG_XENO_OPT_POSIX_SELECT is not set
+# CONFIG_XENO_OPT_DEBUG_POSIX is not set
+# CONFIG_XENO_SKIN_PSOS is not set
+# CONFIG_XENO_SKIN_UITRON is not set
+# CONFIG_XENO_SKIN_VRTX is not set
+# CONFIG_XENO_SKIN_VXWORKS is not set
+# CONFIG_XENO_SKIN_RTAI is not set
+CONFIG_XENO_SKIN_RTDM=y
+CONFIG_XENO_OPT_RTDM_PERIOD=0
+CONFIG_XENO_OPT_RTDM_FILDES=128
+CONFIG_XENO_OPT_RTDM_SELECT=y
+# CONFIG_XENO_DRIVERS_16550A is not set
+CONFIG_XENO_DRIVERS_TIMERBENCH=m
+CONFIG_XENO_DRIVERS_KLATENCY=m
+CONFIG_XENO_DRIVERS_IRQBENCH=m
+CONFIG_XENO_DRIVERS_SWITCHTEST=m
+# CONFIG_XENO_DRIVERS_CAN is not set
+# CONFIG_ARM_FCSE is not set
+CONFIG_IPIPE=y
+CONFIG_IPIPE_DOMAINS=4
+CONFIG_IPIPE_COMPAT=y
+# CONFIG_IPIPE_DEBUG is not set
\ No newline at end of file
Modified: trunk/buildroot/package/xenomai/xenomai.mk
===================================================================
--- trunk/buildroot/package/xenomai/xenomai.mk 2009-03-13 09:17:55 UTC (rev 1158)
+++ trunk/buildroot/package/xenomai/xenomai.mk 2009-03-13 10:13:46 UTC (rev 1159)
@@ -13,6 +13,7 @@
#
#############################################################
+KERN_DIR:=$(PROJECT_BUILD_DIR)/linux-$(shell echo $(BR2_LINUX26_VERSION))
XENOMAI_VERSION:=2.4.7
XENOMAI_SOURCE:=xenomai-$(XENOMAI_VERSION).tar.bz2
XENOMAI_SITE:=http://download.gna.org/xenomai/stable
@@ -22,9 +23,7 @@
XENOMAI_TARGET_BINARY:=usr/xenomai/bin/xeno-load
ADEOS_VERSION:=1.12-00
-
-ADEOS_SOURCE:=adeos-ipipe-$(strip $(subst ",,$(BR2_KERNEL_THIS_VERSION)))-arm-$(ADEOS_VERSION).patch
-#"
+ADEOS_SOURCE:=adeos-ipipe-$(shell echo $(BR2_KERNEL_THIS_VERSION))-arm-$(ADEOS_VERSION).patch
ADEOS_SITE:=http://download.gna.org/adeos/patches/v2.6/arm/older/
$(DL_DIR)/$(XENOMAI_SOURCE):
@@ -35,36 +34,38 @@
xenomai-source: $(DL_DIR)/$(ADEOS_SOURCE)
-$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
+$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(ADEOS_SOURCE) $(DL_DIR)/$(XENOMAI_SOURCE)
$(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-xenomai-test: $(XENOMAI_DIR)/.patch
-$(LINUX_DIR)/.patch_xenomai: $(DL_DIR)/$(ADEOS_SOURCE) $(XENOMAI_DIR)/.unpacked
- if [ -f "$(LINUX_DIR)/.patched.board" ]; then \
- toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
- 04-suppr-patch.patch; \
- fi
+
+$(XENOMAI_DIR)/.patchXeno: $(XENOMAI_DIR)/.unpacked
+ toolchain/patch-kernel.sh $(XENOMAI_DIR) package/xenomai \
+ 02-xenomai-supprSudo.patch
+ touch $(XENOMAI_DIR)/.patchXeno
+
+
+$(KERN_DIR)/.patch_xenomai: $(XENOMAI_DIR)/.patchXeno
+ @echo "$@"
+ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
+ 04-suppr-patch.patch
toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) \
$(ADEOS_SOURCE)
toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
01-adeos-2.6.27-1.12-00.patch
- if [ ! -f "$(LINUX_DIR)/.patched.board" ]; then \
- toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
- 04-suppr-patch.patch; \
- fi
$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
--linux=${LINUX_DIR} \
--arch=arm
+ cat package/xenomai/configXenoKernel >> $(LINUX26_DIR)/.config
touch $@
+
+xenomai-patch-kernel: $(KERN_DIR)/.patch_xenomai
-xenomai-patch-kernel: $(LINUX_DIR)/.patch_xenomai
-
-$(XENOMAI_DIR)/.configured: xenomai-patch-kernel
+$(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patch_xenomai
(cd $(XENOMAI_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
+ $(TARGET_CONFIGURE_ARGS) \
CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
./configure \
--enable-arm-mach=imx \
@@ -78,6 +79,7 @@
CC="$(TARGET_CC)" LD="$(TARGET_LD)"
$(TARGET_DIR)/$(XENOMAI_TARGET_BINARY): $(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY)
+ echo $@
$(MAKE) -C $(XENOMAI_DIR) \
CC=$(TARGET_CC) LD=$(TARGET_LD) \
DESTDIR=$(TARGET_DIR) install
@@ -91,7 +93,7 @@
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) uninstall
-$(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) clean
-xenomai-dirclean:
+xenomai-dirclean: xenomai-clean
rm -rf $(XENOMAI_DIR)
#############################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2009-03-13 09:18:08
|
Revision: 1158
http://armadeus.svn.sourceforge.net/armadeus/?rev=1158&view=rev
Author: FabM
Date: 2009-03-13 09:17:55 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
[FIRMWARE] Updating all firmwares examples, with bitstream for apf27 and apf9328
Modified Paths:
--------------
trunk/firmware/leds/blinking_led/src/led_blink.vhd
trunk/firmware/leds/button_led/led_top.dia
Added Paths:
-----------
trunk/firmware/leds/blinking_led/bin/
trunk/firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit
trunk/firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit
trunk/firmware/leds/blinking_led/src/led_blink_27.ucf
trunk/firmware/leds/blinking_led/src/led_blink_9328.ucf
trunk/firmware/leds/button_led/bin/
trunk/firmware/leds/button_led/bin/button_led_apf27-200k.bit
trunk/firmware/leds/button_led/bin/button_led_apf9328-200k.bit
trunk/firmware/leds/button_led/led_apf27.ucf
trunk/firmware/wishbone_example/bin/wishbone_example_apf27_200k.bit
trunk/firmware/wishbone_example/bin/wishbone_example_apf9328_200k.bit
Removed Paths:
-------------
trunk/firmware/leds/blinking_led/blinking_led_xc3s200.bit
trunk/firmware/leds/blinking_led/blinking_led_xc3s400.bit
trunk/firmware/leds/blinking_led/src/led_blink.ucf
trunk/firmware/wishbone_example/bin/wishbone_example_xc3s200.bit
trunk/firmware/wishbone_example/bin/wishbone_example_xc3s200a.bit
trunk/firmware/wishbone_example/bin/wishbone_example_xc3s400.bit
trunk/firmware/wishbone_example/bin/wishbone_example_xc3s400a.bit
Added: trunk/firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit
===================================================================
(Binary files differ)
Property changes on: trunk/firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit
===================================================================
(Binary files differ)
Property changes on: trunk/firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/firmware/leds/blinking_led/blinking_led_xc3s200.bit
===================================================================
(Binary files differ)
Deleted: trunk/firmware/leds/blinking_led/blinking_led_xc3s400.bit
===================================================================
(Binary files differ)
Deleted: trunk/firmware/leds/blinking_led/src/led_blink.ucf
===================================================================
--- trunk/firmware/leds/blinking_led/src/led_blink.ucf 2009-03-12 18:20:04 UTC (rev 1157)
+++ trunk/firmware/leds/blinking_led/src/led_blink.ucf 2009-03-13 09:17:55 UTC (rev 1158)
@@ -1,7 +0,0 @@
-# Clock at 96MHz
-NET "Clk" LOC = "P55";
-NET "Clk" TNM_NET = "Clk";
-TIMESPEC "TS_Clk" = PERIOD "Clk" 10 ns HIGH 50 %;
-# LED
-NET "led_cathode" LOC = "P118"| IOSTANDARD = LVCMOS33 ;
-NET "led_anode" LOC = "P116"| IOSTANDARD = LVCMOS33 ;
Modified: trunk/firmware/leds/blinking_led/src/led_blink.vhd
===================================================================
--- trunk/firmware/leds/blinking_led/src/led_blink.vhd 2009-03-12 18:20:04 UTC (rev 1157)
+++ trunk/firmware/leds/blinking_led/src/led_blink.vhd 2009-03-13 09:17:55 UTC (rev 1158)
@@ -23,6 +23,7 @@
architecture RTL of Clk_div_led is
constant max_count : natural := 48000000;
+-- constant max_count : natural := 10000;
signal Rst_n : std_logic;
begin
@@ -35,7 +36,7 @@
begin
if Rst_n = '0' then
count := 0;
- led_anode <= '1';
+ led_anode <= '0';
elsif rising_edge(Clk) then
if count < max_count/2 then
led_anode <='1';
@@ -50,3 +51,4 @@
end if;
end process compteur;
end RTL;
+
Added: trunk/firmware/leds/blinking_led/src/led_blink_27.ucf
===================================================================
--- trunk/firmware/leds/blinking_led/src/led_blink_27.ucf (rev 0)
+++ trunk/firmware/leds/blinking_led/src/led_blink_27.ucf 2009-03-13 09:17:55 UTC (rev 1158)
@@ -0,0 +1,9 @@
+# Clock at 96MHz
+NET "Clk" LOC = "N9"; # CLK0
+NET "Clk" TNM_NET = "Clk";
+TIMESPEC "TS_Clk" = PERIOD "Clk" 10 ns HIGH 50 %;
+# LED
+#NET "led_cathode" LOC = "C15"| IOSTANDARD = LVCMOS33 ; #IO_L24N_1
+#NET "led_anode" LOC = "D16"| IOSTANDARD = LVCMOS33 ; #IO_L22P_1
+NET "led_cathode" LOC = "C15"| IOSTANDARD = LVCMOS33 ; #IO_L24N_1
+NET "led_anode" LOC = "C16"| IOSTANDARD = LVCMOS33 ; #IO_L24P_1
Copied: trunk/firmware/leds/blinking_led/src/led_blink_9328.ucf (from rev 1116, trunk/firmware/leds/blinking_led/src/led_blink.ucf)
===================================================================
--- trunk/firmware/leds/blinking_led/src/led_blink_9328.ucf (rev 0)
+++ trunk/firmware/leds/blinking_led/src/led_blink_9328.ucf 2009-03-13 09:17:55 UTC (rev 1158)
@@ -0,0 +1,7 @@
+# Clock at 96MHz
+NET "Clk" LOC = "P55";
+NET "Clk" TNM_NET = "Clk";
+TIMESPEC "TS_Clk" = PERIOD "Clk" 10 ns HIGH 50 %;
+# LED
+NET "led_cathode" LOC = "P118"| IOSTANDARD = LVCMOS33 ;
+NET "led_anode" LOC = "P116"| IOSTANDARD = LVCMOS33 ;
Added: trunk/firmware/leds/button_led/bin/button_led_apf27-200k.bit
===================================================================
(Binary files differ)
Property changes on: trunk/firmware/leds/button_led/bin/button_led_apf27-200k.bit
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/firmware/leds/button_led/bin/button_led_apf9328-200k.bit
===================================================================
(Binary files differ)
Property changes on: trunk/firmware/leds/button_led/bin/button_led_apf9328-200k.bit
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/firmware/leds/button_led/led_apf27.ucf
===================================================================
--- trunk/firmware/leds/button_led/led_apf27.ucf (rev 0)
+++ trunk/firmware/leds/button_led/led_apf27.ucf 2009-03-13 09:17:55 UTC (rev 1158)
@@ -0,0 +1,4 @@
+# pinout
+NET "clk" LOC = "N9" | DRIVE=12 |IOSTANDARD = LVCMOS33 ; #CLK0
+NET "led" LOC = "C16" | DRIVE=12 |IOSTANDARD = LVCMOS33 ; #IO_L24P_1
+NET "button" LOC = "C15" | DRIVE=12 | IOSTANDARD = LVCMOS33 ; #IO_L24N_1
Modified: trunk/firmware/leds/button_led/led_top.dia
===================================================================
(Binary files differ)
Copied: trunk/firmware/wishbone_example/bin/wishbone_example_apf27_200k.bit (from rev 1157, trunk/firmware/wishbone_example/bin/wishbone_example_xc3s200a.bit)
===================================================================
(Binary files differ)
Copied: trunk/firmware/wishbone_example/bin/wishbone_example_apf9328_200k.bit (from rev 1157, trunk/firmware/wishbone_example/bin/wishbone_example_xc3s200.bit)
===================================================================
(Binary files differ)
Deleted: trunk/firmware/wishbone_example/bin/wishbone_example_xc3s200.bit
===================================================================
(Binary files differ)
Deleted: trunk/firmware/wishbone_example/bin/wishbone_example_xc3s200a.bit
===================================================================
(Binary files differ)
Deleted: trunk/firmware/wishbone_example/bin/wishbone_example_xc3s400.bit
===================================================================
(Binary files differ)
Deleted: trunk/firmware/wishbone_example/bin/wishbone_example_xc3s400a.bit
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-03-12 18:20:32
|
Revision: 1157
http://armadeus.svn.sourceforge.net/armadeus/?rev=1157&view=rev
Author: artemys
Date: 2009-03-12 18:20:04 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
[BUILD] Add envt variable to locate current Linux patches
Modified Paths:
--------------
trunk/Makefile
trunk/Makefile.in
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-03-12 17:56:09 UTC (rev 1156)
+++ trunk/Makefile 2009-03-12 18:20:04 UTC (rev 1157)
@@ -161,6 +161,7 @@
# Generate shell's most useful variables:
shell_env:
@echo ARMADEUS_LINUX_DIR=$(ARMADEUS_LINUX_DIR) > $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_ROOTFS_DIR=$(ARMADEUS_ROOTFS_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_ROOTFS_TAR=$(ARMADEUS_ROOTFS_TAR) >> $(ARMADEUS_ENV_FILE)
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2009-03-12 17:56:09 UTC (rev 1156)
+++ trunk/Makefile.in 2009-03-12 18:20:04 UTC (rev 1157)
@@ -23,6 +23,7 @@
ARMADEUS_PATCH_DIR=patches
ARMADEUS_LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_BOARD_NAME)/linux-$(ARMADEUS_LINUX_VERSION)
+ARMADEUS_LINUX_PATCH_DIR=$(BUILDROOT_DIR)/target/device/armadeus/linux/kernel-patches/$(ARMADEUS_LINUX_VERSION)
ARMADEUS_UCLIBC_DIR=$(BUILDROOT_DIR)/toolchain_build_$(ARMADEUS_TARGET_ARCH)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
ARMADEUS_BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)/
ARMADEUS_ROOTFS_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_BOARD_NAME)/root
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|