[PATCH 20/35] common: Move upmconfig() to ppc.h
Simon Glass
sjg at chromium.org
Thu Dec 12 01:47:39 CET 2019
This file is only used by PowerPC so move it to an arch-specific header
file.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
arch/powerpc/include/asm/ppc.h | 1 +
board/socrates/socrates.c | 4 ++--
include/common.h | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index 5765f6b522..055364c58f 100644
--- 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 5f58b4c21b..f1dec6c6fa 100644
--- 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 a971f75f8b..1f87070d49 100644
--- 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);
--
2.24.0.525.g8f36a354ae-goog
More information about the U-Boot
mailing list