summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-02-15 00:26:52 +0100
committerWolfgang Denk <wd@denx.de>2008-02-15 00:26:52 +0100
commit9e04a8138892d64848dc6e8e74213086d9190d9a (patch)
tree1740a361891d2390631ec053f1bc42e524913b78 /common
parent32c70d3420739930165271d9a1b04572adf799fd (diff)
parent746c4b9490495dc4381dbcc49f40078d423e0a48 (diff)
downloadu-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.zip
u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.tar.gz
u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Conflicts: common/cmd_reginfo.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_reginfo.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/common/cmd_reginfo.c b/common/cmd_reginfo.c
index 980664d..dd808ed 100644
--- a/common/cmd_reginfo.c
+++ b/common/cmd_reginfo.c
@@ -31,6 +31,8 @@
#include <mpc5xx.h>
#elif defined (CONFIG_MPC5200)
#include <mpc5xxx.h>
+#elif defined (CONFIG_MPC86xx)
+extern void mpc86xx_reginfo(void);
#endif
int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -329,6 +331,8 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
*(volatile ulong*)MPC5XXX_SDRAM_CS0CFG);
printf ("\tSDRAMCS1: %08X\n",
*(volatile ulong*)MPC5XXX_SDRAM_CS1CFG);
+#elif defined(CONFIG_MPC86xx)
+ mpc86xx_reginfo();
#elif defined(CONFIG_BLACKFIN)
puts("\nSystem Configuration registers\n");
@@ -369,7 +373,8 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
bfin_read_EBIU_SDSTAT(), bfin_read_EBIU_SDGCTL());
# endif
-#endif /* CONFIG_MPC5200 */
+#endif /* CONFIG_BLACKFIN */
+
return 0;
}