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

[<Fa...@us...>]

Revision: 1217
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1217&view=rev
Author:   FabM
Date:     2009-04-14 11:05:23 +0000 (Tue, 14 Apr 2009)

Log Message:
-----------
[BUILDROOT] fpgaregs now work for apf27

Modified Paths:
--------------
    trunk/buildroot/package/fpgaregs/fpgaregs.mk
    trunk/target/linux/debug/fpgaregs/Makefile
    trunk/target/linux/debug/fpgaregs/fpgaregs.c

Added Paths:
-----------
    trunk/target/linux/debug/fpgaregs/fpga27regs.h
    trunk/target/linux/debug/fpgaregs/fpgaregs.h

Modified: trunk/buildroot/package/fpgaregs/fpgaregs.mk
===================================================================
--- trunk/buildroot/package/fpgaregs/fpgaregs.mk	2009-04-14 09:10:34 UTC (rev 1216)
+++ trunk/buildroot/package/fpgaregs/fpgaregs.mk	2009-04-14 11:05:23 UTC (rev 1217)
@@ -9,6 +9,11 @@
 FPGAREGS_DIR:=$(BUILD_DIR)/fpgaregs-$(FPGAREGS_VER)
 FPGAREGS_CAT:=zcat
 FPGAREGS_BINARY:=fpgaregs
+ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
+IMXREGS_BINARY:=fpga27regs
+else
+IMXREGS_BINARY:=fpgaregs
+endif
 FPGAREGS_TARGET_BINARY:=usr/bin/fpgaregs
 
 $(FPGAREGS_DIR)/fpgaregs.c:

Modified: trunk/target/linux/debug/fpgaregs/Makefile
===================================================================
--- trunk/target/linux/debug/fpgaregs/Makefile	2009-04-14 09:10:34 UTC (rev 1216)
+++ trunk/target/linux/debug/fpgaregs/Makefile	2009-04-14 11:05:23 UTC (rev 1217)
@@ -2,11 +2,13 @@
         CC=arm-linux-gcc
 endif
 
-
 all: fpgaregs
 
-fpgaregs: fpgaregs.c
-	$(CC) -mcpu=arm920t -Wall fpgaregs.c -o $@
+fpgaregs: fpgaregs.c fpgaregs.h 
+	$(CC) -Wall fpgaregs.c -o $@
+
+fpgaregs: fpgaregs.c fpga27regs.h
+	$(CC) -DIMX27 -Wall fpgaregs.c -o $@
     
 clean:
 	rm -f *.o

Added: trunk/target/linux/debug/fpgaregs/fpga27regs.h
===================================================================
--- trunk/target/linux/debug/fpgaregs/fpga27regs.h	                        (rev 0)
+++ trunk/target/linux/debug/fpgaregs/fpga27regs.h	2009-04-14 11:05:23 UTC (rev 1217)
@@ -0,0 +1,23 @@
+/*
+ * definitions.h - imxregs common definitions
+ *
+ * Copyright (C) 2008 armadeus systems
+ * Author: Fabien Marteau <fab...@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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#define FPGA_ADDRESS 0xD6000000

Modified: trunk/target/linux/debug/fpgaregs/fpgaregs.c
===================================================================
--- trunk/target/linux/debug/fpgaregs/fpgaregs.c	2009-04-14 09:10:34 UTC (rev 1216)
+++ trunk/target/linux/debug/fpgaregs/fpgaregs.c	2009-04-14 11:05:23 UTC (rev 1217)
@@ -44,7 +44,11 @@
 /* memory management */
 #include <sys/mman.h>
 
-#define FPGA_ADDRESS 0x12000000
+#ifdef IMX27
+#	include "fpga27regs.h"
+#else
+#	include "fpgaregs.h"
+#endif
 
 #define WORD_ACCESS (2)
 #define LONG_ACCESS (4)

Added: trunk/target/linux/debug/fpgaregs/fpgaregs.h
===================================================================
--- trunk/target/linux/debug/fpgaregs/fpgaregs.h	                        (rev 0)
+++ trunk/target/linux/debug/fpgaregs/fpgaregs.h	2009-04-14 11:05:23 UTC (rev 1217)
@@ -0,0 +1,24 @@
+/*
+ * definitions.h - imxregs common definitions
+ *
+ * Copyright (C) 2008 armadeus systems
+ * Author: Fabien Marteau <fab...@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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#define FPGA_ADDRESS 0x12000000
+


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