[U-Boot] [RFC Patch 1/2] powerpc: Move fsl_errata.h out of arch/powerpc

[York Sun]

This header file becomes common for both powerpc and arm SoCs.

Signed-off-by: York Sun <yorksun at freescale.com>
CC: Alison Wang <alison.wang at freescale.com>
CC: Nikhil Badola <nikhil.badola at freescale.com>
---
This patch is needed if USB is enabled for LS1021 SoC.

 arch/powerpc/cpu/mpc85xx/cmd_errata.c              |    2 +-
 arch/powerpc/cpu/mpc85xx/cpu_init.c                |    2 +-
 drivers/usb/host/ehci-fsl.c                        |    2 +-
 {arch/powerpc/include/asm => include}/fsl_errata.h |    5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)
 rename {arch/powerpc/include/asm => include}/fsl_errata.h (95%)

diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 3a04a89..1b36e4f 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -7,7 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <linux/compiler.h>
-#include <asm/fsl_errata.h>
+#include <fsl_errata.h>
 #include <asm/processor.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 85d32fc..36f7aeb 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -19,7 +19,7 @@
 #include <asm/io.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <asm/fsl_errata.h>
+#include <fsl_errata.h>
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_srio.h>
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 45062e6..79fb6b4 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -14,7 +14,7 @@
 #include <asm/io.h>
 #include <usb/ehci-fsl.h>
 #include <hwconfig.h>
-#include <asm/fsl_errata.h>
+#include <fsl_errata.h>
 
 #include "ehci.h"
 
diff --git a/arch/powerpc/include/asm/fsl_errata.h b/include/fsl_errata.h
similarity index 95%
rename from arch/powerpc/include/asm/fsl_errata.h
rename to include/fsl_errata.h
index 64da4bb..0693679 100644
--- a/arch/powerpc/include/asm/fsl_errata.h
+++ b/include/fsl_errata.h
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/processor.h>
 
+#ifdef CONFIG_PPC
 #ifdef CONFIG_SYS_FSL_ERRATUM_A006379
 static inline bool has_erratum_a006379(void)
 {
@@ -64,9 +65,11 @@ static inline bool has_erratum_a006261(void)
 	return false;
 }
 #endif
+#endif /* CONFIG_PPC */
 
 static inline bool has_erratum_a007075(void)
 {
+#ifdef CONFIG_PPC
 	u32 svr = get_svr();
 	u32 soc = SVR_SOC_VER(svr);
 
@@ -79,6 +82,8 @@ static inline bool has_erratum_a007075(void)
 	case SVR_P4080:
 		return IS_SVR_REV(svr, 2, 0) || IS_SVR_REV(svr, 3, 0);
 	}
+#endif /* CONFIG_PPC */
+
 	return false;
 }
 #endif
-- 
1.7.9.5