[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-157-g292a884
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-157-g292a884
|
From: Julien B a. A. <ar...@us...> - 2010-12-06 14:20:49
|
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 292a8849deefbda6b2b4d4c54fee31c603ae3f21 (commit)
via feecac88d30b7315f2423656c21b655a780e490f (commit)
from ae37a1338709079ad182c6a5e254905a9d905510 (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 292a8849deefbda6b2b4d4c54fee31c603ae3f21
Merge: feecac88d30b7315f2423656c21b655a780e490f ae37a1338709079ad182c6a5e254905a9d905510
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 6 15:19:51 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit feecac88d30b7315f2423656c21b655a780e490f
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 6 15:19:27 2010 +0100
[TOOLS] imxregs: add support for i.MX51 (only CCM & GPT1 accesses are currently implemented)
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/imxregs/imxregs.mk | 10 +---
target/linux/debug/imxregs/Makefile | 8 ++-
target/linux/debug/imxregs/imx51regs.h | 75 +++++++++++++++++++++++++
target/linux/debug/imxregs/imxregs.c | 4 +-
4 files changed, 85 insertions(+), 12 deletions(-)
create mode 100644 target/linux/debug/imxregs/imx51regs.h
diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index a2137b2..0cabce1 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -9,15 +9,7 @@ IMXREGS_SOURCE:=$(TOPDIR)/../target/linux/debug/imxregs/
IMXREGS_DIR:=$(BUILD_DIR)/imxregs-$(IMXREGS_VER)
IMXREGS_CAT:=zcat
CPU_NAME=$(call qstrip,$(BR2_CPU_NAME))
-ifeq ($(CPU_NAME),imx27)
-IMXREGS_BINARY:=imx27regs
-else
- ifeq ($(CPU_NAME),imxl)
- IMXREGS_BINARY:=imxregs
- else
- IMXREGS_BINARY:=unknown_arch
- endif
-endif
+IMXREGS_BINARY:=$(CPU_NAME)regs
IMXREGS_TARGET_BINARY:=usr/bin/imxregs
$(IMXREGS_DIR)/imxregs.c:
diff --git a/target/linux/debug/imxregs/Makefile b/target/linux/debug/imxregs/Makefile
index 5ca78a1..ede99ad 100644
--- a/target/linux/debug/imxregs/Makefile
+++ b/target/linux/debug/imxregs/Makefile
@@ -1,7 +1,8 @@
CC=arm-linux-gcc
+EXECS:= imxregs imx27regs imx51regs
-all: imxregs imx27regs
+all: $(EXECS)
imxregs: imxregs.c imxregs.h definitions.h
$(CC) imxregs.c -o $@
@@ -9,6 +10,9 @@ imxregs: imxregs.c imxregs.h definitions.h
imx27regs: imxregs.c imx27regs.h definitions.h
$(CC) -DIMX27 imxregs.c -o $@
+imx51regs: imxregs.c imx51regs.h definitions.h
+ $(CC) -DIMX51 imxregs.c -o $@
+
clean:
rm -f *.o
- rm -f imxregs imx27regs
+ rm -f $(EXECS)
diff --git a/target/linux/debug/imxregs/imx51regs.h b/target/linux/debug/imxregs/imx51regs.h
new file mode 100644
index 0000000..c085f1a
--- /dev/null
+++ b/target/linux/debug/imxregs/imx51regs.h
@@ -0,0 +1,75 @@
+/*
+ * imx51regs.h - i.MX51 registers definition
+ *
+ * Copyright (C) 2010 armadeus systems
+ * Derivated from pxaregs (c) Copyright 2002 by M&N Logistik-Loesungen Online GmbH
+ * Author: Julien Boibessot
+ *
+ * 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.
+ *
+ */
+
+#include "definitions.h"
+
+#define IMX_TYPE "i.MX51"
+
+static struct reg_info regs[] =
+{
+/* CCM */
+{ "CCR", 0x73fd4000, 0, 0xffffffff, 'x', "CCM Control Register" },
+{ "CCDR", 0x73fd4004, 0, 0xffffffff, 'x', "CCM Control Divider Register" },
+{ "CSR", 0x73fd4008, 0, 0xffffffff, 'x', "CCM Status Register" },
+{ "CCSR", 0x73fd400c, 0, 0xffffffff, 'x', "CCM Clock Switcher Register" },
+{ "CACRR", 0x73fd4010, 0, 0xffffffff, 'x', "CCM Arm Clock Root Register" },
+{ "CBCDR", 0x73fd4014, 0, 0xffffffff, 'x', "CCM Bus Clock Divider Register" },
+{ "CBCMR", 0x73fd4018, 0, 0xffffffff, 'x', "CCM Bus Clock Multiplexer Register" },
+{ "CSCMR1", 0x73fd401c, 0, 0xffffffff, 'x', "CCM Serial Clock Multiplexer Register 1" },
+{ "CSCMR2", 0x73fd4020, 0, 0xffffffff, 'x', "CCM Serial Clock Multiplexer Register 2" },
+{ "CSCDR1", 0x73fd4024, 0, 0xffffffff, 'x', "CCM Serial Clock Divider Register" },
+{ "CS1CDR", 0x73fd4028, 0, 0xffffffff, 'x', "CCM SSI1 Clock Divider Register" },
+{ "CS2CDR", 0x73fd402c, 0, 0xffffffff, 'x', "CCM SSI2 Clock Divider Register" },
+{ "CDCDR", 0x73fd4030, 0, 0xffffffff, 'x', "CCM DI Clock Divider Register" },
+{ "CSCDR2", 0x73fd4038, 0, 0xffffffff, 'x', "CCM Serial Clock Divider Register" },
+{ "CSCDR3", 0x73fd403c, 0, 0xffffffff, 'x', "CCM Serial Clock Divider Register" },
+{ "CSCDR4", 0x73fd4040, 0, 0xffffffff, 'x', "CCM Serial Clock Divider Register" },
+{ "CWDR", 0x73fd4044, 0, 0xffffffff, 'x', "CCM Wakeup Detector Register" },
+{ "CDHIPR", 0x73fd4048, 0, 0xffffffff, 'x', "CCM Divider Handshake In-Process Register" },
+{ "CDCR", 0x73fd404c, 0, 0xffffffff, 'x', "CCM DVFS Control Register" },
+{ "CTOR", 0x73fd4050, 0, 0xffffffff, 'x', "CCM Testing Observability Register" },
+{ "CLPCR", 0x73fd4054, 0, 0xffffffff, 'x', "CCM Low Power Control Register" },
+{ "CISR", 0x73fd4058, 0, 0xffffffff, 'x', "CCM Interrupt Status Register" },
+{ "CIMR", 0x73fd405c, 0, 0xffffffff, 'x', "CCM Interrupt Mask Register" },
+{ "CCOSR", 0x73fd4060, 0, 0xffffffff, 'x', "CCM Clock Output Source Register" },
+{ "CGPR", 0x73fd4064, 0, 0xffffffff, 'x', "CCM General Purpose Register" },
+{ "CCGR0", 0x73fd4068, 0, 0xffffffff, 'x', "CCM Clock Gating Register 0" },
+{ "CCGR1", 0x73fd406c, 0, 0xffffffff, 'x', "CCM Clock Gating Register 1" },
+{ "CCGR2", 0x73fd4070, 0, 0xffffffff, 'x', "CCM Clock Gating Register 2" },
+{ "CCGR3", 0x73fd4074, 0, 0xffffffff, 'x', "CCM Clock Gating Register 3" },
+{ "CCGR4", 0x73fd4078, 0, 0xffffffff, 'x', "CCM Clock Gating Register 4" },
+{ "CCGR5", 0x73fd407c, 0, 0xffffffff, 'x', "CCM Clock Gating Register 5" },
+{ "CCGR6", 0x73fd4080, 0, 0xffffffff, 'x', "CCM Clock Gating Register 6" },
+{ "CMEOR", 0x73fd4084, 0, 0xffffffff, 'x', "CCM Module Enable Override Register" },
+/* GPT */
+{ "GPTCR_1", 0x73fa0000, 0, 0xffffffff, 'x', "GPT1 Control Register" },
+{ "GPTPR_1", 0x73fa0004, 0, 0xffffffff, 'x', "GPT1 Prescaler Register" },
+{ "GPTSR_1", 0x73fa0008, 0, 0xffffffff, 'x', "GPT1 Status Register" },
+{ "GPTIR_1", 0x73fa000c, 0, 0xffffffff, 'x', "GPT1 Interrupt Register" },
+{ "GPTOCR1_1", 0x73fa0010, 0, 0xffffffff, 'x', "GPT1 Output Compare Register 1" },
+{ "GPTOCR2_1", 0x73fa0014, 0, 0xffffffff, 'x', "GPT1 Output Compare Register 2" },
+{ "GPTOCR3_1", 0x73fa0018, 0, 0xffffffff, 'x', "GPT1 Output Compare Register 3" },
+{ "GPTICR1_1", 0x73fa001c, 0, 0xffffffff, 'x', "GPT1 Input capture Register 1" },
+{ "GPTICR2_1", 0x73fa0020, 0, 0xffffffff, 'x', "GPT1 Input capture Register 2" },
+{ "GPTCNT_1", 0x73fa0024, 0, 0xffffffff, 'x', "GPT1 Counter Register" },
+};
diff --git a/target/linux/debug/imxregs/imxregs.c b/target/linux/debug/imxregs/imxregs.c
index 659df83..dedcf87 100644
--- a/target/linux/debug/imxregs/imxregs.c
+++ b/target/linux/debug/imxregs/imxregs.c
@@ -31,8 +31,10 @@
#include <fcntl.h>
#include <ctype.h>
-#ifdef IMX27
+#if defined(IMX27)
#include "imx27regs.h"
+#elif defined(IMX51)
+#include "imx51regs.h"
#else
#include "imxregs.h"
#endif
hooks/post-receive
--
armadeus
|
