diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-05-16 10:47:45 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-06-12 20:47:16 +0200 |
| commit | 3b74e7ec58e2cc352b0a396a614065cfeb8d138f (patch) | |
| tree | 6a9380031ccfa9e8734e675fb9d9c1e4dcf32927 /cpu | |
| parent | a927e491b2a326c1e9c4313e3ce4042988422697 (diff) | |
| download | u-boot-imx-3b74e7ec58e2cc352b0a396a614065cfeb8d138f.zip u-boot-imx-3b74e7ec58e2cc352b0a396a614065cfeb8d138f.tar.gz u-boot-imx-3b74e7ec58e2cc352b0a396a614065cfeb8d138f.tar.bz2 | |
MPC512x: remove include/mpc512x.h
Move needed definitions (register descriptions etc.) from
include/mpc512x.h into include/asm-ppc/immap_512x.h.
Instead of using a #define'd register offset, use a function that
provides the PATA controller's base address.
All the rest of include/mpc512x.h are register offset definitions
which can be eliminated by proper use of C structures.
There are only a few register offsets remaining that are needed in
cpu/mpc512x/start.S; for these we provide cpu/mpc512x/asm-offsets.h
which is intended as a temporary workaround only. In a later patch
this file will be removed, too, and then auto-generated from the
respective C structs.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: John Rigby <jcrigby@gmail.com>
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc512x/asm-offsets.h | 15 | ||||
| -rw-r--r-- | cpu/mpc512x/cpu.c | 1 | ||||
| -rw-r--r-- | cpu/mpc512x/cpu_init.c | 1 | ||||
| -rw-r--r-- | cpu/mpc512x/i2c.c | 1 | ||||
| -rw-r--r-- | cpu/mpc512x/speed.c | 1 | ||||
| -rw-r--r-- | cpu/mpc512x/start.S | 6 |
6 files changed, 19 insertions, 6 deletions
diff --git a/cpu/mpc512x/asm-offsets.h b/cpu/mpc512x/asm-offsets.h new file mode 100644 index 0000000..4b14778 --- /dev/null +++ b/cpu/mpc512x/asm-offsets.h @@ -0,0 +1,15 @@ +/* + * needed for cpu/mpc512x/start.S + * + * These should be auto-generated + */ +#define LPCS0AW 0x0024 +#define SRAMBAR 0x00C4 +#define SWCRR 0x0904 +#define LPC_OFFSET 0x10000 +#define CS0_CONFIG 0x00000 +#define CS_CTRL 0x00020 +#define CS_CTRL_ME 0x01000000 /* CS Master Enable bit */ + +#define EXC_OFF_SYS_RESET 0x0100 +#define _START_OFFSET EXC_OFF_SYS_RESET diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c index 8021bc1..42ccd81 100644 --- a/cpu/mpc512x/cpu.c +++ b/cpu/mpc512x/cpu.c @@ -29,7 +29,6 @@ #include <common.h> #include <command.h> -#include <mpc512x.h> #include <net.h> #include <netdev.h> #include <asm/processor.h> diff --git a/cpu/mpc512x/cpu_init.c b/cpu/mpc512x/cpu_init.c index 69ec871..fe6beaf 100644 --- a/cpu/mpc512x/cpu_init.c +++ b/cpu/mpc512x/cpu_init.c @@ -25,7 +25,6 @@ */ #include <common.h> -#include <mpc512x.h> #include <asm/io.h> #include <asm/processor.h> diff --git a/cpu/mpc512x/i2c.c b/cpu/mpc512x/i2c.c index 4a3f9a0..97bda0d 100644 --- a/cpu/mpc512x/i2c.c +++ b/cpu/mpc512x/i2c.c @@ -30,7 +30,6 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_HARD_I2C -#include <mpc512x.h> #include <i2c.h> /* by default set I2C bus 0 active */ diff --git a/cpu/mpc512x/speed.c b/cpu/mpc512x/speed.c index 0fec004..ce8d094 100644 --- a/cpu/mpc512x/speed.c +++ b/cpu/mpc512x/speed.c @@ -26,7 +26,6 @@ */ #include <common.h> -#include <mpc512x.h> #include <command.h> #include <asm/io.h> #include <asm/processor.h> diff --git a/cpu/mpc512x/start.S b/cpu/mpc512x/start.S index 360682d..178e5d1 100644 --- a/cpu/mpc512x/start.S +++ b/cpu/mpc512x/start.S @@ -1,7 +1,7 @@ /* * Copyright (C) 1998 Dan Malek <dmalek@jlc.net> * Copyright (C) 1999 Magnus Damm <kieraypc01.p.y.kie.era.ericsson.se> - * Copyright (C) 2000, 2001, 2002, 2007 Wolfgang Denk <wd@denx.de> + * Copyright (C) 2000-2009 Wolfgang Denk <wd@denx.de> * Copyright Freescale Semiconductor, Inc. 2004, 2006. All rights reserved. * * See file CREDITS for list of people who contributed to this @@ -30,12 +30,14 @@ */ #include <config.h> -#include <mpc512x.h> #include <timestamp.h> #include <version.h> #define CONFIG_521X 1 /* needed for Linux kernel header files*/ +#include <asm/immap_512x.h> +#include "asm-offsets.h" + #include <ppc_asm.tmpl> #include <ppc_defs.h> |