powerpc: mpc8xx: make get_immr() independent of CONFIG_8xx

[u-boot] / arch / powerpc / include / asm / ppc.h

diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index e11f39801e552aa000075f4bebe9f991eb2273e6..6ba10974b6d2d86b06f1a2fb697bc1d56bf106c6 100644 (file)
--- a/arch/powerpc/include/asm/ppc.h
+++ b/arch/powerpc/include/asm/ppc.h
@@ -40,22 +40,22 @@
 
 #include <asm/processor.h>
 
-#if defined(CONFIG_8xx)
 static inline uint get_immr(uint mask)
 {
        uint immr = mfspr(SPRN_IMMR);
 
        return mask ? (immr & mask) : immr;
 }
-#endif
-uint get_pvr(void);
-uint get_svr(void);
-uint rd_ic_cst(void);
-void wr_ic_cst(uint);
-void wr_ic_adr(uint);
-uint rd_dc_cst(void);
-void wr_dc_cst(uint);
-void wr_dc_adr(uint);
+
+static inline uint get_pvr(void)
+{
+       return mfspr(PVR);
+}
+
+static inline uint get_svr(void)
+{
+       return mfspr(SVR);
+}
 
 #if defined(CONFIG_MPC85xx)    || \
        defined(CONFIG_MPC86xx) || \
@@ -121,6 +121,10 @@ static inline void set_msr(unsigned long msr)
 void print_reginfo(void);
 #endif
 
+void interrupt_init_cpu(unsigned *);
+void timer_interrupt_cpu(struct pt_regs *);
+unsigned long search_exception_table(unsigned long addr);
+
 #endif /* !__ASSEMBLY__ */
 
 #ifdef CONFIG_PPC