diff options
author | Zhao Qiang <B45475@freescale.com> | 2014-06-03 16:27:07 +0800 |
---|---|---|
committer | York Sun <yorksun@freescale.com> | 2014-07-22 16:25:54 -0700 |
commit | 38d67a4e552ac991f21c2d3e442a38fb0098fda6 (patch) | |
tree | c3dcf3f985df7b54076d8518f9b22a5cd8a9532c | |
parent | 09c2046ff651a0d47bb2834d775991ba2c607130 (diff) | |
download | u-boot-imx-38d67a4e552ac991f21c2d3e442a38fb0098fda6.zip u-boot-imx-38d67a4e552ac991f21c2d3e442a38fb0098fda6.tar.gz u-boot-imx-38d67a4e552ac991f21c2d3e442a38fb0098fda6.tar.bz2 |
qe: move immap_qe.h from arch directory into common directory
ls1021 is arm-core and supports qe too.
Move immap_qe.h into common directory for both arm and powerpc.
Signed-off-by: Zhao Qiang <B45475@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
-rw-r--r-- | arch/powerpc/cpu/mpc83xx/cpu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc83xx/fdt.c | 2 | ||||
-rw-r--r-- | drivers/bootcount/bootcount.c | 2 | ||||
-rw-r--r-- | drivers/qe/qe.c | 2 | ||||
-rw-r--r-- | drivers/qe/uccf.c | 2 | ||||
-rw-r--r-- | drivers/qe/uccf.h | 2 | ||||
-rw-r--r-- | drivers/qe/uec.c | 2 | ||||
-rw-r--r-- | drivers/qe/uec_phy.c | 2 | ||||
-rw-r--r-- | include/linux/immap_qe.h (renamed from arch/powerpc/include/asm/immap_qe.h) | 0 | ||||
-rw-r--r-- | include/post.h | 2 |
10 files changed, 9 insertions, 9 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index e41988d..3809309 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -20,7 +20,7 @@ #include <netdev.h> #include <fsl_esdhc.h> #if defined(CONFIG_BOOTCOUNT_LIMIT) && !defined(CONFIG_MPC831x) -#include <asm/immap_qe.h> +#include <linux/immap_qe.h> #include <asm/io.h> #endif diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c index 450a970..f249a58 100644 --- a/arch/powerpc/cpu/mpc83xx/fdt.c +++ b/arch/powerpc/cpu/mpc83xx/fdt.c @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; #if defined(CONFIG_BOOTCOUNT_LIMIT) && \ (defined(CONFIG_QE) && !defined(CONFIG_MPC831x)) -#include <asm/immap_qe.h> +#include <linux/immap_qe.h> void fdt_fixup_muram (void *blob) { diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c index 3ad4413..e0343f7 100644 --- a/drivers/bootcount/bootcount.c +++ b/drivers/bootcount/bootcount.c @@ -36,7 +36,7 @@ #endif /* defined(CONFIG_MPC8260) */ #if defined(CONFIG_QE) -#include <asm/immap_qe.h> +#include <linux/immap_qe.h> #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + 0x110000 + \ QE_MURAM_SIZE - 2 * sizeof(u32)) diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 9c5fbd1..be09a17 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -11,7 +11,7 @@ #include <command.h> #include "asm/errno.h" #include "asm/io.h" -#include "asm/immap_qe.h" +#include "linux/immap_qe.h" #include "qe.h" #define MPC85xx_DEVDISR_QE_DISABLE 0x1 diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c index 593d96d..85386bf 100644 --- a/drivers/qe/uccf.c +++ b/drivers/qe/uccf.c @@ -11,7 +11,7 @@ #include "malloc.h" #include "asm/errno.h" #include "asm/io.h" -#include "asm/immap_qe.h" +#include "linux/immap_qe.h" #include "qe.h" #include "uccf.h" diff --git a/drivers/qe/uccf.h b/drivers/qe/uccf.h index 0b57e2f..55941e4 100644 --- a/drivers/qe/uccf.h +++ b/drivers/qe/uccf.h @@ -12,7 +12,7 @@ #include "common.h" #include "qe.h" -#include "asm/immap_qe.h" +#include "linux/immap_qe.h" /* Fast or Giga ethernet */ diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c index 6804573..c91f084 100644 --- a/drivers/qe/uec.c +++ b/drivers/qe/uec.c @@ -11,7 +11,7 @@ #include "malloc.h" #include "asm/errno.h" #include "asm/io.h" -#include "asm/immap_qe.h" +#include "linux/immap_qe.h" #include "qe.h" #include "uccf.h" #include "uec.h" diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c index 5dc4641..e701787 100644 --- a/drivers/qe/uec_phy.c +++ b/drivers/qe/uec_phy.c @@ -14,7 +14,7 @@ #include "net.h" #include "malloc.h" #include "asm/errno.h" -#include "asm/immap_qe.h" +#include "linux/immap_qe.h" #include "asm/io.h" #include "qe.h" #include "uccf.h" diff --git a/arch/powerpc/include/asm/immap_qe.h b/include/linux/immap_qe.h index b317dcb..b317dcb 100644 --- a/arch/powerpc/include/asm/immap_qe.h +++ b/include/linux/immap_qe.h diff --git a/include/post.h b/include/post.h index 24ca728..5ebd535 100644 --- a/include/post.h +++ b/include/post.h @@ -38,7 +38,7 @@ #define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CPM_POST_WORD_ADDR) #elif defined(CONFIG_MPC8360) -#include <asm/immap_qe.h> +#include <linux/immap_qe.h> #define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CPM_POST_WORD_ADDR) #elif defined (CONFIG_MPC85xx) |