diff options
| author | Stefano Babic <sbabic@denx.de> | 2011-03-14 15:43:56 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-04-27 19:38:05 +0200 |
| commit | 862711154339be2af723adcbde217743de781e81 (patch) | |
| tree | c777613bd01078e4463b421929467a92b6daf73c /board/davedenx/qong | |
| parent | dcd441c32560a823019c720fb034ff425efbc376 (diff) | |
| download | blackbird-obmc-uboot-862711154339be2af723adcbde217743de781e81.tar.gz blackbird-obmc-uboot-862711154339be2af723adcbde217743de781e81.zip | |
IMX: MX31: Cleanup include files and drop nasty #ifdef in drivers
As exception among the i.MX processors, the i.MX31 has headers
without general names (mx31-regs.h, mx31.h instead of imx-regs.h and
clock.h). This requires several nasty #ifdef in the drivers to
include the correct header. The patch cleans up the driver and
renames the header files as for the other i.MX processors.
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board/davedenx/qong')
| -rw-r--r-- | board/davedenx/qong/fpga.c | 4 | ||||
| -rw-r--r-- | board/davedenx/qong/lowlevel_init.S | 2 | ||||
| -rw-r--r-- | board/davedenx/qong/qong.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/board/davedenx/qong/fpga.c b/board/davedenx/qong/fpga.c index 656d5cde95..789acf0696 100644 --- a/board/davedenx/qong/fpga.c +++ b/board/davedenx/qong/fpga.c @@ -23,8 +23,8 @@ */ #include <common.h> -#include <asm/arch/mx31.h> -#include <asm/arch/mx31-regs.h> +#include <asm/arch/clock.h> +#include <asm/arch/imx-regs.h> #include <mxc_gpio.h> #include <fpga.h> #include <lattice.h> diff --git a/board/davedenx/qong/lowlevel_init.S b/board/davedenx/qong/lowlevel_init.S index 80bed92329..85fbfc3646 100644 --- a/board/davedenx/qong/lowlevel_init.S +++ b/board/davedenx/qong/lowlevel_init.S @@ -20,7 +20,7 @@ * MA 02111-1307 USA */ -#include <asm/arch/mx31-regs.h> +#include <asm/arch/imx-regs.h> .macro REG reg, val ldr r2, =\reg diff --git a/board/davedenx/qong/qong.c b/board/davedenx/qong/qong.c index 3ace6cdfff..b1238d505a 100644 --- a/board/davedenx/qong/qong.c +++ b/board/davedenx/qong/qong.c @@ -23,8 +23,8 @@ #include <common.h> #include <netdev.h> -#include <asm/arch/mx31.h> -#include <asm/arch/mx31-regs.h> +#include <asm/arch/clock.h> +#include <asm/arch/imx-regs.h> #include <asm/io.h> #include <nand.h> #include <fsl_pmic.h> |
