From 5ff889349d2ace13f10c9335e09365fcec8247cc Mon Sep 17 00:00:00 2001
From: Stefan Roese <sr@denx.de>
Date: Mon, 8 Sep 2008 14:11:12 +0200
Subject: [PATCH] ppc4xx: Move ppc4xx specific prototypes to ppc4xx header

This patch moves some 4xx specific prototypes out of include common.h
to a ppc4xx specific header.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 board/netstal/hcu5/sdram.c     |  2 +-
 include/asm-ppc/ppc4xx-sdram.h | 14 ++++++++++++++
 include/common.h               | 21 ---------------------
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/board/netstal/hcu5/sdram.c b/board/netstal/hcu5/sdram.c
index 66a958c78a..e5df62ef7a 100644
--- a/board/netstal/hcu5/sdram.c
+++ b/board/netstal/hcu5/sdram.c
@@ -122,7 +122,7 @@ void sdram_panic(const char *reason)
 }
 
 #ifdef CONFIG_DDR_ECC
-static void blank_string(int size)
+void blank_string(int size)
 {
 	int i;
 
diff --git a/include/asm-ppc/ppc4xx-sdram.h b/include/asm-ppc/ppc4xx-sdram.h
index a1ef0290e5..8efa557972 100644
--- a/include/asm-ppc/ppc4xx-sdram.h
+++ b/include/asm-ppc/ppc4xx-sdram.h
@@ -1402,4 +1402,18 @@
 
 #endif /* CONFIG_SDRAM_PPC4xx_DENALI_DDR2 */
 
+#ifndef __ASSEMBLY__
+/*
+ * Prototypes
+ */
+void inline blank_string(int size);
+inline void ppc4xx_ibm_ddr2_register_dump(void);
+u32 mfdcr_any(u32);
+void mtdcr_any(u32, u32);
+u32 ddr_wrdtr(u32);
+u32 ddr_clktr(u32);
+void spd_ddr_init_hang(void);
+u32 DQS_autocalibration(void);
+#endif /* __ASSEMBLY__ */
+
 #endif /* _PPC4xx_SDRAM_H_ */
diff --git a/include/common.h b/include/common.h
index 2516bfd30c..a394988b5c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -287,27 +287,6 @@ void	pciinfo	      (int, int);
 #endif
 #endif
 
-/*
- * Prototypes
- */
-#if defined(CONFIG_SDRAM_PPC4xx_IBM_DDR2)
-void blank_string(int);
-inline void ppc4xx_ibm_ddr2_register_dump(void);
-#if defined(CONFIG_440)
-u32 mfdcr_any(u32);
-void mtdcr_any(u32, u32);
-#endif
-#if defined(CONFIG_SPD_EEPROM)
-u32 ddr_wrdtr(u32);
-u32 ddr_clktr(u32);
-void spd_ddr_init_hang(void);
-#endif
-#endif /* defined(CONFIG_SDRAM_PPC4xx_IBM_DDR2) */
-
-#if defined(CONFIG_PPC4xx_DDR_AUTOCALIBRATION)
-u32 DQS_autocalibration(void);
-#endif /* CONFIG_PPC4xx_DDR_AUTOCALIBRATION */
-
 int	misc_init_f   (void);
 int	misc_init_r   (void);
 
-- 
2.30.2