diff options
| author | Heiko Schocher <hs@denx.de> | 2011-03-08 10:47:39 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-30 00:45:07 +0200 |
| commit | 8ed74341ba5c54751e209f571002e5b967abf176 (patch) | |
| tree | cd832efa3ce5e6632652408408ba800c4a10e9e2 /board | |
| parent | 1ebbb77a194788424e519955f6b04dda8aa7e625 (diff) | |
| download | blackbird-obmc-uboot-8ed74341ba5c54751e209f571002e5b967abf176.tar.gz blackbird-obmc-uboot-8ed74341ba5c54751e209f571002e5b967abf176.zip | |
ppc, 8321: cleanup tuxa1, tuda1 and suvd3 support
For the kmsupx5 a new header file was introduced km8321-common.h.
Now the common stuff from tuxa1, tuda1 and suvd3 was removed and
the new header file included.
The defines CONFIG_SYS_PIGGY_BASE and CONFIG_SYS_PIGGY_SIZE are
confusing. Because they actually describe the KMBEC FPGA values.
The KMBEC FPGA can be PRIO on kmeter1 or upio on mgcoge. Therefore
all the defines were renamed.
remove unneeded variable CONFIG_KM_DEF_NETDEV, as it is
already declared in keymile-common.h
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/keymile/common/common.c | 3 | ||||
| -rw-r--r-- | board/keymile/km83xx/km83xx.c | 3 | ||||
| -rw-r--r-- | board/keymile/mgcoge/mgcoge.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 8564b9c757..2d0aee9508 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -562,7 +562,8 @@ int fdt_get_node_and_value(void *blob, #if !defined(MACH_TYPE_KM_KIRKWOOD) int ethernet_present(void) { - struct km_bec_fpga *base = (struct km_bec_fpga *)CONFIG_SYS_PIGGY_BASE; + struct km_bec_fpga *base = + (struct km_bec_fpga *)CONFIG_SYS_KMBEC_FPGA_BASE; return in_8(&base->bprth) & PIGGY_PRESENT; } diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index 98aceef563..f9186e813b 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -134,7 +134,8 @@ const uint upma_table[] = { int board_early_init_r(void) { - struct km_bec_fpga *base = (struct km_bec_fpga *)CONFIG_SYS_PIGGY_BASE; + struct km_bec_fpga *base = + (struct km_bec_fpga *)CONFIG_SYS_KMBEC_FPGA_BASE; #if defined(CONFIG_SUVD3) immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; fsl_lbc_t *lbc = &immap->im_lbc; diff --git a/board/keymile/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c index 838f24b820..7f487f109e 100644 --- a/board/keymile/mgcoge/mgcoge.c +++ b/board/keymile/mgcoge/mgcoge.c @@ -318,7 +318,8 @@ int last_stage_init(void) */ int board_early_init_r(void) { - struct km_bec_fpga *base = (struct km_bec_fpga *)CONFIG_SYS_PIGGY_BASE; + struct km_bec_fpga *base = + (struct km_bec_fpga *)CONFIG_SYS_KMBEC_FPGA_BASE; /* setup the UPIOx */ /* General Unit Reset disabled, Flash Bank enabled, UnitLed on */ |
