diff options
author | Simon Glass <sjg@chromium.org> | 2017-05-17 08:23:10 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-06-05 14:12:59 -0400 |
commit | 457e51cffdacf117c2afdd09d9bfc2f8df7314cb (patch) | |
tree | 8c57e8c2e3411e24bc1b827345c4a91f635128a2 /include | |
parent | 89f5eaa1ee9a3307e05458aa4f3b2155ab0a7144 (diff) |
common: arm: freescale: layerscape: Move header files out of common.h
We should not have an arch-specific header file in common.h. Adjust the
board files a little so it is not needed, and drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/common.h | 7 | ||||
-rw-r--r-- | include/configs/ls1012a_common.h | 2 | ||||
-rw-r--r-- | include/configs/ls1043a_common.h | 2 | ||||
-rw-r--r-- | include/configs/ls1046a_common.h | 2 | ||||
-rw-r--r-- | include/configs/ls2080a_common.h | 2 | ||||
-rw-r--r-- | include/fsl_ifc.h | 3 |
6 files changed, 11 insertions, 7 deletions
diff --git a/include/common.h b/include/common.h index b97b61d65d..a413f1ae9b 100644 --- a/include/common.h +++ b/include/common.h @@ -31,13 +31,6 @@ typedef volatile unsigned char vu_char; #include <stdarg.h> #include <linux/kernel.h> -#ifdef CONFIG_FSL_LSCH3 -#include <asm/arch/immap_lsch3.h> -#endif -#ifdef CONFIG_FSL_LSCH2 -#include <asm/arch/immap_lsch2.h> -#endif - #include <part.h> #include <flash.h> #include <image.h> diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index bd9b0d30a5..42bbc028d3 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -121,4 +121,6 @@ #define CONFIG_PANIC_HANG #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ +#include <asm/arch/soc.h> + #endif /* __LS1012A_COMMON_H */ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 7fd3464fa5..32f7162bbc 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -300,4 +300,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ +#include <asm/arch/soc.h> + #endif /* __LS1043A_COMMON_H */ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index b66b8ac72c..1b91676c2d 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -237,4 +237,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ +#include <asm/arch/soc.h> + #endif /* __LS1046A_COMMON_H */ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index e311d0b149..dbca05a3f6 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -250,4 +250,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ +#include <asm/arch/soc.h> + #endif /* __LS2_COMMON_H */ diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h index a86f2162aa..29aa687507 100644 --- a/include/fsl_ifc.h +++ b/include/fsl_ifc.h @@ -11,6 +11,9 @@ #ifdef CONFIG_FSL_IFC #include <config.h> #include <common.h> +#ifdef CONFIG_ARM +#include <asm/arch/soc.h> +#endif #define FSL_IFC_V1_1_0 0x01010000 #define FSL_IFC_V2_0_0 0x02000000 |