[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-122-gd6aae9b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-122-gd6aae9b
|
From: Julien B a. A. <ar...@us...> - 2011-05-05 14:50:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d6aae9b8b28aae76dfc16b373c108e5b44eb2ee7 (commit)
from 4ecb820b831ad1aa26b0bbac6c214c578f19ab3f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d6aae9b8b28aae76dfc16b373c108e5b44eb2ee7
Author: Julien Boibessot <jul...@ar...>
Date: Thu May 5 16:49:38 2011 +0200
[DEBUG] Makes fpgaregs tool work also on APF51
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/fpgaregs/fpgaregs.mk | 8 ++++-
target/linux/debug/fpgaregs/Makefile | 10 +++++--
target/linux/debug/fpgaregs/fpga27regs.h | 22 -----------------
target/linux/debug/fpgaregs/fpgaregs.c | 29 +++++++++-------------
target/linux/debug/fpgaregs/fpgaregs.h | 23 ------------------
5 files changed, 25 insertions(+), 67 deletions(-)
delete mode 100644 target/linux/debug/fpgaregs/fpga27regs.h
delete mode 100644 target/linux/debug/fpgaregs/fpgaregs.h
diff --git a/buildroot/package/armadeus/fpgaregs/fpgaregs.mk b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
index b10800b..80696d5 100644
--- a/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
+++ b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
@@ -4,14 +4,18 @@
#
#############################################################
-FPGAREGS_VER:=1.0
+FPGAREGS_VER:=1.1
FPGAREGS_SOURCE:=$(TOPDIR)/../target/linux/debug/fpgaregs/
FPGAREGS_DIR:=$(BUILD_DIR)/fpgaregs-$(FPGAREGS_VER)
FPGAREGS_CAT:=zcat
ifeq ($(BR2_CPU_NAME),"imx27")
FPGAREGS_BINARY:=fpga27regs
else
-FPGAREGS_BINARY:=fpgaregs
+ ifeq ($(BR2_CPU_NAME),"imx51")
+ FPGAREGS_BINARY:=fpga51regs
+ else
+ FPGAREGS_BINARY:=fpgaregs
+ endif
endif
FPGAREGS_TARGET_BINARY:=usr/bin/fpgaregs
diff --git a/target/linux/debug/fpgaregs/Makefile b/target/linux/debug/fpgaregs/Makefile
index f8a522d..ecff1f4 100644
--- a/target/linux/debug/fpgaregs/Makefile
+++ b/target/linux/debug/fpgaregs/Makefile
@@ -2,15 +2,19 @@ ifeq ($(CC),cc)
CC=arm-linux-gcc
endif
-all: fpgaregs fpga27regs
+all: fpgaregs fpga27regs fpga51regs
-fpgaregs: fpgaregs.c fpgaregs.h
+fpgaregs: fpgaregs.c
$(CC) -Wall fpgaregs.c -o $@
-fpga27regs: fpgaregs.c fpga27regs.h
+fpga27regs: fpgaregs.c
$(CC) -DIMX27 -Wall fpgaregs.c -o $@
+fpga51regs: fpgaregs.c
+ $(CC) -DIMX51 -Wall fpgaregs.c -o $@
+
clean:
rm -f *.o
rm -f fpgaregs
rm -f fpga27regs
+ rm -f fpga51regs
diff --git a/target/linux/debug/fpgaregs/fpga27regs.h b/target/linux/debug/fpgaregs/fpga27regs.h
deleted file mode 100644
index 4f52d34..0000000
--- a/target/linux/debug/fpgaregs/fpga27regs.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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 PLATFORM "APF27"
-#define FPGA_ADDRESS 0xD6000000
diff --git a/target/linux/debug/fpgaregs/fpgaregs.c b/target/linux/debug/fpgaregs/fpgaregs.c
index d2fb585..21ee393 100644
--- a/target/linux/debug/fpgaregs/fpgaregs.c
+++ b/target/linux/debug/fpgaregs/fpgaregs.c
@@ -3,7 +3,7 @@
* fpgaregs.c
* a program to write/read 16/32 bits values on FPGA address map using mmap()
*
- * (c) Copyright 2008 Armadeus project
+ * (c) Copyright 2008-2011 The Armadeus Project - ARMadeus Systems
* Fabien Marteau <fab...@ar...>
* Modified by Sebastien Van Cauwenberghe <sv...@gm...>
*
@@ -24,27 +24,22 @@
#include <stdio.h>
#include <stdlib.h>
-
-/* file management */
-#include <sys/stat.h>
+#include <sys/stat.h> /* file management */
#include <fcntl.h>
-
-/* as name said */
#include <signal.h>
-
-/* sleep, write(), read() */
-#include <unistd.h>
-
-/* converting string */
-#include <string.h>
-
-/* memory management */
-#include <sys/mman.h>
+#include <unistd.h> /* sleep, write(), read() */
+#include <string.h> /* converting string */
+#include <sys/mman.h> /* memory management */
#ifdef IMX27
-# include "fpga27regs.h"
+# define PLATFORM "APF27"
+# define FPGA_ADDRESS 0xD6000000
+#elif IMX51
+# define PLATFORM "APF51"
+# define FPGA_ADDRESS 0xB8000000
#else
-# include "fpgaregs.h"
+# define PLATFORM "APF9328"
+# define FPGA_ADDRESS 0x12000000
#endif
#define WORD_ACCESS (2)
diff --git a/target/linux/debug/fpgaregs/fpgaregs.h b/target/linux/debug/fpgaregs/fpgaregs.h
deleted file mode 100644
index 84c558e..0000000
--- a/target/linux/debug/fpgaregs/fpgaregs.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 PLATFORM "APF9328"
-#define FPGA_ADDRESS 0x12000000
-
hooks/post-receive
--
armadeus
|
