summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-03-12 12:23:02 +0100
committerMarian Balakowicz <m8@semihalf.com>2008-03-12 12:23:02 +0100
commit7e492d8258182e31c988bbf9917d4a3d41949d56 (patch)
treee9c9db79d797cf487107c019537c6bb00b854c6c /common
parentafe45c87e3c5d77bad76b1a57dccd20764d45b5d (diff)
parent30f1806f60978d707b0cff2d7bf89d141fc24290 (diff)
downloadu-boot-imx-7e492d8258182e31c988bbf9917d4a3d41949d56.zip
u-boot-imx-7e492d8258182e31c988bbf9917d4a3d41949d56.tar.gz
u-boot-imx-7e492d8258182e31c988bbf9917d4a3d41949d56.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot into new-image
Diffstat (limited to 'common')
-rw-r--r--common/cmd_mem.c2
-rw-r--r--common/kgdb.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index ed91f27..4262e26 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -417,7 +417,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/* check if we are copying to Flash */
if ( (addr2info(dest) != NULL)
#ifdef CONFIG_HAS_DATAFLASH
- && (!addr_dataflash(addr))
+ && (!addr_dataflash(dest))
#endif
) {
int rc;
diff --git a/common/kgdb.c b/common/kgdb.c
index 1d34669..b14898b 100644
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -107,7 +107,7 @@ static char remcomRegBuffer[BUFMAX];
static int initialized = 0;
static int kgdb_active = 0, first_entry = 1;
static struct pt_regs entry_regs;
-static u_int error_jmp_buf[BUFMAX/2];
+static long error_jmp_buf[BUFMAX/2];
static int longjmp_on_fault = 0;
#ifdef KGDB_DEBUG
static int kdebug = 1;
@@ -310,7 +310,7 @@ handle_exception (struct pt_regs *regs)
/* probably should check which exception occured as well */
if (longjmp_on_fault) {
longjmp_on_fault = 0;
- kgdb_longjmp((long*)error_jmp_buf, KGDBERR_MEMFAULT);
+ kgdb_longjmp(error_jmp_buf, KGDBERR_MEMFAULT);
panic("kgdb longjump failed!\n");
}
@@ -324,7 +324,7 @@ handle_exception (struct pt_regs *regs)
printf("kgdb: handle_exception; trap [0x%x]\n", kgdb_trap(regs));
- if (kgdb_setjmp((long*)error_jmp_buf) != 0)
+ if (kgdb_setjmp(error_jmp_buf) != 0)
panic("kgdb: error or fault in entry init!\n");
kgdb_enter(regs, &kd);
@@ -379,7 +379,7 @@ handle_exception (struct pt_regs *regs)
printf("kgdb: remcomInBuffer: %s\n", remcomInBuffer);
#endif
- errnum = kgdb_setjmp((long*)error_jmp_buf);
+ errnum = kgdb_setjmp(error_jmp_buf);
if (errnum == 0) switch (remcomInBuffer[0]) {
@@ -532,7 +532,7 @@ void
kgdb_error(int errnum)
{
longjmp_on_fault = 0;
- kgdb_longjmp((long*)error_jmp_buf, errnum);
+ kgdb_longjmp(error_jmp_buf, errnum);
panic("kgdb_error: longjmp failed!\n");
}