[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.