[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-264-g358c480
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-264-g358c480
|
From: Julien B a. A. <ar...@us...> - 2017-04-03 16:11:16
|
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 358c480539aac1c52f382eb013aa7ea0ab573bb7 (commit)
via 8edaba6e8e02e61c7f2423bc19b669cb37689b85 (commit)
from 67a633f54d594586472eb31c97308f7ff0b1c208 (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 358c480539aac1c52f382eb013aa7ea0ab573bb7
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Apr 3 18:11:00 2017 +0200
[BUILD] Add OPOS6UL support to test_imxregs.sh
commit 8edaba6e8e02e61c7f2423bc19b669cb37689b85
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Apr 3 18:08:49 2017 +0200
[DEBUG] imxregs: fixes bug when writing to registers (with glibc scanf() ??)
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/imxregs/imxregs.mk | 2 +-
target/linux/debug/imxregs/imx6ulregs.h | 1 +
target/linux/debug/imxregs/imxregs.c | 17 +++++++++--------
target/test/packages/test_imxregs.sh | 5 +++--
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index bd43452..ea7643b 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -4,7 +4,7 @@
#
#############################################################
-IMXREGS_VERSION = 2016.09
+IMXREGS_VERSION = 2017.04
IMXREGS_SITE = $(TOPDIR)/../target/linux/debug/imxregs
IMXREGS_SITE_METHOD = local
IMXREGS_LICENSE = GPLv2+
diff --git a/target/linux/debug/imxregs/imx6ulregs.h b/target/linux/debug/imxregs/imx6ulregs.h
index 0271b39..fe17f80 100644
--- a/target/linux/debug/imxregs/imx6ulregs.h
+++ b/target/linux/debug/imxregs/imx6ulregs.h
@@ -47,4 +47,5 @@ static struct reg_info regs[] =
{ "LCDIF_TRANSFER_COUNT", 0x021c8030, 0, 0xffffffff, 'x', "eLCDIF Horizontal and Vertical Count Register" },
{ "LCDIF_CUR_BUF", 0x021c8040, 0, 0xffffffff, 'x', "eLCDIF Current Buffer Address Register" },
{ "LCDIF_NEXT_BUF", 0x021c8050, 0, 0xffffffff, 'x', "eLCDIF Next Buffer Address Register" },
+{ "LCDIF_VERSION", 0x021c81c0, 0, 0xffffffff, 'x', "eLCDIF Interface Version Register" },
};
diff --git a/target/linux/debug/imxregs/imxregs.c b/target/linux/debug/imxregs/imxregs.c
index 5cdff2f..6d614b0 100644
--- a/target/linux/debug/imxregs/imxregs.c
+++ b/target/linux/debug/imxregs/imxregs.c
@@ -45,7 +45,7 @@
#include "imxregs.h"
#endif
-#define VERSION "2017.01"
+#define VERSION "2017.04"
/*#define DEBUG TRUE*/
#ifdef DEBUG
@@ -110,7 +110,7 @@ static void putmem(u32 addr, u32 val)
perror("mmap()");
exit(1);
}
- printf("Replaced content: 0x%08x\n", regaddr);
+ printf("Wrote 0x%08x at 0x%08x (virt: 0x%08x).\n", val, addr, regaddr);
regaddr = map + (addr & MAP_MASK);
*(u32 *) regaddr = val;
@@ -226,12 +226,13 @@ static void setreg(char *name, u32 val)
mem = getmem(regs[found].addr);
debug("Old contents: 0x%08x\n", mem);
mem &= ~(regs[found].mask << regs[found].shift);
- debug("Unmasked contents: 0x%08x\n", mem);
+ debug("Unmasked old contents: 0x%08x\n", mem);
+ debug("New val: 0x%08x\n", val);
+ debug("Mask: 0x%08x\n", regs[found].mask);
val &= regs[found].mask;
- debug("mask: 0x%08x\n", regs[found].mask);
- debug("masked val: 0x%08x\n", val);
+ debug("Masked val: 0x%08x\n", val);
mem |= val << regs[found].shift;
- debug("Embedded value: 0x%08x\n", mem);
+ debug("Value that will be writen: 0x%08x\n", mem);
putmem(regs[found].addr, mem);
}
@@ -240,7 +241,7 @@ void usage(char *name)
printf("%s for %s CPU (version %s)\n"
"Usage: %s - to dump all known registers\n"
" %s <name> - to dump named register\n"
- " %s <name> <value> - to set named register\n",
+ " %s <name> <value> - to set named register to value (in hex format)\n",
name, IMX_TYPE, VERSION, name, name, name);
}
@@ -277,7 +278,7 @@ int main(int argc, char *argv[])
/* Put value to given register */
if (argc == 3) {
- sscanf(argv[2], "%i", &val);
+ val = strtoul(argv[2], 0, 16);
setreg(argv[1], val);
return 0;
}
diff --git a/target/test/packages/test_imxregs.sh b/target/test/packages/test_imxregs.sh
index e4cee38..790e079 100755
--- a/target/test/packages/test_imxregs.sh
+++ b/target/test/packages/test_imxregs.sh
@@ -37,9 +37,11 @@ set_ids()
elif [ "$1" == "APF6" ]; then
ID_REG="PMU_MISC2"
ID_VAL="0x00676767"
+ elif [ "$1" == "OPOS6UL" ]; then
+ ID_REG="LCDIF_VERSION"
+ ID_VAL="0x04000000"
fi
echo "$APF"
-
}
test_imxregs()
@@ -61,4 +63,3 @@ test_imxregs()
}
test_imxregs
-
hooks/post-receive
--
armadeus
|