projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-imx
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
mp.h
diff --git
a/arch/powerpc/cpu/mpc85xx/mp.h
b/arch/powerpc/cpu/mpc85xx/mp.h
index 87bac3715268df45949dc892f68d610450c1e17d..ad9950bcf590d2071a4c280273c3e831488ca1d7 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/mp.h
+++ b/
arch/powerpc/cpu/mpc85xx/mp.h
@@
-3,8
+3,7
@@
#include <asm/mp.h>
#include <asm/mp.h>
-ulong get_spin_phys_addr(void);
-ulong get_spin_virt_addr(void);
+phys_addr_t get_spin_phys_addr(void);
u32 get_my_id(void);
int hold_cores_in_reset(int verbose);
u32 get_my_id(void);
int hold_cores_in_reset(int verbose);
@@
-16,7
+15,7
@@
int hold_cores_in_reset(int verbose);
#define BOOT_ENTRY_PIR 5
#define BOOT_ENTRY_R6_UPPER 6
#define BOOT_ENTRY_R6_LOWER 7
#define BOOT_ENTRY_PIR 5
#define BOOT_ENTRY_R6_UPPER 6
#define BOOT_ENTRY_R6_LOWER 7
-#define NUM_BOOT_ENTRY
8
+#define NUM_BOOT_ENTRY
16 /* pad to 64 bytes */
#define SIZE_BOOT_ENTRY (NUM_BOOT_ENTRY * sizeof(u32))
#endif
#define SIZE_BOOT_ENTRY (NUM_BOOT_ENTRY * sizeof(u32))
#endif