armadeus-commitlog — Armadeus GIT commit logs

[Armadeus-commitlog] SF.net SVN: armadeus: [756] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff

[<th...@us...>]

Revision: 756
          http://armadeus.svn.sourceforge.net/armadeus/?rev=756&view=rev
Author:   thom25
Date:     2008-01-23 06:25:36 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
clean up hunk

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff	2008-01-22 21:06:27 UTC (rev 755)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff	2008-01-23 14:25:36 UTC (rev 756)
@@ -1,22 +1,24 @@
 --- linux-org/arch/arm/mach-imx/irq.c	2006-09-20 05:42:06.000000000 +0200
 +++ linux-imx/arch/arm/mach-imx/irq.c	2006-12-09 17:37:53.386928000 +0100
-@@ -67,6 +67,12 @@ imx_unmask_irq(unsigned int irq)
- {
- 	__raw_writel(irq, IMX_AITC_INTENNUM);
- }
-+
-+static int
-+imx_irq_type(unsigned int _irq, unsigned int type)
-+{
-+    return 0;
-+}
+@@ -69,6 +69,12 @@ imx_unmask_irq(unsigned int irq)
+ }
+ 
+ static int
++imx_irq_type(unsigned int _irq, unsigned int type)
++{
++    return 0;
++}
++
++static int
+ imx_gpio_irq_type(unsigned int _irq, unsigned int type)
+ {
+ 	unsigned int irq_type = 0, irq, reg, bit;
+@@ -205,6 +211,7 @@ static struct irq_chip imx_internal_chip
+ 	.ack = imx_mask_irq,
+ 	.mask = imx_mask_irq,
+ 	.unmask = imx_unmask_irq,
++	.set_type = imx_irq_type,
+ };
+ 
+ static struct irq_chip imx_gpio_chip = {
  
- static int
- imx_gpio_irq_type(unsigned int _irq, unsigned int type)
-@@ -209,6 +215,7 @@ static struct irq_chip imx_internal_chip
- 	.ack = imx_mask_irq,
- 	.mask = imx_mask_irq,
- 	.unmask = imx_unmask_irq,
-+	.set_type = imx_irq_type,
- };
- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [754] trunk/buildroot/target/device/armadeus/apf9328/ linux-2.6.23.1.config

[<jo...@us...>]

Revision: 754
          http://armadeus.svn.sourceforge.net/armadeus/?rev=754&view=rev
Author:   jorasse
Date:     2008-01-21 12:50:47 -0800 (Mon, 21 Jan 2008)

Log Message:
-----------
[LINUX] update defaut configuration: remove user request for type of LCD display.

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.23.1.config

Modified: trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.23.1.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.23.1.config	2008-01-17 10:13:53 UTC (rev 753)
+++ trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.23.1.config	2008-01-21 20:50:47 UTC (rev 754)
@@ -744,6 +744,7 @@
 # Frame buffer hardware drivers
 #
 CONFIG_FB_IMX=y
+# CONFIG_FB_IMX_SHARP_LQ043_TFT is not set
 CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT=y
 # CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
 # CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [753] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff

[<th...@us...>]

Revision: 753
          http://armadeus.svn.sourceforge.net/armadeus/?rev=753&view=rev
Author:   thom25
Date:     2008-01-17 02:13:53 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
[LINUX] add 200ms delay before enabling the TFT (see datasheet)

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff	2008-01-17 09:43:19 UTC (rev 752)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff	2008-01-17 10:13:53 UTC (rev 753)
@@ -1344,7 +1344,7 @@
 +MACHINE_END
 --- linux-2.6.23.1.1/arch/arm/mach-imx/apf9328_lcd_config.h	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.23.1.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h	2007-01-07 21:40:59.000000000 +0100
-@@ -0,0 +1,186 @@
+@@ -0,0 +1,189 @@
 +/*
 + *
 + * Armadeus LCD configuration file
@@ -1383,8 +1383,11 @@
 +#elif CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT
 +    // No LCD powerdown yet
 +#elif CONFIG_FB_IMX_SHARP_LQ043_TFT
-+    if(on)
++    if(on) {
++        mdelay(200); // at least ten frames have to be processed before 
++                     // enabling the display
 +        DR(LCD_PORT) |= (1 << SHARP_LQ043_POWER_DOWN); 
++   }
 +    else
 +        DR(LCD_PORT) &= ~(1 << SHARP_LQ043_POWER_DOWN); 
 +#else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [752] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.23.1

[<th...@us...>]

Revision: 752
          http://armadeus.svn.sourceforge.net/armadeus/?rev=752&view=rev
Author:   thom25
Date:     2008-01-17 01:43:19 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
[LINUX] merge imxfb patches 

Removed Paths:
-------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/070-linux-2.6.23.1-framebuffer-16bits-color-part1.diff
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/070-linux-2.6.23.1-framebuffer-16bits-color-part2.diff
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/071-linux-2.6.23.1-framebuffer-8bpp-switch.diff

Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/070-linux-2.6.23.1-framebuffer-16bits-color-part1.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/070-linux-2.6.23.1-framebuffer-16bits-color-part1.diff	2008-01-17 09:37:02 UTC (rev 751)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/070-linux-2.6.23.1-framebuffer-16bits-color-part1.diff	2008-01-17 09:43:19 UTC (rev 752)
@@ -1,198 +0,0 @@
-X-Account-Key: account2
-X-UIDL: 1169648826.15570.mrelay3-1
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00000000
-Return-Path: <sh...@pe...>
-Delivered-To: onl...@fr...
-Received: (qmail 15163 invoked from network); 24 Jan 2007 14:27:04 -0000
-Received: from 83.236.181.26 (HELO metis.extern.pengutronix.de) (83.236.181.26)
-  by mrelay3-1.free.fr with SMTP; 24 Jan 2007 14:27:04 -0000
-Received: from leda.ptxnet.pengutronix.de ([10.1.0.71])
-	by metis.extern.pengutronix.de with esmtp (Exim 3.36 #1 (Debian))
-	id 1H9iZZ-0002mz-00; Wed, 24 Jan 2007 14:53:57 +0100
-Received: from sha by leda.ptxnet.pengutronix.de with local (Exim 4.63)
-	(envelope-from <sh...@lo...>)
-	id 1H9iZZ-0001hB-ED; Wed, 24 Jan 2007 14:53:57 +0100
-Date: Wed, 24 Jan 2007 14:53:57 +0100
-From: Sascha Hauer <s....@pe...>
-To: jul...@fr...
-Cc: lin...@li...
-Subject: [PATCH] move imxfb.h into c file
-Message-ID: <200...@lo...>
-Mail-Followup-To: jul...@fr...,
-	lin...@li...
-References: <116...@im...>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <116...@im...>
-User-Agent: Mutt/1.5.13 (2006-08-11)
-
-This patch moves the content of drivers/video/imxfb.h into
-drivers/video/imxfb.c since it is only used in this one file
-
-Signed-Off-by: Sascha Hauer <s....@pe...>
-
----
- drivers/video/imxfb.c |   59 +++++++++++++++++++++++++++++++++++++++-
- drivers/video/imxfb.h |   73 --------------------------------------------------
- 2 files changed, 58 insertions(+), 74 deletions(-)
-
-Index: drivers/video/imxfb.c
-===================================================================
---- a/drivers/video/imxfb.c.orig
-+++ b/drivers/video/imxfb.c
-@@ -43,7 +43,64 @@
-  */
- #define DEBUG_VAR 1
- 
--#include "imxfb.h"
-+/*
-+ * These are the bitfields for each
-+ * display depth that we support.
-+ */
-+struct imxfb_rgb {
-+	struct fb_bitfield	red;
-+	struct fb_bitfield	green;
-+	struct fb_bitfield	blue;
-+	struct fb_bitfield	transp;
-+};
-+
-+#define RGB_16	(0)
-+#define RGB_8	(1)
-+#define NR_RGB	2
-+
-+struct imxfb_info {
-+	struct device		*dev;
-+	struct imxfb_rgb	*rgb[NR_RGB];
-+
-+	u_int			max_bpp;
-+	u_int			max_xres;
-+	u_int			max_yres;
-+
-+	/*
-+	 * These are the addresses we mapped
-+	 * the framebuffer memory region to.
-+	 */
-+	dma_addr_t		map_dma;
-+	u_char *		map_cpu;
-+	u_int			map_size;
-+
-+	u_char *		screen_cpu;
-+	dma_addr_t		screen_dma;
-+	u_int			palette_size;
-+
-+	dma_addr_t		dbar1;
-+	dma_addr_t		dbar2;
-+
-+	u_int			pcr;
-+	u_int			pwmr;
-+	u_int			lscr1;
-+	u_int			dmacr;
-+	u_int			cmap_inverse:1,
-+				cmap_static:1,
-+				unused:30;
-+
-+	void (*lcd_power)(int);
-+	void (*backlight_power)(int);
-+};
-+
-+#define IMX_NAME	"IMX"
-+
-+/*
-+ * Minimum X and Y resolutions
-+ */
-+#define MIN_XRES	64
-+#define MIN_YRES	64
-+
- 
- static struct imxfb_rgb def_rgb_16 = {
- 	.red	= { .offset = 8,  .length = 4, },
-Index: drivers/video/imxfb.h
-===================================================================
---- a/drivers/video/imxfb.h
-+++ b//dev/null
-@@ -1,73 +0,0 @@
--/*
-- * linux/drivers/video/imxfb.h
-- *
-- *  Freescale i.MX Frame Buffer device driver
-- *
-- *  Copyright (C) 2004 S.Hauer, Pengutronix
-- *
-- *  Copyright (C) 1999 Eric A. Thomas
-- *   Based on acornfb.c Copyright (C) Russell King.
-- *
-- * This file is subject to the terms and conditions of the GNU General Public
-- * License.  See the file COPYING in the main directory of this archive
-- * for more details.
-- */
--
--/*
-- * These are the bitfields for each
-- * display depth that we support.
-- */
--struct imxfb_rgb {
--	struct fb_bitfield	red;
--	struct fb_bitfield	green;
--	struct fb_bitfield	blue;
--	struct fb_bitfield	transp;
--};
--
--#define RGB_16	(0)
--#define RGB_8	(1)
--#define NR_RGB	2
--
--struct imxfb_info {
--	struct device		*dev;
--	struct imxfb_rgb	*rgb[NR_RGB];
--
--	u_int			max_bpp;
--	u_int			max_xres;
--	u_int			max_yres;
--
--	/*
--	 * These are the addresses we mapped
--	 * the framebuffer memory region to.
--	 */
--	dma_addr_t		map_dma;
--	u_char *		map_cpu;
--	u_int			map_size;
--
--	u_char *		screen_cpu;
--	dma_addr_t		screen_dma;
--	u_int			palette_size;
--
--	dma_addr_t		dbar1;
--	dma_addr_t		dbar2;
--
--	u_int			pcr;
--	u_int			pwmr;
--	u_int			lscr1;
--	u_int			dmacr;
--	u_int			cmap_inverse:1,
--				cmap_static:1,
--				unused:30;
--
--	void (*lcd_power)(int);
--	void (*backlight_power)(int);
--};
--
--#define IMX_NAME	"IMX"
--
--/*
-- * Minimum X and Y resolutions
-- */
--#define MIN_XRES	64
--#define MIN_YRES	64
--
-
-
--- 
- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
-  Pengutronix - Linux Solutions for Science and Industry
-    Handelsregister: Amtsgericht Hildesheim, HRA 2686
-      Hannoversche Str. 2, 31134 Hildesheim, Germany
-    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
-
-

Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/070-linux-2.6.23.1-framebuffer-16bits-color-part2.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/070-linux-2.6.23.1-framebuffer-16bits-color-part2.diff	2008-01-17 09:37:02 UTC (rev 751)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/070-linux-2.6.23.1-framebuffer-16bits-color-part2.diff	2008-01-17 09:43:19 UTC (rev 752)
@@ -1,173 +0,0 @@
-X-Account-Key: account2
-X-UIDL: 1169648825.15418.mrelay3-1
-X-Mozilla-Status: 0011
-X-Mozilla-Status2: 00000000
-Return-Path: <sh...@pe...>
-Delivered-To: onl...@fr...
-Received: (qmail 14991 invoked from network); 24 Jan 2007 14:27:04 -0000
-Received: from 83.236.181.26 (HELO metis.extern.pengutronix.de) (83.236.181.26)
-  by mrelay3-1.free.fr with SMTP; 24 Jan 2007 14:27:04 -0000
-Received: from leda.ptxnet.pengutronix.de ([10.1.0.71])
-	by metis.extern.pengutronix.de with esmtp (Exim 3.36 #1 (Debian))
-	id 1H9idU-0002wL-00; Wed, 24 Jan 2007 14:58:00 +0100
-Received: from sha by leda.ptxnet.pengutronix.de with local (Exim 4.63)
-	(envelope-from <sh...@lo...>)
-	id 1H9idT-0001hd-RX; Wed, 24 Jan 2007 14:57:59 +0100
-Date: Wed, 24 Jan 2007 14:57:59 +0100
-From: Sascha Hauer <s....@pe...>
-To: jul...@fr...
-Cc: lin...@li...
-Subject: Re: i.MX FrameBuffer: strange color mapping in 16bit mode
-Message-ID: <200...@lo...>
-Mail-Followup-To: jul...@fr...,
-	lin...@li...
-References: <116...@im...>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <116...@im...>
-User-Agent: Mutt/1.5.13 (2006-08-11)
-
-The i.MX LCD controller uses 12bpp for STN and 16bpp for TFT displays,
-so we have to differentiate between the two different resulting
-bitfields.
-
-Signed-Off-by: Sascha Hauer <s....@pe...>
-
----
- drivers/video/imxfb.c |   75 +++++++++++++++++---------------------------------
- 1 file changed, 26 insertions(+), 49 deletions(-)
-
-Index: drivers/video/imxfb.c
-===================================================================
---- a/drivers/video/imxfb.c.orig
-+++ b/drivers/video/imxfb.c
-@@ -43,24 +43,8 @@
-  */
- #define DEBUG_VAR 1
- 
--/*
-- * These are the bitfields for each
-- * display depth that we support.
-- */
--struct imxfb_rgb {
--	struct fb_bitfield	red;
--	struct fb_bitfield	green;
--	struct fb_bitfield	blue;
--	struct fb_bitfield	transp;
--};
--
--#define RGB_16	(0)
--#define RGB_8	(1)
--#define NR_RGB	2
--
- struct imxfb_info {
- 	struct device		*dev;
--	struct imxfb_rgb	*rgb[NR_RGB];
- 
- 	u_int			max_bpp;
- 	u_int			max_xres;
-@@ -101,21 +85,6 @@ struct imxfb_info {
- #define MIN_XRES	64
- #define MIN_YRES	64
- 
--
--static struct imxfb_rgb def_rgb_16 = {
--	.red	= { .offset = 8,  .length = 4, },
--	.green	= { .offset = 4,  .length = 4, },
--	.blue	= { .offset = 0,  .length = 4, },
--	.transp = { .offset = 0,  .length = 0, },
--};
--
--static struct imxfb_rgb def_rgb_8 = {
--	.red	= { .offset = 0,  .length = 8, },
--	.green	= { .offset = 0,  .length = 8, },
--	.blue	= { .offset = 0,  .length = 8, },
--	.transp = { .offset = 0,  .length = 0, },
--};
--
- static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *info);
- 
- static inline u_int chan_to_field(u_int chan, struct fb_bitfield *bf)
-@@ -210,7 +179,6 @@ static int
- imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
- {
- 	struct imxfb_info *fbi = info->par;
--	int rgbidx;
- 
- 	if (var->xres < MIN_XRES)
- 		var->xres = MIN_XRES;
-@@ -223,27 +191,39 @@ imxfb_check_var(struct fb_var_screeninfo
- 	var->xres_virtual = max(var->xres_virtual, var->xres);
- 	var->yres_virtual = max(var->yres_virtual, var->yres);
- 
-+	memset(&var->transp, 0, sizeof(var->transp));
-+
- 	pr_debug("var->bits_per_pixel=%d\n", var->bits_per_pixel);
- 	switch (var->bits_per_pixel) {
--	case 16:
--		rgbidx = RGB_16;
--		break;
- 	case 8:
--		rgbidx = RGB_8;
-+		var->red.length		= var->bits_per_pixel;
-+		var->red.offset		= 0;
-+		var->green.length	= var->bits_per_pixel;
-+		var->green.offset	= 0;
-+		var->blue.length	= var->bits_per_pixel;
-+		var->blue.offset	= 0;
-+		break;
-+	case 16:
-+		if (fbi->pcr & PCR_TFT) {
-+			var->red.length		= 5;
-+			var->red.offset		= 11;
-+			var->green.length	= 6;
-+			var->green.offset	= 5;
-+			var->blue.length	= 5;
-+			var->blue.offset	= 0;
-+		} else {
-+			var->red.length		= 4;
-+			var->red.offset		= 8;
-+			var->green.length	= 4;
-+			var->green.offset	= 4;
-+			var->blue.length	= 4;
-+			var->blue.offset	= 0;
-+		}
- 		break;
- 	default:
--		rgbidx = RGB_16;
-+		return -EINVAL;
- 	}
- 
--	/*
--	 * Copy the RGB parameters for this display
--	 * from the machine specific parameters.
--	 */
--	var->red    = fbi->rgb[rgbidx]->red;
--	var->green  = fbi->rgb[rgbidx]->green;
--	var->blue   = fbi->rgb[rgbidx]->blue;
--	var->transp = fbi->rgb[rgbidx]->transp;
--
- 	pr_debug("RGBT length = %d:%d:%d:%d\n",
- 		var->red.length, var->green.length, var->blue.length,
- 		var->transp.length);
-@@ -536,9 +516,6 @@ static int __init imxfb_init_fbinfo(stru
- 	info->flags			= FBINFO_FLAG_DEFAULT;
- 	info->pseudo_palette		= (fbi + 1);
- 
--	fbi->rgb[RGB_16]		= &def_rgb_16;
--	fbi->rgb[RGB_8]			= &def_rgb_8;
--
- 	fbi->max_xres			= inf->xres;
- 	info->var.xres			= inf->xres;
- 	info->var.xres_virtual		= inf->xres;
-
-
--- 
- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
-  Pengutronix - Linux Solutions for Science and Industry
-    Handelsregister: Amtsgericht Hildesheim, HRA 2686
-      Hannoversche Str. 2, 31134 Hildesheim, Germany
-    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
-
-

Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/071-linux-2.6.23.1-framebuffer-8bpp-switch.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/071-linux-2.6.23.1-framebuffer-8bpp-switch.diff	2008-01-17 09:37:02 UTC (rev 751)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/071-linux-2.6.23.1-framebuffer-8bpp-switch.diff	2008-01-17 09:43:19 UTC (rev 752)
@@ -1,41 +0,0 @@
-This patch activates 8/16 bpp switching in framebuffer on 16 Bits TFT
-
---- linux-2.6.18.1/drivers/video/imxfb.c	2007-04-05 22:31:12.000000000 +0200
-+++ linux-2.6.18.1.fb8bits/drivers/video/imxfb.c	2007-05-08 12:40:31.000000000 +0200
-@@ -350,6 +350,7 @@
- 	pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
- 		var->yres, var->vsync_len,
- 		var->upper_margin, var->lower_margin);
-+	pr_debug("var: bpp=%d\n", var->bits_per_pixel);
- 
- #if DEBUG_VAR
- 	if (var->xres < 16        || var->xres > 1024)
-@@ -387,7 +388,17 @@
- 			  VCR_V_WAIT_2(var->lower_margin);
- 
- 	LCDC_SIZE	= SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres);
--	LCDC_PCR	= fbi->pcr;
-+    // On TFT LCD i.MXL can support 16, 12, 8, 4bpp with the same hardware interface (12 to 16 bits)
-+    // So if userspace app wants a 8bpp screen switch to 8bpp (can save ressources, with SDL for ex)
-+    if( (var->bits_per_pixel == 8) && (fbi->pcr & PCR_TFT) )
-+    {
-+        pr_debug("Switching imxfb to 8bpp\n");
-+        LCDC_PCR = (fbi->pcr & (~PCR_BPIX_MASK)) | PCR_BPIX_8 | PCR_END_BYTE_SWAP;
-+    }
-+    else
-+        LCDC_PCR = fbi->pcr;
-+   
-+    LCDC_VPW    = VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4);
- 	LCDC_PWMR	= fbi->pwmr;
- 	LCDC_LSCR1	= fbi->lscr1;
- 	LCDC_DMACR	= fbi->dmacr;
---- linux-2.6.18.1/include/asm-arm/arch-imx/imx-regs.h	2007-04-05 22:31:12.000000000 +0200
-+++ linux-2.6.18.1.fb8bits/include/asm-arm/arch-imx/imx-regs.h	2007-05-08 12:38:19.000000000 +0200
-@@ -411,6 +411,7 @@
- #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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [751] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.23.1

[<th...@us...>]

Revision: 751
          http://armadeus.svn.sourceforge.net/armadeus/?rev=751&view=rev
Author:   thom25
Date:     2008-01-17 01:37:02 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
[LINUX] add sharp LQ043 TFT
[LINUX] cleanup apf9328_lcd_config.h
[LINUX] merge of different patches related to the imxfb/TFT

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/013-linux-2.6.23.1-framebuff.diff
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/023-linux-2.6.23.1-fblcd-kconfig.diff

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/013-linux-2.6.23.1-framebuff.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/013-linux-2.6.23.1-framebuff.diff	2007-12-28 18:56:18 UTC (rev 750)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/013-linux-2.6.23.1-framebuff.diff	2008-01-17 09:37:02 UTC (rev 751)
@@ -1,6 +1,172 @@
 --- linux-2.6.23/drivers/video/imxfb.c	2006-09-20 05:42:06.000000000 +0200
 +++ linux-2.6.23-imx/drivers/video/imxfb.c	2006-10-01 14:22:39.000000000 +0200
-@@ -392,7 +392,26 @@
+18:43:44.000000000 +0200
++++ imxfb.c	2008-01-15 01:50:45.000000000 +0100
+@@ -42,22 +42,48 @@
+  */
+ #define DEBUG_VAR 1
+ 
+-#include "imxfb.h"
++struct imxfb_info {
++	struct device		*dev;
+ 
+-static struct imxfb_rgb def_rgb_16 = {
+-	.red	= { .offset = 8,  .length = 4, },
+-	.green	= { .offset = 4,  .length = 4, },
+-	.blue	= { .offset = 0,  .length = 4, },
+-	.transp = { .offset = 0,  .length = 0, },
+-};
++	u_int			max_bpp;
++	u_int			max_xres;
++	u_int			max_yres;
++
++	/*
++	 * These are the addresses we mapped
++	 * the framebuffer memory region to.
++	 */
++	dma_addr_t		map_dma;
++	u_char *		map_cpu;
++	u_int			map_size;
++
++	u_char *		screen_cpu;
++	dma_addr_t		screen_dma;
++	u_int			palette_size;
++
++	dma_addr_t		dbar1;
++	dma_addr_t		dbar2;
++
++	u_int			pcr;
++	u_int			pwmr;
++	u_int			lscr1;
++	u_int			dmacr;
++	u_int			cmap_inverse:1,
++				cmap_static:1,
++				unused:30;
+ 
+-static struct imxfb_rgb def_rgb_8 = {
+-	.red	= { .offset = 0,  .length = 8, },
+-	.green	= { .offset = 0,  .length = 8, },
+-	.blue	= { .offset = 0,  .length = 8, },
+-	.transp = { .offset = 0,  .length = 0, },
++	void (*lcd_power)(int);
++	void (*backlight_power)(int);
+ };
+ 
++#define IMX_NAME	"IMX"
++
++/*
++ * Minimum X and Y resolutions
++ */
++#define MIN_XRES	64
++#define MIN_YRES	64
++
+ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *info);
+ 
+ static inline u_int chan_to_field(u_int chan, struct fb_bitfield *bf)
+@@ -152,7 +178,6 @@ static int
+ imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+ {
+ 	struct imxfb_info *fbi = info->par;
+-	int rgbidx;
+ 
+ 	if (var->xres < MIN_XRES)
+ 		var->xres = MIN_XRES;
+@@ -165,27 +190,39 @@ imxfb_check_var(struct fb_var_screeninfo
+ 	var->xres_virtual = max(var->xres_virtual, var->xres);
+ 	var->yres_virtual = max(var->yres_virtual, var->yres);
+ 
++	memset(&var->transp, 0, sizeof(var->transp));
++
+ 	pr_debug("var->bits_per_pixel=%d\n", var->bits_per_pixel);
+ 	switch (var->bits_per_pixel) {
+-	case 16:
+-		rgbidx = RGB_16;
+-		break;
+ 	case 8:
+-		rgbidx = RGB_8;
++		var->red.length		= var->bits_per_pixel;
++		var->red.offset		= 0;
++		var->green.length	= var->bits_per_pixel;
++		var->green.offset	= 0;
++		var->blue.length	= var->bits_per_pixel;
++		var->blue.offset	= 0;
++		break;
++	case 16:
++		if (fbi->pcr & PCR_TFT) {
++			var->red.length		= 5;
++			var->red.offset		= 11;
++			var->green.length	= 6;
++			var->green.offset	= 5;
++			var->blue.length	= 5;
++			var->blue.offset	= 0;
++		} else {
++			var->red.length		= 4;
++			var->red.offset		= 8;
++			var->green.length	= 4;
++			var->green.offset	= 4;
++			var->blue.length	= 4;
++			var->blue.offset	= 0;
++		}
+ 		break;
+ 	default:
+-		rgbidx = RGB_16;
++		return -EINVAL;
+ 	}
+ 
+-	/*
+-	 * Copy the RGB parameters for this display
+-	 * from the machine specific parameters.
+-	 */
+-	var->red    = fbi->rgb[rgbidx]->red;
+-	var->green  = fbi->rgb[rgbidx]->green;
+-	var->blue   = fbi->rgb[rgbidx]->blue;
+-	var->transp = fbi->rgb[rgbidx]->transp;
+-
+ 	pr_debug("RGBT length = %d:%d:%d:%d\n",
+ 		var->red.length, var->green.length, var->blue.length,
+ 		var->transp.length);
+@@ -248,10 +285,11 @@ static void imxfb_enable_controller(stru
+ 
+ 	LCDC_RMCR = RMCR_LCDC_EN;
+ 
+-	if(fbi->backlight_power)
+-		fbi->backlight_power(1);
+ 	if(fbi->lcd_power)
+ 		fbi->lcd_power(1);
++    /* enable backlight after LCD */
++	if(fbi->backlight_power)
++		fbi->backlight_power(1);
+ }
+ 
+ static void imxfb_disable_controller(struct imxfb_info *fbi)
+@@ -312,6 +350,7 @@ static int imxfb_activate_var(struct fb_
+ 	pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
+ 		var->yres, var->vsync_len,
+ 		var->upper_margin, var->lower_margin);
++	pr_debug("var: bpp=%d\n", var->bits_per_pixel);
+ 
+ #if DEBUG_VAR
+ 	if (var->xres < 16        || var->xres > 1024)
+@@ -349,7 +388,17 @@ static int imxfb_activate_var(struct fb_
+ 			  VCR_V_WAIT_2(var->lower_margin);
+ 
+ 	LCDC_SIZE	= SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres);
+-	LCDC_PCR	= fbi->pcr;
++    // On TFT LCD i.MXL can support 16, 12, 8, 4bpp with the same hardware interface (12 to 16 bits)
++    // So if userspace app wants a 8bpp screen switch to 8bpp (can save ressources, with SDL for ex)
++    if( (var->bits_per_pixel == 8) && (fbi->pcr & PCR_TFT) )
++    {
++        pr_debug("Switching imxfb to 8bpp\n");
++        LCDC_PCR = (fbi->pcr & (~PCR_BPIX_MASK)) | PCR_BPIX_8 | PCR_END_BYTE_SWAP;
++    }
++    else
++        LCDC_PCR = fbi->pcr;
++   
++    LCDC_VPW    = VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4);
+ 	LCDC_PWMR	= fbi->pwmr;
+ 	LCDC_LSCR1	= fbi->lscr1;
+ 	LCDC_DMACR	= fbi->dmacr;
+@@ -391,7 +440,26 @@ static void imxfb_setup_gpio(struct imxf
  	case 1:
  		imx_gpio_mode(PD15_PF_LD0);
  	}
@@ -9,7 +175,7 @@
 +	imx_gpio_mode(PD6_PF_LSCLK);
 +    imx_gpio_mode(PD14_PF_FLM_VSYNC);
 +	imx_gpio_mode(PD13_PF_LP_HSYNC);
-+	imx_gpio_mode(PD12_PF_ACD_OE);	
++//	imx_gpio_mode(PD12_PF_ACD_OE);	
  
 +    /* if != 0 */
 +    if( fbi->pwmr ) {
@@ -26,8 +192,8 @@
 +#else
  	/* initialize GPIOs */
  	imx_gpio_mode(PD6_PF_LSCLK);
- 	imx_gpio_mode(PD10_PF_SPL_SPR);
-@@ -414,6 +433,7 @@ A VALIDER !!! --->>>
+ 	imx_gpio_mode(PD11_PF_CONTRAST);
+@@ -406,6 +474,7 @@ static void imxfb_setup_gpio(struct imxf
  		imx_gpio_mode(PD9_PF_PS);
  		imx_gpio_mode(PD10_PF_SPL_SPR);
  	}
@@ -35,6 +201,104 @@
  }
  
  #ifdef CONFIG_PM
+@@ -469,9 +538,6 @@ static int __init imxfb_init_fbinfo(stru
+ 	info->fbops			= &imxfb_ops;
+ 	info->flags			= FBINFO_FLAG_DEFAULT;
+ 
+-	fbi->rgb[RGB_16]		= &def_rgb_16;
+-	fbi->rgb[RGB_8]			= &def_rgb_8;
+-
+ 	fbi->max_xres			= inf->xres;
+ 	info->var.xres			= inf->xres;
+ 	info->var.xres_virtual		= inf->xres;
+Index: drivers/video/imxfb.h
+===================================================================
+--- a/drivers/video/imxfb.h
++++ b//dev/null
+@@ -1,73 +0,0 @@
+-/*
+- * linux/drivers/video/imxfb.h
+- *
+- *  Freescale i.MX Frame Buffer device driver
+- *
+- *  Copyright (C) 2004 S.Hauer, Pengutronix
+- *
+- *  Copyright (C) 1999 Eric A. Thomas
+- *   Based on acornfb.c Copyright (C) Russell King.
+- *
+- * This file is subject to the terms and conditions of the GNU General Public
+- * License.  See the file COPYING in the main directory of this archive
+- * for more details.
+- */
+-
+-/*
+- * These are the bitfields for each
+- * display depth that we support.
+- */
+-struct imxfb_rgb {
+-	struct fb_bitfield	red;
+-	struct fb_bitfield	green;
+-	struct fb_bitfield	blue;
+-	struct fb_bitfield	transp;
+-};
+-
+-#define RGB_16	(0)
+-#define RGB_8	(1)
+-#define NR_RGB	2
+-
+-struct imxfb_info {
+-	struct device		*dev;
+-	struct imxfb_rgb	*rgb[NR_RGB];
+-
+-	u_int			max_bpp;
+-	u_int			max_xres;
+-	u_int			max_yres;
+-
+-	/*
+-	 * These are the addresses we mapped
+-	 * the framebuffer memory region to.
+-	 */
+-	dma_addr_t		map_dma;
+-	u_char *		map_cpu;
+-	u_int			map_size;
+-
+-	u_char *		screen_cpu;
+-	dma_addr_t		screen_dma;
+-	u_int			palette_size;
+-
+-	dma_addr_t		dbar1;
+-	dma_addr_t		dbar2;
+-
+-	u_int			pcr;
+-	u_int			pwmr;
+-	u_int			lscr1;
+-	u_int			dmacr;
+-	u_int			cmap_inverse:1,
+-				cmap_static:1,
+-				unused:30;
+-
+-	void (*lcd_power)(int);
+-	void (*backlight_power)(int);
+-};
+-
+-#define IMX_NAME	"IMX"
+-
+-/*
+- * Minimum X and Y resolutions
+- */
+-#define MIN_XRES	64
+-#define MIN_YRES	64
+-
+--- linux-2.6.18.1/include/asm-arm/arch-imx/imx-regs.h	2007-04-05 22:31:12.000000000 +0200
++++ linux-2.6.18.1.fb8bits/include/asm-arm/arch-imx/imx-regs.h	2007-05-08 12:38:19.000000000 +0200
+@@ -411,6 +411,7 @@
+ #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)
 --- linux-2.6.23/drivers/video/logo/Kconfig	2006-09-20 05:42:06.000000000 +0200
 +++ linux-2.6.23-imx/drivers/video/logo/Kconfig	2006-10-01 14:22:39.000000000 +0200
 @@ -70,5 +70,12 @@ config LOGO_M32R_CLUT224

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff	2007-12-28 18:56:18 UTC (rev 750)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff	2008-01-17 09:37:02 UTC (rev 751)
@@ -1344,7 +1344,7 @@
 +MACHINE_END
 --- linux-2.6.23.1.1/arch/arm/mach-imx/apf9328_lcd_config.h	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.23.1.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h	2007-01-07 21:40:59.000000000 +0100
-@@ -0,0 +1,146 @@
+@@ -0,0 +1,186 @@
 +/*
 + *
 + * Armadeus LCD configuration file
@@ -1360,113 +1360,148 @@
 +
 +
 +#ifdef CONFIG_FB_IMX
-+
 +#include <asm/arch/imxfb.h>
++#include <linux/delay.h>
 +
++#define LCD_PORT                    3           /* Port D */
++
++#define OPTREX_F51900_POWER_DOWN    7           /* PD7_REV line */
++#define SHARP_LQ043_POWER_DOWN      12          /* PD12_ACD_OE line */
++#define CONTRAST_LINE               11          /* PD11_CONTRAST */          
++
++#define BACKLIGHT_ON                0x000000ff
++#define DEFAULT_DMA_SETTINGS        (DMACR_BURST | DMACR_HM(8) | DMACR_TM(4))
++
 +static void apf9328_lcd_power(int on)
 +{
 +    pr_debug("apf9328_lcd_power: %s\n", on ? "on":"off");
 +#ifdef CONFIG_FB_IMX_OPTREX_F51900_CSTN
-+    /* use Port_D REV pin to control LCD power down mode */
 +    if(on)
-+        DR(3) |= 0x00000080; //rev line
++        DR(LCD_PORT) |= (1 << OPTREX_F51900_POWER_DOWN); 
 +    else
-+        DR(3) &= ~0x00000080; // rev line
++        DR(LCD_PORT) &= ~(1 << OPTREX_F51900_POWER_DOWN); 
 +#elif CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT
 +    // No LCD powerdown yet
++#elif CONFIG_FB_IMX_SHARP_LQ043_TFT
++    if(on)
++        DR(LCD_PORT) |= (1 << SHARP_LQ043_POWER_DOWN); 
++    else
++        DR(LCD_PORT) &= ~(1 << SHARP_LQ043_POWER_DOWN); 
 +#else
 +    if(on)
-+        /* use Port_D CONTRAST pin to control LCD power down mode */
-+        DR(3) &= ~0x00000800;
++        DR(LCD_PORT) &= ~(1 << CONTRAST_LINE);
 +    else
-+        DR(3) |= 0x00000800;
++        DR(LCD_PORT) |= (1 << CONTRAST_LINE);
 +#endif // CONFIG_FB_IMX_OPTREX_F51900_CSTN
 +}
 +
 +static void apf9328_lcd_backlight_power(int on)
 +{
 +    if(on)
-+        LCDC_PWMR |= 0x000000ff;
++        LCDC_PWMR |= BACKLIGHT_ON;
 +    else
-+        LCDC_PWMR &= 0xffffff00;
++        LCDC_PWMR &= ~BACKLIGHT_ON;
 +}
 +
-+#ifdef CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT
++#ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
 +static struct imxfb_mach_info apf9328_fb_info __initdata = {
-+    .pixclock   = 62500,
-+    .bpp        = 16,
-+    .xres       = 320,
-+    .yres       = 240,
++    .pixclock           = 62500,
++    .bpp                = 16,
++    .xres               = 480,
++    .yres               = 272,
 +
-+    .hsync_len  = 30,
-+    .vsync_len  = 3,
-+    .left_margin    = 1,
-+    .upper_margin   = 20,
-+    .right_margin   = 68,
-+    .lower_margin   = 20,
++    .hsync_len          = 10,
++    .vsync_len          = 3,
++    .left_margin        = 2,
++    .upper_margin       = 2,
++    .right_margin       = 0,
++    .lower_margin       = 3,
 +
-+    .pcr        = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_FLMPOL | PCR_LPPOL |
-+                  PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(7),
-+    .pwmr = 0x000001ff,    // Contrast with PWM @ Line_Pulse, max by default
-+    .dmacr = DMACR_BURST | DMACR_HM(8) | DMACR_TM(4),
-+    .backlight_power = apf9328_lcd_backlight_power,
++    .pcr                = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_FLMPOL | PCR_LPPOL | 
++                          PCR_CLKPOL | PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(5),
++    .pwmr               = 0x00000100,    // Contrast with PWM @ Line_Pulse, min by default
++    .dmacr              = DEFAULT_DMA_SETTINGS,
++    .backlight_power    = apf9328_lcd_backlight_power,
++    .lcd_power          = apf9328_lcd_power,
 +};
++#elif CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT
++static struct imxfb_mach_info apf9328_fb_info __initdata = {
++    .pixclock           = 62500,
++    .bpp                = 16,
++    .xres               = 320,
++    .yres               = 240,
++
++    .hsync_len          = 30,
++    .vsync_len          = 3,
++    .left_margin        = 1,
++    .upper_margin       = 20,
++    .right_margin       = 68,
++    .lower_margin       = 20,
++
++    .pcr                = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_FLMPOL | PCR_LPPOL |
++                          PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(7),
++    .pwmr               = 0x000001ff,    // Contrast with PWM @ Line_Pulse, max by default
++    .dmacr              = DEFAULT_DMA_SETTINGS,
++    .backlight_power    = apf9328_lcd_backlight_power,
++};
 +#elif CONFIG_FB_IMX_SHARP_LQ057_TFT
 +static struct imxfb_mach_info apf9328_fb_info __initdata = {
-+    .pixclock   = 62500,
-+    .bpp        = 16,
-+    .xres       = 320,
-+    .yres       = 240,
++    .pixclock           = 62500,
++    .bpp                = 16,
++    .xres               = 320,
++    .yres               = 240,
 +
-+    .hsync_len  = 9,
-+    .vsync_len  = 2,
-+    .left_margin    = 9,
-+    .upper_margin   = 0,
-+    .right_margin   = 27,
-+    .lower_margin   = 7,
++    .hsync_len          = 9,
++    .vsync_len          = 2,
++    .left_margin        = 9,
++    .upper_margin       = 0,
++    .right_margin       = 27,
++    .lower_margin       = 7,
 +
-+    .pcr        = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | /*PCR_CLKPOL |*/
-+                  PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(9),
-+    .pwmr = 0,    // No contrast management
-+    .dmacr = DMACR_BURST | DMACR_HM(8) | DMACR_TM(4),
-+    .lcd_power = apf9328_lcd_power,
++    .pcr                = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | /*PCR_CLKPOL |*/
++                          PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(9),
++    .pwmr               = 0,    // No contrast management
++    .dmacr              = DEFAULT_DMA_SETTINGS,
++    .lcd_power          = apf9328_lcd_power,
 +};
 +#elif CONFIG_FB_IMX_OPTREX_F51900_CSTN
 +static struct imxfb_mach_info apf9328_fb_info __initdata = {
-+    .pixclock   = 62500,
-+    .bpp        = 8,
-+    .xres       = 320,
-+    .yres       = 240,
++    .pixclock           = 62500,
++    .bpp                = 8,
++    .xres               = 320,
++    .yres               = 240,
 + 
-+    .hsync_len  = 2,
-+    .vsync_len  = 2,
-+    .left_margin    = 2,
-+    .upper_margin   = 2,
-+    .right_margin   = 2,
-+    .lower_margin   = 2,
++    .hsync_len          = 2,
++    .vsync_len          = 2,
++    .left_margin        = 2,
++    .upper_margin       = 2,
++    .right_margin       = 2,
++    .lower_margin       = 2,
 + 
-+    .pcr        = PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_8 | PCR_ACD(5) | PCR_END_BYTE_SWAP | PCR_PCD(3),
-+    .dmacr = DMACR_BURST | DMACR_HM(8) | DMACR_TM(4),
-+    .lcd_power = apf9328_lcd_power,
++    .pcr                = PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_8 | PCR_ACD(5) | 
++                          PCR_END_BYTE_SWAP | PCR_PCD(3),
++    .dmacr              = DEFAULT_DMA_SETTINGS,
++    .lcd_power          = apf9328_lcd_power,
 +};
 +#elif CONFIG_FB_IMX_MOTOROLA_A910_TFT
 +static struct imxfb_mach_info apf9328_fb_info __initdata = {
-+    .pixclock   = 62500,
-+    .bpp        = 16,
-+    .xres       = 240,
-+    .yres       = 320,
++    .pixclock           = 62500,
++    .bpp                = 16,
++    .xres               = 240,
++    .yres               = 320,
 +
-+    .hsync_len  = 9,
-+    .vsync_len  = 2,
-+    .left_margin    = 9,
-+    .upper_margin   = 2,
-+    .right_margin   = 27,
-+    .lower_margin   = 4,
++    .hsync_len          = 9,
++    .vsync_len          = 2,
++    .left_margin        = 9,
++    .upper_margin       = 2,
++    .right_margin       = 27,
++    .lower_margin       = 4,
 +
-+    .pcr        = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_CLKPOL | PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(9),
-+    .dmacr = DMACR_BURST | DMACR_HM(8) | DMACR_TM(4),
-+    .pwmr = 0,    // No contrast management
-+    .lcd_power = apf9328_lcd_power,
++    .pcr                = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_CLKPOL | 
++                          PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(9),
++    .dmacr              = DEFAULT_DMA_SETTINGS,
++    .pwmr               = 0,    // No contrast management
++    .lcd_power          = apf9328_lcd_power,
 +};
 +#else
 +#error Please define a imxfb_mach_info structure with your LCD parameters here
@@ -1474,19 +1509,24 @@
 +
 +static void imx_fb_set_gpios(void)
 +{
++
 +#ifdef CONFIG_FB_IMX_OPTREX_F51900_CSTN
-+    OCR1(3) = 0x0000C000;
-+    DR(3) |= 0x00000080;
-+    DDIR(3) |= 0x00000080;
-+    GIUS(3) &= ~0x00000080;
-+    GPR(3) &= ~0x00000080;
++    DR(LCD_PORT) |= (1 << OPTREX_F51900_POWER_DOWN); // Initializes it High
++    imx_gpio_mode( GPIO_PORTD | OPTREX_F51900_POWER_DOWN | GPIO_OUT | GPIO_DR );    
 +#else
-+    OCR1(3) = 0x00C00000;
-+    DR(3) |= 0x00000800;
-+    DDIR(3) |= 0x00000800;
-+    GIUS(3) |= 0x00000800; // GPIO Function for CONTRAST pin (changed in imxfb if contrast is activated)
-+    GPR(3) &= ~0x00000800;
++    DR(LCD_PORT) &= ~(1 << CONTRAST_LINE); // Initializes it low
++    // GPIO Function for CONTRAST pin (changed in imxfb if contrast is activated)
++    imx_gpio_mode( GPIO_PORTD | CONTRAST_LINE | GPIO_OUT | GPIO_GIUS | GPIO_DR ); 
 +#endif
++
++#ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT 
++    // ACD_OE (SHARP_LQ043_POWER_DOWN) used as power down signal
++    DR(LCD_PORT) &= ~(1 << SHARP_LQ043_POWER_DOWN); // Initializes it Low
++    imx_gpio_mode( GPIO_PORTD | SHARP_LQ043_POWER_DOWN | GPIO_OUT | GPIO_GIUS | GPIO_DR ); 
++#else
++    // otherwise use ACD_OE as standard LCD controller signal
++    imx_gpio_mode(PD12_PF_ACD_OE);
++#endif // CONFIG_FB_IMX_SHARP_LQ043_TFT
 +}
 +#endif // CONFIG_FB_IMX
 +

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/023-linux-2.6.23.1-fblcd-kconfig.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/023-linux-2.6.23.1-fblcd-kconfig.diff	2007-12-28 18:56:18 UTC (rev 750)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/023-linux-2.6.23.1-fblcd-kconfig.diff	2008-01-17 09:37:02 UTC (rev 751)
@@ -1,6 +1,6 @@
 --- linux-org/drivers/video/Kconfig	2006-10-14 05:34:03.000000000 +0200
 +++ linux-imx/drivers/video/Kconfig	2007-01-07 22:24:25.000000000 +0100
-@@ -271,6 +271,7 @@
+@@ -342,6 +342,7 @@ config FB_SA1100
  	  If you plan to use the LCD display with your SA-1100 system, say
  	  Y here.
  
@@ -8,15 +8,21 @@
  config FB_IMX
  	tristate "Motorola i.MX LCD support"
  	depends on FB && ARM && ARCH_IMX
-@@ -278,6 +279,36 @@
+@@ -349,6 +350,42 @@ config FB_IMX
  	select FB_CFB_COPYAREA
  	select FB_CFB_IMAGEBLIT
  
 +choice
 +        depends on FB_IMX
 +        prompt "LCD Panel"
-+        default FB_IMX_SHARP_LQ057_TFT
++        default FB_IMX_MICROTIPS_MTF_T035_TFT
 +
++config FB_IMX_SHARP_LQ043_TFT
++        bool "Sharp LQ043"
++        help
++          Sharp LQ043, a 4.3" 24 bits color 480x272, TFT panel.
++          The native resolution is 480x272.
++
 +config FB_IMX_MICROTIPS_MTF_T035_TFT
 +        bool "Microtips MTF-T035"
 +        help


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [750] trunk/buildroot/target/device/armadeus/u-boot

[<jo...@us...>]

Revision: 750
          http://armadeus.svn.sourceforge.net/armadeus/?rev=750&view=rev
Author:   jorasse
Date:     2007-12-28 10:56:18 -0800 (Fri, 28 Dec 2007)

Log Message:
-----------
[BUILDROOT][U-BOOT] Fixed compatibitlity with GCC4

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch
    trunk/buildroot/target/device/armadeus/u-boot/101-u-boot-apx9328.patch

Modified: trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch	2007-12-28 18:49:53 UTC (rev 749)
+++ trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch	2007-12-28 18:56:18 UTC (rev 750)
@@ -1335,7 +1335,7 @@
 +#ifndef __CONFIG_H
 +#define __CONFIG_H
 +
-+#define CONFIG_IDENT_STRING	" apx9328 patch 2.6"
++#define CONFIG_IDENT_STRING	" apx9328 patch 2.7"
 +
 +#define CONFIG_ARM920T		1	/* this is an ARM920T CPU */
 +#define CONFIG_IMX		1	/* in a Motorola MC9328MXL Chip */

Modified: trunk/buildroot/target/device/armadeus/u-boot/101-u-boot-apx9328.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/u-boot/101-u-boot-apx9328.patch	2007-12-28 18:49:53 UTC (rev 749)
+++ trunk/buildroot/target/device/armadeus/u-boot/101-u-boot-apx9328.patch	2007-12-28 18:56:18 UTC (rev 750)
@@ -1,6 +1,19 @@
 diff -purN u-boot-1.1.6.ref/include/asm-arm/arch-imx/imx-regs.h u-boot-1.1.6/include/asm-arm/arch-imx/imx-regs.h
 --- u-boot-1.1.6.ref/include/asm-arm/arch-imx/imx-regs.h	2006-11-02 15:15:01.000000000 +0100
 +++ u-boot-1.1.6/include/asm-arm/arch-imx/imx-regs.h	2006-11-04 18:44:12.000000000 +0100
+@@ -8,9 +8,9 @@
+ 
+ # ifndef __ASSEMBLY__
+ #  define __REG(x)	(*((volatile u32 *)(x)))
+-# define __REG2(x,y)	\
+-	( __builtin_constant_p(y) ? (__REG((x) + (y))) \
+-			  : (*(volatile u32 *)((u32)&__REG(x) + (y))) )
++#  define __REG2(x,y)	(*((volatile u32 *)((x)+(y))))
++
++
+ # else
+ #  define __REG(x) (x)
+ #  define __REG2(x,y) ((x)+(y))
 @@ -574,4 +574,27 @@
  #define TSTAT_CAPT     (1<<1)  /* Capture event */
  #define TSTAT_COMP     (1)     /* Compare event */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [749] branches/toolsupgrade

[<jo...@us...>]

Revision: 749
          http://armadeus.svn.sourceforge.net/armadeus/?rev=749&view=rev
Author:   jorasse
Date:     2007-12-28 10:49:53 -0800 (Fri, 28 Dec 2007)

Log Message:
-----------
[buildroot] clean-up dev branche

Added Paths:
-----------
    branches/toolsupgrade/ChangeLog
    branches/toolsupgrade/Makefile
    branches/toolsupgrade/buildroot/
    branches/toolsupgrade/downloads/
    branches/toolsupgrade/firmware/
    branches/toolsupgrade/host/
    branches/toolsupgrade/patches/
    branches/toolsupgrade/software/
    branches/toolsupgrade/target/

Removed Paths:
-------------
    branches/toolsupgrade/trunk/

Copied: branches/toolsupgrade/ChangeLog (from rev 748, branches/toolsupgrade/trunk/ChangeLog)
===================================================================
--- branches/toolsupgrade/ChangeLog	                        (rev 0)
+++ branches/toolsupgrade/ChangeLog	2007-12-28 18:49:53 UTC (rev 749)
@@ -0,0 +1,86 @@
+
+                ChangeLog file for Armadeus Project
+
+Changes in release 2.2 (16 December 2007)
+- [UBOOT] U-Boot 1.1.6 patched 2.6
+- [UBOOT] set pullup by default on inputs
+- [UBOOT] Change default MAC address to be compliant with Armadeus one
+- [LINUX] Added support for kernel Linux 2.6.23.1 (set as default)
+- [LINUX] Improved support for RTC-ds1374 RealTime Clock
+- [LINUX] Added backlight control for Microtips LCD
+- [LINUX] Enhanced framebuffer driver
+- [LINUX] Added capability to build the Armadeus custom drivers in kernel
+- [LINUX] Enhanced iMX SPI driver to be compiled as module
+- [LINUX] Added backlight support for i.MXL
+- [LINUX] Added TSC2102 core and touchscreen drivers
+- [LINUX] Added support for isp1761 USB host controller
+- [LINUX] Added support for MCP2515 CAN bus controller (not activated by default)
+- [BUILDROOT] updated buildroot to revision 20321 (snapshot 20071027)
+- [BUILDROOT] libacl1 libacl1-dev host packages required
+- [BUILDROOT] Build g++ and shared lib as default
+- [BUILDROOT] Fixed uClibc compatility issues to support OpenSSH 
+                  thanks to Jean Michel
+- [BUILDROOT] Added Samba services smbmount, nmbd and smbd
+- [BUILDROOT] Added support for PrBoom
+- [BUILDROOT] Added SDL_mixer, SDL_net support
+- [BUILDROOT] Added support for LMbench (performance analysis tools)
+- [BUILDROOT] Added sound file playing capability to PWM driver
+- [BUILDROOT] Added support for Allegro (still needs to be static library)
+- [BUILDROOT] Added support for Lua package (thanks to Benoit)
+- [BUILDROOT] Added support for ipkg package with scripts and utilities
+                  Still needs Host part to build .ipk packages
+- [BUILDROOT] Added Tslib support with ts_test tool
+- [BUILDROOT] Preliminary integration of GPM package
+- [BUILDROOT] Preliminary integration of the Mesa package
+- [BUILDROOT] Added SDL-Water demo
+- [BUILDROOT] Added support for CH7024 (TV encoder)
+- [BUILDROOT] Added support for SDL Perigee Slideshow tool
+- [BUILDROOT] Added support for the max5821 DAC converter
+- [BUILDROOT] Build demos and examples by default in qtopia (but not installed)
+- [BUILDROOT] Preliminary integration of the ltp-testsuite package
+- [BUILDROOT] Preliminary support for libvorbis
+- [BUILDROOT] Hide original kernel menu - Armadeus defines its own kernel menu
+- [SOFTWARE] Added first (usable but buggy) version of Wolfenstein3D
+- [SOFTWARE] Added uboot_recover tool
+- [SOFTWARE] Added initial version of orchestra project builder
+- [FIRMWARE] Added led example for the FPGA (led_top.bin)
+- [FIRMWARE] Added 400k gates Spartan3 bitfile for PS/2 controller
+- [FIRMWARE] Added SRAM test VHDL code for the Devfull board
+- [FIRMWARE] Improved PS2 IP to be compatible with APF9328 board
+- [BUILD] Added buildauto target to main Makefile in order to setup automatic builds
+- [ROOTFS] Adding of /etc/fb.modes framebuffer config file (used by SDL for example)
+- [ROOTFS] Add Bash script to test MMC/SD cards performances
+- [ROOTFS] Changed MAJOR of /dev/mmcblkxx
+- Fixed many bugs
+- Revoked release 2.1 (bug fixed)
+
+Changes in release 2.0 (7 February 2007)
+- upgrade U-Boot bios to release 1.1.6
+- upgrade buildroot to the october, 30 2006 snapshot 
+- add support for the RTC DS1374 (under u-boot and linux)
+- new IMX SPI linux driver
+- add MAX1027 ADC linux driver
+- add IMX PWM linux driver
+- improve imx-i2c driver (bugs fixed)
+- change the name of the armadeus platform under u-boot to apx9328:
+      apm9328 and apf9328 compatible
+- add a Linux FPGA loader tool
+- add a Linux FPGAregs tool
+- support linux kernel 2.6.18.1
+- Add sysfs to fstab
+- Add support for several LCDs in linux (Sharp, Microtips)
+- improved DHCP usage with uBoot
+- Use new spartan3 U-Boot driver
+- preliminary support for SDL
+
+
+Changes in release 1.6 (11 November 2006)
+- added Linux kernels 2.6.17 and 2.6.18
+- added usb support add mmc support
+
+Changes in release 1.5 (15 July 2006)
+- building package for toolchain, U-Boot, kernel and root-fs
+- First referenced released
+
+Sorry, no detailed ChangeLog available for previous releases
+

Copied: branches/toolsupgrade/Makefile (from rev 748, branches/toolsupgrade/trunk/Makefile)
===================================================================
--- branches/toolsupgrade/Makefile	                        (rev 0)
+++ branches/toolsupgrade/Makefile	2007-12-28 18:49:53 UTC (rev 749)
@@ -0,0 +1,137 @@
+# Makefile for armadeus
+#
+# Copyright (C) 2005-2007 by <jo...@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 program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+#--------------------------------------------------------------
+# Just run 'make menuconfig', configure stuff, then run 'make'.
+# You shouldn't need to mess with anything beyond this point...
+#--------------------------------------------------------------
+
+BUILDROOT_DIR = buildroot
+
+BUILDROOT_NAME=buildroot
+BUILDROOT_FILE_PATH:=downloads
+BUILDROOT_SITE:=ftp://ftp2.armadeus.com/armadeus/download
+BUILDROOT_VERSION:=20071027
+BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
+
+ARMADEUS_TOPDIR:=$(shell pwd)
+export ARMADEUS_TOPDIR
+
+PATCH_DIR=patches
+PATCH_CYGWIN_DIR=$(PATCH_DIR)/cygwin
+TAR_OPTIONS=--exclude=.svn -xf 
+
+#used only by cygwin to restore the rights on some rootfs directories
+BUILDROOT_ROOT_DIR=$(BUILDROOT_DIR)/project_build_arm/root
+
+LINUX-REL=`grep "BR2_PACKAGE_LINUX_VERSION=" $(BUILDROOT_DIR)/.config | \
+      sed "s/BR2_PACKAGE_LINUX_VERSION=\\"//" | sed "s/\\"//"`
+LINUX_DIR=$(BUILDROOT_DIR)/build_arm/linux-$(LINUX-REL)
+
+
+all: buildroot
+
+help:
+	@echo 'Cleaning:'
+	@echo '  buildroot-clean	- delete all non-source files in buildroot'
+	@echo '  clean                  - delete temporary files created by build'
+	@echo '  distclean              - delete all non-source files (including .config)'
+	@echo
+	@echo 'Build:'
+	@echo '  all                    - make world'
+	@echo '  <Package>		- a single package (ex: u-boot linux or buildroot'
+	@echo
+	@echo 'Configuration:'
+	@echo '  menuconfig             - interactive curses-based configurator'
+	@echo '  oldconfig              - resolve any unresolved symbols in .config'
+	@echo
+	@echo 'Miscellaneous:'
+	@echo '  source                 - download all sources needed for offline-build'
+	@echo '  source-check           - check all packages for valid download URLs'
+	@echo
+	@echo 'See www.armadeus.org for further armadeus details'
+	@echo 'See /buildroot/docs/README and /buildroot/docs/buildroot.html'
+	@echo '  for further buildroot details'
+	@echo
+
+
+# configuration
+# ---------------------------------------------------------------------------
+
+$(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE):
+	mkdir -p $(BUILDROOT_FILE_PATH)
+	wget --passive-ftp -P $(BUILDROOT_FILE_PATH)  $(BUILDROOT_SITE)/$(BUILDROOT_SOURCE)
+
+
+$(BUILDROOT_DIR)/.unpacked: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) $(PATCH_DIR)/*.diff
+	bzcat $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) | \
+	tar --exclude=.svn -C $(BUILDROOT_DIR)/.. $(TAR_OPTIONS) -
+	$(BUILDROOT_DIR)/toolchain/patch-kernel.sh $(BUILDROOT_DIR) $(PATCH_DIR) \*.diff 
+	@if uname | grep -i cygwin >/dev/null 2>&1 ; then  \
+		./host/patches/cygwin/run ; \
+		svn revert . ; \
+    	$(BUILDROOT_DIR)/toolchain/patch-kernel.sh $(BUILDROOT_DIR) $(PATCH_CYGWIN_DIR) *.diff ; \
+     	sed -e 's/pc-linux-gnu/pc-cygwin/g' $(BUILDROOT_DIR)/.defconfig > $(BUILDROOT_DIR)/.defconfig_cygwin ; \
+		mv -f $(BUILDROOT_DIR)/.defconfig_cygwin $(BUILDROOT_DIR)/.defconfig ; \
+	fi;
+	touch $(BUILDROOT_DIR)/.unpacked
+
+buildroot: $(BUILDROOT_DIR)/.unpacked
+	@if uname | grep -i cygwin >/dev/null 2>&1 ; then  \
+		if [ -e "$(BUILDROOT_ROOT_DIR)/etc" ] ; then \
+			chmod 777 $(BUILDROOT_DIR)/build_arm_nofpu/root/etc ; \
+		fi; \
+		if [ -e "$(BUILDROOT_ROOT_DIR)/etc" ] ; then \
+			chmod 777 $(BUILDROOT_DIR)/build_arm_nofpu/root/dev ; \
+		fi; \
+	fi;
+	@$(MAKE) -C $(BUILDROOT_DIR)
+
+# To be called only one time if one wants to make an automatic build
+buildauto: $(BUILDROOT_DIR)/.unpacked
+	# Be sure that /local/downloads exists if you want to use automated build
+	sed -e 's/BR2_DL_DIR/BR2_DL_DIR=\"\/local\/downloads\" #/g' $(BUILDROOT_DIR)/.defconfig > $(BUILDROOT_DIR)/.defconfig_new ; \
+		mv -f $(BUILDROOT_DIR)/.defconfig_new $(BUILDROOT_DIR)/.defconfig
+	echo "ey" | $(MAKE) -C $(BUILDROOT_DIR) menuconfig
+	$(MAKE) -C $(BUILDROOT_DIR)
+
+menuconfig: $(BUILDROOT_DIR)/.unpacked
+	@$(MAKE) -C $(BUILDROOT_DIR) menuconfig
+
+
+linux-menuconfig:
+	@if [ -e "$(LINUX_DIR)/.unpacked" ] ; then \
+		$(MAKE) -C $(LINUX_DIR) menuconfig ; \
+	fi;
+
+.DEFAULT: $(BUILDROOT_DIR)/.unpacked
+	@$(MAKE) -C $(BUILDROOT_DIR) $@
+
+buildroot-clean:
+	rm -rf $(BUILDROOT_DIR)/build*
+	rm -rf $(BUILDROOT_DIR)/binaries
+	rm -rf $(BUILDROOT_DIR)/project_build*
+	rm -rf $(BUILDROOT_DIR)/toolchain_build*
+
+buildroot-dirclean:
+	rm -rf $(BUILDROOT_DIR)	
+	
+.PHONY: dummy buildroot buildroot-clean
+
+

Copied: branches/toolsupgrade/buildroot (from rev 748, branches/toolsupgrade/trunk/buildroot)

Copied: branches/toolsupgrade/downloads (from rev 748, branches/toolsupgrade/trunk/downloads)

Copied: branches/toolsupgrade/firmware (from rev 748, branches/toolsupgrade/trunk/firmware)

Copied: branches/toolsupgrade/host (from rev 748, branches/toolsupgrade/trunk/host)

Copied: branches/toolsupgrade/patches (from rev 748, branches/toolsupgrade/trunk/patches)

Copied: branches/toolsupgrade/software (from rev 748, branches/toolsupgrade/trunk/software)

Copied: branches/toolsupgrade/target (from rev 748, branches/toolsupgrade/trunk/target)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [748] branches/toolsupgrade/trunk/

[<jo...@us...>]

Revision: 748
          http://armadeus.svn.sourceforge.net/armadeus/?rev=748&view=rev
Author:   jorasse
Date:     2007-12-27 03:06:30 -0800 (Thu, 27 Dec 2007)

Log Message:
-----------
[buildroot] update dev branch

Added Paths:
-----------
    branches/toolsupgrade/trunk/

Copied: branches/toolsupgrade/trunk (from rev 747, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [747] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.23.1

[<th...@us...>]

Revision: 747
          http://armadeus.svn.sourceforge.net/armadeus/?rev=747&view=rev
Author:   thom25
Date:     2007-12-20 05:07:05 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
fix spi mode and cleanup apf file with defines

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/088-mcp2515.diff

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff	2007-12-17 21:15:34 UTC (rev 746)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff	2007-12-20 13:07:05 UTC (rev 747)
@@ -808,7 +808,7 @@
 +CONFIG_ZLIB_DEFLATE=y
 --- linux-2.6.23.1.1/arch/arm/mach-imx/apf9328.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.23.1.1.mod/arch/arm/mach-imx/apf9328.c	2007-07-22 22:46:57.000000000 +0200
-@@ -0,0 +1,527 @@
+@@ -0,0 +1,533 @@
 +/*
 + * linux/arch/arm/mach-imx/apf9328.c
 + *
@@ -1006,7 +1006,7 @@
 +
 +static struct spi_imx_master imx_spi1_master_info = {
 +	.num_chipselect	= 1,
-+	.enable_dma=0,
++	.enable_dma     = 0,
 +};
 +
 +static struct platform_device imx_spi1 = {
@@ -1034,7 +1034,7 @@
 +
 +static struct spi_imx_master imx_spi2_master_info = {
 +	.num_chipselect	= 1,
-+	.enable_dma=0,
++	.enable_dma     = 0,
 +};
 +
 +static struct platform_device imx_spi2 = {
@@ -1077,6 +1077,8 @@
 +
 +#ifdef CONFIG_SPI_TSC2102
 +#define TSC2102_CS_GPIOB 17
++#define TSC2102_INT_GPIOD 8 
++
 +static void tsc2102_init_gpio(void)
 +{
 +    // Activate SPI2 port ----
@@ -1090,7 +1092,7 @@
 +    FMCR |= SPI2_RXD_SEL; // RX is AOUT on PORTD
 +
 +    // PortD 8 is used as PINTDAV interrupt
-+    imx_gpio_mode( GPIO_PORTD | 8 | GPIO_IN | GPIO_GIUS );
++    imx_gpio_mode( GPIO_PORTD | TSC2102_INT_GPIOD | GPIO_IN | GPIO_GIUS );
 +    //imx_gpio_irq_type( IRQ_GPIOD(8), __IRQT_FALEDGE );
 +
 +    // Activate SSI on PortC ----
@@ -1135,6 +1137,7 @@
 +
 +#ifdef CONFIG_CAN_MCP251X
 +#define CAN_MPC251X_CS_GPIOB 19
++#define CAN_MPC251X_INT_GPIOC 13 
 +
 +// Chip select command for MCP251X
 +static void mcp251X_cs(u32 command)
@@ -1156,19 +1159,22 @@
 +    // PortB 19 is used as chip select (in GPIO mode)
 +    DR(1) |= 1 << CAN_MPC251X_CS_GPIOB; // Initializes it High
 +    imx_gpio_mode( GPIO_PORTB | CAN_MPC251X_CS_GPIOB | GPIO_OUT | GPIO_GIUS | GPIO_DR );
++
++    // PortC 13 is used as CAN interrupt
++    imx_gpio_mode( GPIO_PORTC | CAN_MPC251X_INT_GPIOC | GPIO_IN | GPIO_GIUS );
++
 +    // Configure SPI2 outputs
 +    imx_gpio_mode( PD7_AIN_SPI2_SCLK );
 +    imx_gpio_mode( PD10_AIN_SPI2_TXD );
 +    imx_gpio_mode( PD9_AOUT_SPI2_RXD );
 +    FMCR |= SPI2_RXD_SEL; // RX is AOUT on PORTD
-+    imx_gpio_mode( GPIO_PORTC | 13 | GPIO_IN | GPIO_GIUS );
 +}
 +
 +static struct mcp251x_platform_data apf9328_mcp251x_config = {
-+ .oscillator_frequency = 16000000,
-+ .board_specific_setup = NULL,
-+ .device_reset = NULL,
-+ .transceiver_enable = NULL,
++ .oscillator_frequency  = 16000000,
++ .board_specific_setup  = NULL,
++ .device_reset          = NULL,
++ .transceiver_enable    = NULL,
 +};
 +
 +#endif 
@@ -1191,7 +1197,7 @@
 +    .controller_data 	= &tsc2102_hw,
 +    .max_speed_hz		= 8000000,
 +    .bus_num			= 2, // SPI2
-+    .irq                = IRQ_GPIOD(8),
++    .irq                = IRQ_GPIOD(TSC2102_INT_GPIOD),
 +    .chip_select		= 0,
 +    .mode 				= 0,
 +    .platform_data      = &apf9328_tsc2102_config,
@@ -1199,14 +1205,14 @@
 +#endif // CONFIG_SPI_TSC2102
 +#ifdef CONFIG_CAN_MCP251X
 + {
-+ .modalias       = "mcp251x",
-+ .max_speed_hz   = 8000000, /* 8MHz */
++ .modalias          = "mcp251x",
++ .max_speed_hz      = 8000000, /* 8MHz */
 + .controller_data 	= &mcp251X_hw,
-+ .bus_num        = 2,
-+ .mode           = SPI_MODE_0,
-+ .chip_select    = 0,
-+ .irq = IRQ_GPIOC(13),
-+ .platform_data  = &apf9328_mcp251x_config,
++ .bus_num           = 2,
++ .mode              = SPI_MODE_0,
++ .chip_select       = 0,
++ .irq               = IRQ_GPIOC( CAN_MPC251X_INT_GPIOC ),
++ .platform_data     = &apf9328_mcp251x_config,
 + },
 +#endif // CONFIG_CAN_MCP251X
 +};
@@ -1220,9 +1226,9 @@
 +
 +#ifdef CONFIG_IMX_BACKLIGHT
 +static struct imxbl_machinfo imx_bl_machinfo = {
-+    .max_intensity = 0xff,
-+    .default_intensity = 0x90,
-+    .limit_mask = 0x7f, // When battery is low
++    .max_intensity      = 0xff,
++    .default_intensity  = 0x90,
++    .limit_mask         = 0x7f, // When battery is low
 +//    set_bl_intensity = put a function here if you want to overload default one,
 +};
 +//extern struct platform_device imxfb_device; // filled in generic.c
@@ -1318,10 +1324,10 @@
 +    set_irq_type(APF9328_ETH_IRQ, IRQF_TRIGGER_LOW);
 +#endif // CONFIG_DM9000
 +#ifdef CONFIG_SPI_TSC2102
-+    set_irq_type( IRQ_GPIOD(8), IRQF_TRIGGER_FALLING );
++    set_irq_type( IRQ_GPIOD(TSC2102_INT_GPIOD), IRQF_TRIGGER_FALLING );
 +#endif // CONFIG_SPI_TSC2102
 +#ifdef CONFIG_CAN_MCP251X
-+    set_irq_type( IRQ_GPIOC(13), IRQF_TRIGGER_FALLING );
++    set_irq_type( IRQ_GPIOC(CAN_MPC251X_INT_GPIOC), IRQF_TRIGGER_FALLING );
 +#endif // CONFIG_CAN_MCP251X
 +}
 +

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/088-mcp2515.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/088-mcp2515.diff	2007-12-17 21:15:34 UTC (rev 746)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/088-mcp2515.diff	2007-12-20 13:07:05 UTC (rev 747)
@@ -856,7 +856,7 @@
 +    INIT_WORK(&priv->irq_work, mcp251x_irq_work_handler);
 +
 +    /* Configure the SPI bus */
-+    spi->mode = SPI_MODE_2;
++    spi->mode = SPI_MODE_0;
 +    spi->bits_per_word = 8;
 +    spi_setup(spi);
 +


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [746] trunk/software/uboot_recover/uboot_recover.py

[<th...@us...>]

Revision: 746
          http://armadeus.svn.sourceforge.net/armadeus/?rev=746&view=rev
Author:   thom25
Date:     2007-12-17 13:15:34 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
change baudrate to 38400 after encountering some difficulties with 57600

Modified Paths:
--------------
    trunk/software/uboot_recover/uboot_recover.py

Modified: trunk/software/uboot_recover/uboot_recover.py
===================================================================
--- trunk/software/uboot_recover/uboot_recover.py	2007-12-16 23:30:23 UTC (rev 745)
+++ trunk/software/uboot_recover/uboot_recover.py	2007-12-17 21:15:34 UTC (rev 746)
@@ -27,7 +27,7 @@
 ser = 0 #serial port
 
 if __name__ == "__main__":    
-    SPEED = 57600
+    SPEED = 38400
     ramSize = 16
     print "APF Recover Tool"
     print "Do not forget to place the bootstrap jumper !!"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [745] tags/release-2.2/

[<jo...@us...>]

Revision: 745
          http://armadeus.svn.sourceforge.net/armadeus/?rev=745&view=rev
Author:   jorasse
Date:     2007-12-16 15:30:23 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
[ARMADEUS] Create release 2.2

Added Paths:
-----------
    tags/release-2.2/

Copied: tags/release-2.2 (from rev 744, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [744] tags/release-2.2/

[<jo...@us...>]

Revision: 744
          http://armadeus.svn.sourceforge.net/armadeus/?rev=744&view=rev
Author:   jorasse
Date:     2007-12-16 15:29:06 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
[ARMADEUS] untag release

Removed Paths:
-------------
    tags/release-2.2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [743] tags/release-2.2/

[<jo...@us...>]

Revision: 743
          http://armadeus.svn.sourceforge.net/armadeus/?rev=743&view=rev
Author:   jorasse
Date:     2007-12-16 15:18:16 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
[ARMADEUS] Release 2.2

Added Paths:
-----------
    tags/release-2.2/

Copied: tags/release-2.2 (from rev 741, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [742] trunk/ChangeLog

[<jo...@us...>]

Revision: 742
          http://armadeus.svn.sourceforge.net/armadeus/?rev=742&view=rev
Author:   jorasse
Date:     2007-12-16 15:13:48 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
[ARMADEUS] Updated ChangeLog to prepare release 2.2

Modified Paths:
--------------
    trunk/ChangeLog

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-16 11:57:25 UTC (rev 741)
+++ trunk/ChangeLog	2007-12-16 23:13:48 UTC (rev 742)
@@ -1,7 +1,7 @@
 
                 ChangeLog file for Armadeus Project
 
-Changes in release 2.1 (15 December 2007)
+Changes in release 2.2 (16 December 2007)
 - [UBOOT] U-Boot 1.1.6 patched 2.6
 - [UBOOT] set pullup by default on inputs
 - [UBOOT] Change default MAC address to be compliant with Armadeus one
@@ -52,6 +52,7 @@
 - [ROOTFS] Add Bash script to test MMC/SD cards performances
 - [ROOTFS] Changed MAJOR of /dev/mmcblkxx
 - Fixed many bugs
+- Revoked release 2.1 (bug fixed)
 
 Changes in release 2.0 (7 February 2007)
 - upgrade U-Boot bios to release 1.1.6


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [741] trunk

[<ar...@us...>]

Revision: 741
          http://armadeus.svn.sourceforge.net/armadeus/?rev=741&view=rev
Author:   artemys
Date:     2007-12-16 03:57:25 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
[ROOTFS] Changed MAJOR of /dev/mmcblkxx

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/buildroot/target/device/armadeus/rootfs/device_table.txt

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-16 09:48:06 UTC (rev 740)
+++ trunk/ChangeLog	2007-12-16 11:57:25 UTC (rev 741)
@@ -50,6 +50,7 @@
 - [BUILD] Added buildauto target to main Makefile in order to setup automatic builds
 - [ROOTFS] Adding of /etc/fb.modes framebuffer config file (used by SDL for example)
 - [ROOTFS] Add Bash script to test MMC/SD cards performances
+- [ROOTFS] Changed MAJOR of /dev/mmcblkxx
 - Fixed many bugs
 
 Changes in release 2.0 (7 February 2007)

Modified: trunk/buildroot/target/device/armadeus/rootfs/device_table.txt
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/device_table.txt	2007-12-16 09:48:06 UTC (rev 740)
+++ trunk/buildroot/target/device/armadeus/rootfs/device_table.txt	2007-12-16 11:57:25 UTC (rev 741)
@@ -179,7 +179,7 @@
  /dev/i2c-0	c 	666 	0 	0 	89 	0
 
 # MMC/SD Devices
-/dev/mmcblk0	b	640	0	0	254	0	0	0	-
-/dev/mmcblk0p	b	640	0	0	254	1	1	1	8	
+/dev/mmcblk0	b	640	0	0	179	0	0	0	-
+/dev/mmcblk0p	b	640	0	0	179	1	1	1	8	
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [740] trunk/ChangeLog

[<ar...@us...>]

Revision: 740
          http://armadeus.svn.sourceforge.net/armadeus/?rev=740&view=rev
Author:   artemys
Date:     2007-12-16 01:48:06 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
Correct some spell mistakes in Changelog

Modified Paths:
--------------
    trunk/ChangeLog

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-15 19:35:41 UTC (rev 739)
+++ trunk/ChangeLog	2007-12-16 09:48:06 UTC (rev 740)
@@ -1,5 +1,5 @@
 
-                ChangeLog file for Armadeus
+                ChangeLog file for Armadeus Project
 
 Changes in release 2.1 (15 December 2007)
 - [UBOOT] U-Boot 1.1.6 patched 2.6
@@ -11,7 +11,7 @@
 - [LINUX] Enhanced framebuffer driver
 - [LINUX] Added capability to build the Armadeus custom drivers in kernel
 - [LINUX] Enhanced iMX SPI driver to be compiled as module
-- [LINUX] Added of backlight support for i.MXL
+- [LINUX] Added backlight support for i.MXL
 - [LINUX] Added TSC2102 core and touchscreen drivers
 - [LINUX] Added support for isp1761 USB host controller
 - [LINUX] Added support for MCP2515 CAN bus controller (not activated by default)
@@ -53,7 +53,7 @@
 - Fixed many bugs
 
 Changes in release 2.0 (7 February 2007)
-- upgrade u-boot bios to release 1.1.6
+- upgrade U-Boot bios to release 1.1.6
 - upgrade buildroot to the october, 30 2006 snapshot 
 - add support for the RTC DS1374 (under u-boot and linux)
 - new IMX SPI linux driver
@@ -68,16 +68,16 @@
 - Add sysfs to fstab
 - Add support for several LCDs in linux (Sharp, Microtips)
 - improved DHCP usage with uBoot
-- Use new spartan3 u-boot driver
+- Use new spartan3 U-Boot driver
 - preliminary support for SDL
 
 
 Changes in release 1.6 (11 November 2006)
-- added linux kernels 2.6.17 and 2.6.18
+- added Linux kernels 2.6.17 and 2.6.18
 - added usb support add mmc support
 
 Changes in release 1.5 (15 July 2006)
-- building package for toolchain, u-boot, kernel and root-fs
+- building package for toolchain, U-Boot, kernel and root-fs
 - First referenced released
 
 Sorry, no detailed ChangeLog available for previous releases


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [739] tags/release-2.1/ChangeLog

[<jo...@us...>]

Revision: 739
          http://armadeus.svn.sourceforge.net/armadeus/?rev=739&view=rev
Author:   jorasse
Date:     2007-12-15 11:35:41 -0800 (Sat, 15 Dec 2007)

Log Message:
-----------
[BUILDROOT] Fixed date of release

Modified Paths:
--------------
    tags/release-2.1/ChangeLog

Modified: tags/release-2.1/ChangeLog
===================================================================
--- tags/release-2.1/ChangeLog	2007-12-15 19:31:18 UTC (rev 738)
+++ tags/release-2.1/ChangeLog	2007-12-15 19:35:41 UTC (rev 739)
@@ -1,7 +1,7 @@
 
                 ChangeLog file for Armadeus
 
-Changes in release 2.1 (8 December 2007)
+Changes in release 2.1 (15 December 2007)
 - [UBOOT] U-Boot 1.1.6 patched 2.6
 - [UBOOT] set pullup by default on inputs
 - [UBOOT] Change default MAC address to be compliant with Armadeus one


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [738] trunk/release-2.1

[<jo...@us...>]

Revision: 738
          http://armadeus.svn.sourceforge.net/armadeus/?rev=738&view=rev
Author:   jorasse
Date:     2007-12-15 11:31:18 -0800 (Sat, 15 Dec 2007)

Log Message:
-----------
Shame on me :(

Removed Paths:
-------------
    trunk/release-2.1

Deleted: trunk/release-2.1
===================================================================
--- trunk/release-2.1	2007-12-15 19:26:46 UTC (rev 737)
+++ trunk/release-2.1	2007-12-15 19:31:18 UTC (rev 738)
@@ -1,84 +0,0 @@
-
-                ChangeLog file for Armadeus
-
-Changes in release 2.1 (15 December 2007)
-- [UBOOT] U-Boot 1.1.6 patched 2.6
-- [UBOOT] set pullup by default on inputs
-- [UBOOT] Change default MAC address to be compliant with Armadeus one
-- [LINUX] Added support for kernel Linux 2.6.23.1 (set as default)
-- [LINUX] Improved support for RTC-ds1374 RealTime Clock
-- [LINUX] Added backlight control for Microtips LCD
-- [LINUX] Enhanced framebuffer driver
-- [LINUX] Added capability to build the Armadeus custom drivers in kernel
-- [LINUX] Enhanced iMX SPI driver to be compiled as module
-- [LINUX] Added of backlight support for i.MXL
-- [LINUX] Added TSC2102 core and touchscreen drivers
-- [LINUX] Added support for isp1761 USB host controller
-- [LINUX] Added support for MCP2515 CAN bus controller (not activated by default)
-- [BUILDROOT] updated buildroot to revision 20321 (snapshot 20071027)
-- [BUILDROOT] libacl1 libacl1-dev host packages required
-- [BUILDROOT] Build g++ and shared lib as default
-- [BUILDROOT] Fixed uClibc compatility issues to support OpenSSH 
-                  thanks to Jean Michel
-- [BUILDROOT] Added Samba services smbmount, nmbd and smbd
-- [BUILDROOT] Added support for PrBoom
-- [BUILDROOT] Added SDL_mixer, SDL_net support
-- [BUILDROOT] Added support for LMbench (performance analysis tools)
-- [BUILDROOT] Added sound file playing capability to PWM driver
-- [BUILDROOT] Added support for Allegro (still needs to be static library)
-- [BUILDROOT] Added support for Lua package (thanks to Benoit)
-- [BUILDROOT] Added support for ipkg package with scripts and utilities
-                  Still needs Host part to build .ipk packages
-- [BUILDROOT] Added Tslib support with ts_test tool
-- [BUILDROOT] Preliminary integration of GPM package
-- [BUILDROOT] Preliminary integration of the Mesa package
-- [BUILDROOT] Added SDL-Water demo
-- [BUILDROOT] Added support for CH7024 (TV encoder)
-- [BUILDROOT] Added support for SDL Perigee Slideshow tool
-- [BUILDROOT] Added support for the max5821 DAC converter
-- [BUILDROOT] Build demos and examples by default in qtopia (but not installed)
-- [BUILDROOT] Preliminary integration of the ltp-testsuite package
-- [BUILDROOT] Preliminary support for libvorbis
-- [BUILDROOT] Hide original kernel menu - Armadeus defines its own kernel menu
-- [SOFTWARE] Added first (usable but buggy) version of Wolfenstein3D
-- [SOFTWARE] Added uboot_recover tool
-- [SOFTWARE] Added initial version of orchestra project builder
-- [FIRMWARE] Added led example for the FPGA (led_top.bin)
-- [FIRMWARE] Added 400k gates Spartan3 bitfile for PS/2 controller
-- [FIRMWARE] Added SRAM test VHDL code for the Devfull board
-- [FIRMWARE] Improved PS2 IP to be compatible with APF9328 board
-- [BUILD] Added buildauto target to main Makefile in order to setup automatic builds
-- [ROOTFS] Adding of /etc/fb.modes framebuffer config file (used by SDL for example)
-- [ROOTFS] Add Bash script to test MMC/SD cards performances
-- Fixed many bugs
-
-Changes in release 2.0 (7 February 2007)
-- upgrade u-boot bios to release 1.1.6
-- upgrade buildroot to the october, 30 2006 snapshot 
-- add support for the RTC DS1374 (under u-boot and linux)
-- new IMX SPI linux driver
-- add MAX1027 ADC linux driver
-- add IMX PWM linux driver
-- improve imx-i2c driver (bugs fixed)
-- change the name of the armadeus platform under u-boot to apx9328:
-      apm9328 and apf9328 compatible
-- add a Linux FPGA loader tool
-- add a Linux FPGAregs tool
-- support linux kernel 2.6.18.1
-- Add sysfs to fstab
-- Add support for several LCDs in linux (Sharp, Microtips)
-- improved DHCP usage with uBoot
-- Use new spartan3 u-boot driver
-- preliminary support for SDL
-
-
-Changes in release 1.6 (11 November 2006)
-- added linux kernels 2.6.17 and 2.6.18
-- added usb support add mmc support
-
-Changes in release 1.5 (15 July 2006)
-- building package for toolchain, u-boot, kernel and root-fs
-- First referenced released
-
-Sorry, no detailed ChangeLog available for previous releases
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [737] trunk/release-2.1

[<jo...@us...>]

Revision: 737
          http://armadeus.svn.sourceforge.net/armadeus/?rev=737&view=rev
Author:   jorasse
Date:     2007-12-15 11:26:46 -0800 (Sat, 15 Dec 2007)

Log Message:
-----------
[BUILDROOT] Fixed date of release

Added Paths:
-----------
    trunk/release-2.1

Copied: trunk/release-2.1 (from rev 736, trunk/ChangeLog)
===================================================================
--- trunk/release-2.1	                        (rev 0)
+++ trunk/release-2.1	2007-12-15 19:26:46 UTC (rev 737)
@@ -0,0 +1,84 @@
+
+                ChangeLog file for Armadeus
+
+Changes in release 2.1 (15 December 2007)
+- [UBOOT] U-Boot 1.1.6 patched 2.6
+- [UBOOT] set pullup by default on inputs
+- [UBOOT] Change default MAC address to be compliant with Armadeus one
+- [LINUX] Added support for kernel Linux 2.6.23.1 (set as default)
+- [LINUX] Improved support for RTC-ds1374 RealTime Clock
+- [LINUX] Added backlight control for Microtips LCD
+- [LINUX] Enhanced framebuffer driver
+- [LINUX] Added capability to build the Armadeus custom drivers in kernel
+- [LINUX] Enhanced iMX SPI driver to be compiled as module
+- [LINUX] Added of backlight support for i.MXL
+- [LINUX] Added TSC2102 core and touchscreen drivers
+- [LINUX] Added support for isp1761 USB host controller
+- [LINUX] Added support for MCP2515 CAN bus controller (not activated by default)
+- [BUILDROOT] updated buildroot to revision 20321 (snapshot 20071027)
+- [BUILDROOT] libacl1 libacl1-dev host packages required
+- [BUILDROOT] Build g++ and shared lib as default
+- [BUILDROOT] Fixed uClibc compatility issues to support OpenSSH 
+                  thanks to Jean Michel
+- [BUILDROOT] Added Samba services smbmount, nmbd and smbd
+- [BUILDROOT] Added support for PrBoom
+- [BUILDROOT] Added SDL_mixer, SDL_net support
+- [BUILDROOT] Added support for LMbench (performance analysis tools)
+- [BUILDROOT] Added sound file playing capability to PWM driver
+- [BUILDROOT] Added support for Allegro (still needs to be static library)
+- [BUILDROOT] Added support for Lua package (thanks to Benoit)
+- [BUILDROOT] Added support for ipkg package with scripts and utilities
+                  Still needs Host part to build .ipk packages
+- [BUILDROOT] Added Tslib support with ts_test tool
+- [BUILDROOT] Preliminary integration of GPM package
+- [BUILDROOT] Preliminary integration of the Mesa package
+- [BUILDROOT] Added SDL-Water demo
+- [BUILDROOT] Added support for CH7024 (TV encoder)
+- [BUILDROOT] Added support for SDL Perigee Slideshow tool
+- [BUILDROOT] Added support for the max5821 DAC converter
+- [BUILDROOT] Build demos and examples by default in qtopia (but not installed)
+- [BUILDROOT] Preliminary integration of the ltp-testsuite package
+- [BUILDROOT] Preliminary support for libvorbis
+- [BUILDROOT] Hide original kernel menu - Armadeus defines its own kernel menu
+- [SOFTWARE] Added first (usable but buggy) version of Wolfenstein3D
+- [SOFTWARE] Added uboot_recover tool
+- [SOFTWARE] Added initial version of orchestra project builder
+- [FIRMWARE] Added led example for the FPGA (led_top.bin)
+- [FIRMWARE] Added 400k gates Spartan3 bitfile for PS/2 controller
+- [FIRMWARE] Added SRAM test VHDL code for the Devfull board
+- [FIRMWARE] Improved PS2 IP to be compatible with APF9328 board
+- [BUILD] Added buildauto target to main Makefile in order to setup automatic builds
+- [ROOTFS] Adding of /etc/fb.modes framebuffer config file (used by SDL for example)
+- [ROOTFS] Add Bash script to test MMC/SD cards performances
+- Fixed many bugs
+
+Changes in release 2.0 (7 February 2007)
+- upgrade u-boot bios to release 1.1.6
+- upgrade buildroot to the october, 30 2006 snapshot 
+- add support for the RTC DS1374 (under u-boot and linux)
+- new IMX SPI linux driver
+- add MAX1027 ADC linux driver
+- add IMX PWM linux driver
+- improve imx-i2c driver (bugs fixed)
+- change the name of the armadeus platform under u-boot to apx9328:
+      apm9328 and apf9328 compatible
+- add a Linux FPGA loader tool
+- add a Linux FPGAregs tool
+- support linux kernel 2.6.18.1
+- Add sysfs to fstab
+- Add support for several LCDs in linux (Sharp, Microtips)
+- improved DHCP usage with uBoot
+- Use new spartan3 u-boot driver
+- preliminary support for SDL
+
+
+Changes in release 1.6 (11 November 2006)
+- added linux kernels 2.6.17 and 2.6.18
+- added usb support add mmc support
+
+Changes in release 1.5 (15 July 2006)
+- building package for toolchain, u-boot, kernel and root-fs
+- First referenced released
+
+Sorry, no detailed ChangeLog available for previous releases
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [736] trunk/ChangeLog

[<jo...@us...>]

Revision: 736
          http://armadeus.svn.sourceforge.net/armadeus/?rev=736&view=rev
Author:   jorasse
Date:     2007-12-15 11:21:15 -0800 (Sat, 15 Dec 2007)

Log Message:
-----------
[BUILDROOT] Fixed release date

Modified Paths:
--------------
    trunk/ChangeLog

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-15 17:36:00 UTC (rev 735)
+++ trunk/ChangeLog	2007-12-15 19:21:15 UTC (rev 736)
@@ -1,7 +1,7 @@
 
                 ChangeLog file for Armadeus
 
-Changes in release 2.1 (8 December 2007)
+Changes in release 2.1 (15 December 2007)
 - [UBOOT] U-Boot 1.1.6 patched 2.6
 - [UBOOT] set pullup by default on inputs
 - [UBOOT] Change default MAC address to be compliant with Armadeus one


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [735] tags/release-2.1/

[<jo...@us...>]

Revision: 735
          http://armadeus.svn.sourceforge.net/armadeus/?rev=735&view=rev
Author:   jorasse
Date:     2007-12-15 09:36:00 -0800 (Sat, 15 Dec 2007)

Log Message:
-----------
[ARMADEUS] Create Armadeus project release 2.1

Added Paths:
-----------
    tags/release-2.1/

Copied: tags/release-2.1 (from rev 734, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [734] trunk

[<jo...@us...>]

Revision: 734
          http://armadeus.svn.sourceforge.net/armadeus/?rev=734&view=rev
Author:   jorasse
Date:     2007-12-15 09:29:27 -0800 (Sat, 15 Dec 2007)

Log Message:
-----------
[BUILDROOT] Added a ChangeLog file - Updated Makefile help

Modified Paths:
--------------
    trunk/Makefile

Added Paths:
-----------
    trunk/ChangeLog

Added: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	                        (rev 0)
+++ trunk/ChangeLog	2007-12-15 17:29:27 UTC (rev 734)
@@ -0,0 +1,84 @@
+
+                ChangeLog file for Armadeus
+
+Changes in release 2.1 (8 December 2007)
+- [UBOOT] U-Boot 1.1.6 patched 2.6
+- [UBOOT] set pullup by default on inputs
+- [UBOOT] Change default MAC address to be compliant with Armadeus one
+- [LINUX] Added support for kernel Linux 2.6.23.1 (set as default)
+- [LINUX] Improved support for RTC-ds1374 RealTime Clock
+- [LINUX] Added backlight control for Microtips LCD
+- [LINUX] Enhanced framebuffer driver
+- [LINUX] Added capability to build the Armadeus custom drivers in kernel
+- [LINUX] Enhanced iMX SPI driver to be compiled as module
+- [LINUX] Added of backlight support for i.MXL
+- [LINUX] Added TSC2102 core and touchscreen drivers
+- [LINUX] Added support for isp1761 USB host controller
+- [LINUX] Added support for MCP2515 CAN bus controller (not activated by default)
+- [BUILDROOT] updated buildroot to revision 20321 (snapshot 20071027)
+- [BUILDROOT] libacl1 libacl1-dev host packages required
+- [BUILDROOT] Build g++ and shared lib as default
+- [BUILDROOT] Fixed uClibc compatility issues to support OpenSSH 
+                  thanks to Jean Michel
+- [BUILDROOT] Added Samba services smbmount, nmbd and smbd
+- [BUILDROOT] Added support for PrBoom
+- [BUILDROOT] Added SDL_mixer, SDL_net support
+- [BUILDROOT] Added support for LMbench (performance analysis tools)
+- [BUILDROOT] Added sound file playing capability to PWM driver
+- [BUILDROOT] Added support for Allegro (still needs to be static library)
+- [BUILDROOT] Added support for Lua package (thanks to Benoit)
+- [BUILDROOT] Added support for ipkg package with scripts and utilities
+                  Still needs Host part to build .ipk packages
+- [BUILDROOT] Added Tslib support with ts_test tool
+- [BUILDROOT] Preliminary integration of GPM package
+- [BUILDROOT] Preliminary integration of the Mesa package
+- [BUILDROOT] Added SDL-Water demo
+- [BUILDROOT] Added support for CH7024 (TV encoder)
+- [BUILDROOT] Added support for SDL Perigee Slideshow tool
+- [BUILDROOT] Added support for the max5821 DAC converter
+- [BUILDROOT] Build demos and examples by default in qtopia (but not installed)
+- [BUILDROOT] Preliminary integration of the ltp-testsuite package
+- [BUILDROOT] Preliminary support for libvorbis
+- [BUILDROOT] Hide original kernel menu - Armadeus defines its own kernel menu
+- [SOFTWARE] Added first (usable but buggy) version of Wolfenstein3D
+- [SOFTWARE] Added uboot_recover tool
+- [SOFTWARE] Added initial version of orchestra project builder
+- [FIRMWARE] Added led example for the FPGA (led_top.bin)
+- [FIRMWARE] Added 400k gates Spartan3 bitfile for PS/2 controller
+- [FIRMWARE] Added SRAM test VHDL code for the Devfull board
+- [FIRMWARE] Improved PS2 IP to be compatible with APF9328 board
+- [BUILD] Added buildauto target to main Makefile in order to setup automatic builds
+- [ROOTFS] Adding of /etc/fb.modes framebuffer config file (used by SDL for example)
+- [ROOTFS] Add Bash script to test MMC/SD cards performances
+- Fixed many bugs
+
+Changes in release 2.0 (7 February 2007)
+- upgrade u-boot bios to release 1.1.6
+- upgrade buildroot to the october, 30 2006 snapshot 
+- add support for the RTC DS1374 (under u-boot and linux)
+- new IMX SPI linux driver
+- add MAX1027 ADC linux driver
+- add IMX PWM linux driver
+- improve imx-i2c driver (bugs fixed)
+- change the name of the armadeus platform under u-boot to apx9328:
+      apm9328 and apf9328 compatible
+- add a Linux FPGA loader tool
+- add a Linux FPGAregs tool
+- support linux kernel 2.6.18.1
+- Add sysfs to fstab
+- Add support for several LCDs in linux (Sharp, Microtips)
+- improved DHCP usage with uBoot
+- Use new spartan3 u-boot driver
+- preliminary support for SDL
+
+
+Changes in release 1.6 (11 November 2006)
+- added linux kernels 2.6.17 and 2.6.18
+- added usb support add mmc support
+
+Changes in release 1.5 (15 July 2006)
+- building package for toolchain, u-boot, kernel and root-fs
+- First referenced released
+
+Sorry, no detailed ChangeLog available for previous releases
+

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-12-15 16:55:45 UTC (rev 733)
+++ trunk/Makefile	2007-12-15 17:29:27 UTC (rev 734)
@@ -1,6 +1,6 @@
 # Makefile for armadeus
 #
-# Copyright (C) 2005-2006 by <jo...@ar...>
+# Copyright (C) 2005-2007 by <jo...@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
@@ -65,12 +65,10 @@
 	@echo '  source                 - download all sources needed for offline-build'
 	@echo '  source-check           - check all packages for valid download URLs'
 	@echo
-	@echo 'Development:'
-	@echo '  buildroot-patch	- generate patch file for buildroot'
-	@echo '  sourceball		- create a distribution tarball'
+	@echo 'See www.armadeus.org for further armadeus details'
+	@echo 'See /buildroot/docs/README and /buildroot/docs/buildroot.html'
+	@echo '  for further buildroot details'
 	@echo
-	@echo 'See docs/README and docs/buildroot.html for further details'
-	@echo
 
 
 # configuration


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [733] trunk/buildroot/target/device/armadeus/u-boot/ 100-apx9328.patch

[<jo...@us...>]

Revision: 733
          http://armadeus.svn.sourceforge.net/armadeus/?rev=733&view=rev
Author:   jorasse
Date:     2007-12-15 08:55:45 -0800 (Sat, 15 Dec 2007)

Log Message:
-----------
[UBOOT] Release U-Boot 1.1.6 patch 2.6

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch

Modified: trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch	2007-12-15 16:43:35 UTC (rev 732)
+++ trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch	2007-12-15 16:55:45 UTC (rev 733)
@@ -1335,7 +1335,7 @@
 +#ifndef __CONFIG_H
 +#define __CONFIG_H
 +
-+#define CONFIG_IDENT_STRING	" apx9328 patch 2.5"
++#define CONFIG_IDENT_STRING	" apx9328 patch 2.6"
 +
 +#define CONFIG_ARM920T		1	/* this is an ARM920T CPU */
 +#define CONFIG_IMX		1	/* in a Motorola MC9328MXL Chip */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [732] trunk/patches/039-buildroot-kernelconfig.diff

[<jo...@us...>]

Revision: 732
          http://armadeus.svn.sourceforge.net/armadeus/?rev=732&view=rev
Author:   jorasse
Date:     2007-12-15 08:43:35 -0800 (Sat, 15 Dec 2007)

Log Message:
-----------
[BUILDROOT] Hide original kernel menu. Armadeus defines its own kernel menu

Added Paths:
-----------
    trunk/patches/039-buildroot-kernelconfig.diff

Added: trunk/patches/039-buildroot-kernelconfig.diff
===================================================================
--- trunk/patches/039-buildroot-kernelconfig.diff	                        (rev 0)
+++ trunk/patches/039-buildroot-kernelconfig.diff	2007-12-15 16:43:35 UTC (rev 732)
@@ -0,0 +1,57 @@
+--- buildroot.ori/target/Config.in	2007-12-14 22:12:46.000000000 +0100
++++ buildroot/target/Config.in	2007-12-15 17:36:39.000000000 +0100
+@@ -20,19 +20,19 @@
+ source "target/powerpc/yaboot/Config.in"
+ endmenu
+ 
+-menu "Kernel"
+-choice
+-	prompt "Kernel type"
+-	default BR2_KERNEL_LINUX_ADVANCED if BR2_TARGET_ATMEL
+-	default BR2_KERNEL_LINUX if !BR2_TARGET_ATMEL
++#menu "Kernel"
++#choice
++#	prompt "Kernel type"
++#	default BR2_KERNEL_LINUX_ADVANCED if BR2_TARGET_ATMEL
++#	default BR2_KERNEL_LINUX if !BR2_TARGET_ATMEL
+ 
+ config BR2_KERNEL_none
+-	bool "none"
++	bool
+ 	help
+ 	  Do not build a kernel
+ 
+ config BR2_KERNEL_LINUX_ADVANCED
+-	bool "linux (Advanced configuration)"
++	bool
+ 	select BR2_PACKAGE_LINUX
+ 	help
+ 	  The Linux kernel - Advanced Configuration.
+@@ -43,7 +43,7 @@
+ 	        kernels. This is a feature.
+ 
+ config BR2_KERNEL_LINUX
+-	bool "linux (Same version as linux headers)"
++	bool
+ 	select BR2_PACKAGE_LINUX
+ 	help
+ 	  The Linux kernel.
+@@ -54,10 +54,10 @@
+ 	        kernels. This is a feature.
+ 
+ config BR2_KERNEL_HURD
+-	bool "hurd"
++	bool
+ 	help
+ 	  GNU/Hurd kernel
+-endchoice
++#endchoice
+ 
+ config BR2_PACKAGE_LINUX
+ 	bool
+@@ -72,4 +72,4 @@
+ if BR2_KERNEL_HURD
+ source "target/hurd/Config.in"
+ endif
+-endmenu
++#endmenu


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [731] trunk/patches/038-buildroot-fakeroot.diff

[<jo...@us...>]

Revision: 731
          http://armadeus.svn.sourceforge.net/armadeus/?rev=731&view=rev
Author:   jorasse
Date:     2007-12-14 14:02:59 -0800 (Fri, 14 Dec 2007)

Log Message:
-----------
[BUILDROOT] Changed fakeroot 1.8.2 download server.
----This line, and those below, will be ignored--

A    patches/038-buildroot-fakeroot.diff

Added Paths:
-----------
    trunk/patches/038-buildroot-fakeroot.diff

Added: trunk/patches/038-buildroot-fakeroot.diff
===================================================================
--- trunk/patches/038-buildroot-fakeroot.diff	                        (rev 0)
+++ trunk/patches/038-buildroot-fakeroot.diff	2007-12-14 22:02:59 UTC (rev 731)
@@ -0,0 +1,12 @@
+diff -Naur buildroot.ori/package/fakeroot/fakeroot.mk buildroot/package/fakeroot/fakeroot.mk
+--- buildroot.ori/package/fakeroot/fakeroot.mk	2007-12-14 22:13:00.000000000 +0100
++++ buildroot/package/fakeroot/fakeroot.mk	2007-12-14 22:24:02.000000000 +0100
+@@ -5,7 +5,7 @@
+ #############################################################
+ FAKEROOT_VERSION:=1.8.2
+ FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
+-FAKEROOT_SITE:=http://ftp.debian.org/debian/pool/main/f/fakeroot
++FAKEROOT_SITE:=ftp://ftp2.armadeus.com/armadeus/download
+ FAKEROOT_CAT:=$(ZCAT)
+ FAKEROOT_SOURCE_DIR:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
+ FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-host


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.