diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index b368562..a493556 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_usb.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 4cf8853..13a7d0f 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/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index acb1353..f89c94e 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -11,7 +11,7 @@
 #include <asm/processor.h>
 #include <asm/fsl_law.h>
 #include <asm/errno.h>
-#include <asm/fsl_errata.h>
+#include <fsl_errata.h>
 #include "fsl_corenet2_serdes.h"
 
 #ifdef CONFIG_SYS_FSL_SRDS_1
diff --git a/arch/powerpc/include/asm/fsl_errata.h b/include/fsl_errata.h
similarity index 79%
rename from arch/powerpc/include/asm/fsl_errata.h
rename to include/fsl_errata.h
index 4861e3bf..aebe3d2 100644
--- a/arch/powerpc/include/asm/fsl_errata.h
+++ b/include/fsl_errata.h
@@ -1,14 +1,21 @@
 /*
- * Copyright 2013 Freescale Semiconductor, Inc.
+ * Copyright 2013 - 2015  Freescale Semiconductor, Inc.
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#ifndef _ASM_FSL_ERRATA_H
-#define _ASM_FSL_ERRATA_H
+#ifndef _FSL_ERRATA_H
+#define _FSL_ERRATA_H
 
 #include <common.h>
+#if defined(CONFIG_PPC)
 #include <asm/processor.h>
+#elif defined(CONFIG_LS102XA)
+#include <asm/arch-ls102xa/immap_ls102xa.h>
+#elif defined(CONFIG_FSL_LAYERSCAPE)
+#include <asm/arch/soc.h>
+#endif
+
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_A006379
 static inline bool has_erratum_a006379(void)
@@ -26,7 +33,6 @@ static inline bool has_erratum_a006379(void)
 	return false;
 }
 #endif
-#endif
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_A007186
 static inline bool has_erratum_a007186(void)
@@ -51,3 +57,5 @@ static inline bool has_erratum_a007186(void)
 	return false;
 }
 #endif
+
+#endif /*  _FSL_ERRATA_H */