summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-06-11 21:23:16 +0200
committerWolfgang Denk <wd@denx.de>2008-06-11 21:23:16 +0200
commit3c6e979a94c91e0e7f28356622c79784b621cbde (patch)
treeed43142a59e8d7b102f1788dd48c6103cb407a1b /cpu
parent338cc038461a6c7709c5b86fd9a240209338a1ae (diff)
parent279726bd00558e80263d44581c44167625b7fb9a (diff)
downloadu-boot-imx-3c6e979a94c91e0e7f28356622c79784b621cbde.zip
u-boot-imx-3c6e979a94c91e0e7f28356622c79784b621cbde.tar.gz
u-boot-imx-3c6e979a94c91e0e7f28356622c79784b621cbde.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc86xx/traps.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/cpu/mpc86xx/traps.c b/cpu/mpc86xx/traps.c
index 04c2e13..5695c3e 100644
--- a/cpu/mpc86xx/traps.c
+++ b/cpu/mpc86xx/traps.c
@@ -43,7 +43,13 @@ int (*debugger_exception_handler)(struct pt_regs *) = 0;
/* Returns 0 if exception not found and fixup otherwise. */
extern unsigned long search_exception_table(unsigned long);
-#define END_OF_MEM (gd->bd->bi_memstart + gd->bd->bi_memsize)
+/*
+ * End of addressable memory. This may be less than the actual
+ * amount of memory on the system if we're unable to keep all
+ * the memory mapped in.
+ */
+extern ulong get_effective_memsize(void);
+#define END_OF_MEM (gd->bd->bi_memstart + get_effective_memsize())
/*
* Trap & Exception support