diff options
| author | Shengzhou Liu <Shengzhou.Liu@freescale.com> | 2015-11-20 15:52:03 +0800 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2015-12-13 18:27:28 -0800 |
| commit | a07bdad749ea080e009a82ba40e791dc7361ab54 (patch) | |
| tree | e194d47ecfe1f787122b261a2cac161fb8b4210b | |
| parent | 0c028a03284aabceb89a85736e23661d6fe7915e (diff) | |
| download | talos-obmc-uboot-a07bdad749ea080e009a82ba40e791dc7361ab54.tar.gz talos-obmc-uboot-a07bdad749ea080e009a82ba40e791dc7361ab54.zip | |
fsl/errata: move fsl_errata.h to common directory
move arch/powerpc/include/asm/fsl_errata.h to include/fsl_errata.h
to make it public for both ARM and POWER SoCs.
Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
[York Sun: fix soc.h path in fsl_errata.h]
Reviewed-by: York Sun <yorksun@freescale.com>
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cmd_errata.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 2 | ||||
| -rw-r--r-- | include/fsl_errata.h (renamed from arch/powerpc/include/asm/fsl_errata.h) | 16 |
4 files changed, 15 insertions, 7 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index b368562a24..a4935567f6 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 4cf8853b72..13a7d0f664 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 acb1353e5d..f89c94e7b3 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 index 4861e3bf8d..aebe3d2925 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 */ |
