common: Move upmconfig() to ppc.h

This file is only used by PowerPC so move it to an arch-specific header
file.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index 5765f6b522309aa23f6b0a50980b8efd9cd3ad9f..055364c58fd94ab8b47e1e6c2778f43c0f40587c 100644 (file)
--- a/arch/powerpc/include/asm/ppc.h
+++ b/arch/powerpc/include/asm/ppc.h
@@ -121,6 +121,7 @@ void print_reginfo(void);
 void interrupt_init_cpu(unsigned *);
 void timer_interrupt_cpu(struct pt_regs *);
 unsigned long search_exception_table(unsigned long addr);
+void upmconfig(uint upm, uint *table, uint size);
 
 #endif /* !__ASSEMBLY__ */
 

diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 5f58b4c21bd6c1acec6c4a94fc030e9babda88b1..f1dec6c6fae0a53988fb55c8e4e702c3d325733d 100644 (file)
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -165,11 +165,11 @@ void local_bus_init (void)
 
        /* Init UPMA for FPGA access */
        out_be32 (&lbc->mamr, 0x44440); /* Use a customer-supplied value */
-       upmconfig (UPMA, (uint *)UPMTableA, sizeof(UPMTableA)/sizeof(int));
+       upmconfig(UPMA, (uint *)UPMTableA, sizeof(UPMTableA) / sizeof(int));
 
        /* Init UPMB for Lime controller access */
        out_be32 (&lbc->mbmr, 0x444440); /* Use a customer-supplied value */
-       upmconfig (UPMB, (uint *)UPMTableB, sizeof(UPMTableB)/sizeof(int));
+       upmconfig(UPMB, (uint *)UPMTableB, sizeof(UPMTableB) / sizeof(int));
 }
 
 #ifdef CONFIG_BOARD_EARLY_INIT_R

diff --git a/include/common.h b/include/common.h
index a971f75f8bccc1dde5d4e63f0e115058a70f8440..1f87070d49213f2f974227ff3e0332d3a3b30d4f 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -74,7 +74,6 @@ phys_size_t get_effective_memsize(void);
 int testdram(void);
 #endif /* CONFIG_SYS_DRAM_TEST */
 
-void   upmconfig     (unsigned int, unsigned int *, unsigned int);
 ulong  get_tbclk     (void);
 void   reset_misc    (void);
 void   reset_cpu     (ulong addr);