Merge with /home/wd/git/u-boot/custodian/u-boot-fdt

[platform/kernel/u-boot.git] / cpu / mpc86xx / cpu.c

diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c
index ddd0ad3..84f5bef 100644 (file)
--- a/cpu/mpc86xx/cpu.c
+++ b/cpu/mpc86xx/cpu.c
@@ -32,12 +32,6 @@
 #include <ft_build.h>
 #endif
 
-#ifdef CONFIG_MPC8641HPCN
-extern void mpc8641_reset_board(cmd_tbl_t *cmdtp, int flag,
-                               int argc, char *argv[]);
-#endif
-
-
 int
 checkcpu(void)
 {
@@ -76,11 +70,12 @@ checkcpu(void)
        puts("    System: ");
        switch (ver) {
        case SVR_8641:
-               puts("8641");
-               break;
-       case SVR_8641D:
+           if (SVR_SUBVER(svr) == 1) {
                puts("8641D");
-               break;
+           } else {
+               puts("8641");
+           }
+           break;
        default:
                puts("Unknown");
                break;
@@ -184,7 +179,7 @@ do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 #else /* CONFIG_MPC8641HPCN */
 
-       mpc8641_reset_board(cmdtp, flag, argc, argv);
+       out8(PIXIS_BASE + PIXIS_RST, 0);
 
 #endif /* !CONFIG_MPC8641HPCN */