diff options
| author | Terry Lv <r65388@freescale.com> | 2010-03-22 17:38:48 +0800 |
|---|---|---|
| committer | Terry Lv <r65388@freescale.com> | 2010-03-22 17:53:45 +0800 |
| commit | 1842946ef735d969e99be097812bbc383e7f8dc1 (patch) | |
| tree | 2b0be95d12ad93ab8ac17b0259dd84e52d6278c7 /drivers | |
| parent | e84eaf4df6db1f4038580ec88d3e4a49624363eb (diff) | |
| download | u-boot-imx-1842946ef735d969e99be097812bbc383e7f8dc1.zip u-boot-imx-1842946ef735d969e99be097812bbc383e7f8dc1.tar.gz u-boot-imx-1842946ef735d969e99be097812bbc383e7f8dc1.tar.bz2 | |
ENGR00121832: Some code reconstructure for u-boot
1. Remove board specific code in mxc_i2c.c.
2. Remove board specific code in mxc_fec.c.
3. Move imx_spi_nor.h to include/asm-arm.
Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/mxc_i2c.c | 16 | ||||
| -rw-r--r-- | drivers/mtd/spi/imx_spi_nor_atmel.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/spi/imx_spi_nor_sst.c | 4 | ||||
| -rw-r--r-- | drivers/net/mxc_fec.c | 6 |
4 files changed, 7 insertions, 23 deletions
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 7479c60..4c402c9 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -28,22 +28,6 @@ #if defined(CONFIG_HARD_I2C) -#ifdef CONFIG_MX25 -#include <asm/arch/mx25.h> -#include <asm/arch/mx25-regs.h> -#elif defined(CONFIG_MX31) -#include <asm/arch/mx31.h> -#include <asm/arch/mx31-regs.h> -#elif defined(CONFIG_MX35) -#include <asm/arch/mx35.h> -#elif defined(CONFIG_MX51_3DS) -#include <asm/arch/mx51.h> -#elif defined(CONFIG_MX53) -#include <asm/arch/mx53.h> -#else -#error "Please include specific headfile " -#endif - #define IADR 0x00 #define IFDR 0x04 #define I2CR 0x08 diff --git a/drivers/mtd/spi/imx_spi_nor_atmel.c b/drivers/mtd/spi/imx_spi_nor_atmel.c index b6180a5..19a5197 100644 --- a/drivers/mtd/spi/imx_spi_nor_atmel.c +++ b/drivers/mtd/spi/imx_spi_nor_atmel.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2008-2009 Freescale Semiconductor, Inc. + * (C) Copyright 2008-2010 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -29,7 +29,7 @@ #include <malloc.h> #include <imx_spi.h> -#include <asm/arch/imx_spi_nor.h> +#include <imx_spi_nor.h> static u8 g_tx_buf[256]; static u8 g_rx_buf[256]; diff --git a/drivers/mtd/spi/imx_spi_nor_sst.c b/drivers/mtd/spi/imx_spi_nor_sst.c index 2d2b4a0..d484a51 100644 --- a/drivers/mtd/spi/imx_spi_nor_sst.c +++ b/drivers/mtd/spi/imx_spi_nor_sst.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2008-2009 Freescale Semiconductor, Inc. + * (C) Copyright 2008-2010 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -29,7 +29,7 @@ #include <malloc.h> #include <imx_spi.h> -#include <asm/arch/imx_spi_nor.h> +#include <imx_spi_nor.h> static u8 g_tx_buf[256]; static u8 g_rx_buf[256]; diff --git a/drivers/net/mxc_fec.c b/drivers/net/mxc_fec.c index 0e6c0b0..b828240 100644 --- a/drivers/net/mxc_fec.c +++ b/drivers/net/mxc_fec.c @@ -93,10 +93,10 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_MX25) || defined(CONFIG_MX53) +#if defined(CONFIG_MII_GASKET) /* - * * i.MX25 allows RMII mode to be configured via a gasket - * */ + * RMII mode to be configured via a gasket + */ #define FEC_MIIGSK_CFGR_FRCONT (1 << 6) #define FEC_MIIGSK_CFGR_LBMODE (1 << 4) #define FEC_MIIGSK_CFGR_EMODE (1 << 3) |