diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2012-10-23 06:34:52 +0000 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-10-26 16:28:07 +0200 |
| commit | e100a3d52ebfb4604cca04710a31dfbc91225e96 (patch) | |
| tree | 1b0d34413477e48b1f62673255c7a2f1bd83db2e | |
| parent | 4cfc6c4fa7611e79e6434e97db56b6072ad4d05c (diff) | |
| download | olio-uboot-2014.01-e100a3d52ebfb4604cca04710a31dfbc91225e96.tar.xz olio-uboot-2014.01-e100a3d52ebfb4604cca04710a31dfbc91225e96.zip | |
mx25: Place common functions into sys_proto.h
imx-regs.h is meant to contain SoC register definitions.
Common SoC funtions should go to sys_proto.h instead.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| -rw-r--r-- | arch/arm/include/asm/arch-mx25/imx-regs.h | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx25/sys_proto.h | 3 | ||||
| -rw-r--r-- | board/syteco/zmx25/zmx25.c | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h index 53aafe307..738d4115e 100644 --- a/arch/arm/include/asm/arch-mx25/imx-regs.h +++ b/arch/arm/include/asm/arch-mx25/imx-regs.h @@ -36,10 +36,6 @@ #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/types.h> -#ifdef CONFIG_FEC_MXC -extern void mx25_fec_init_pins(void); -#endif - /* Clock Control Module (CCM) registers */ struct ccm_regs { u32 mpctl; /* Core PLL Control */ diff --git a/arch/arm/include/asm/arch-mx25/sys_proto.h b/arch/arm/include/asm/arch-mx25/sys_proto.h index 6a01a7b04..46db341e8 100644 --- a/arch/arm/include/asm/arch-mx25/sys_proto.h +++ b/arch/arm/include/asm/arch-mx25/sys_proto.h @@ -25,5 +25,8 @@ #define _SYS_PROTO_H_ void mx25_uart1_init_pins(void); +#if defined CONFIG_FEC_MXC +extern void mx25_fec_init_pins(void); +#endif #endif diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c index fe5589d93..4f37c59d8 100644 --- a/board/syteco/zmx25/zmx25.c +++ b/board/syteco/zmx25/zmx25.c @@ -33,6 +33,7 @@ #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/imx25-pinmux.h> +#include <asm/arch/sys_proto.h> DECLARE_GLOBAL_DATA_PTR; |