summaryrefslogtreecommitdiff
path: root/board/gth2/gth2.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2007-11-13 09:11:05 +0100
committerWolfgang Denk <wd@denx.de>2007-11-17 01:37:44 +0100
commit5c15010efad980ad5498cc565fc1ed70df2f52b4 (patch)
tree5b7a60ca24a84352b29e387a62ef0e5418ae88f9 /board/gth2/gth2.c
parente5e3d7d520073701be0276e3e1c607149fc9be87 (diff)
downloadu-boot-imx-5c15010efad980ad5498cc565fc1ed70df2f52b4.zip
u-boot-imx-5c15010efad980ad5498cc565fc1ed70df2f52b4.tar.gz
u-boot-imx-5c15010efad980ad5498cc565fc1ed70df2f52b4.tar.bz2
Fixed mips_io_port_base build errors.
This patch has been sent on: - 29 Sep 2007 Although mips_io_port_base is currently a part of IDE command, it is quite fundamental for MIPS I/O port access such as in[bwl] and out[bwl]. So move it to MIPS general part, and introduce `set_io_port_base()' from Linux. This patch is triggered by multiple definition of `mips_io_port_base' build error on gth2 (and tb0229 also needs this fix.) board/gth2/libgth2.a(gth2.o): In function `log_serial_char': /home/skuribay/devel/u-boot.git/board/gth2/gth2.c:47: multiple definition of `mips_io_port_base' common/libcommon.a(cmd_ide.o):/home/skuribay/devel/u-boot.git/common/cmd_ide.c:712: first defined here make: *** [u-boot] Error 1 Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'board/gth2/gth2.c')
-rw-r--r--board/gth2/gth2.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/board/gth2/gth2.c b/board/gth2/gth2.c
index ffeaf58..1593f02 100644
--- a/board/gth2/gth2.c
+++ b/board/gth2/gth2.c
@@ -26,14 +26,13 @@
#include <asm/au1x00.h>
#include <asm/addrspace.h>
#include <asm/mipsregs.h>
+#include <asm/io.h>
#include <watchdog.h>
#include "ee_access.h"
static int wdi_status = 0;
-unsigned long mips_io_port_base = 0;
-
#define SDRAM_SIZE ((64*1024*1024)-(12*4096))
@@ -147,6 +146,9 @@ int checkboard (void)
default:
printf ("Unsupported cpu %d, proc_id=0x%x\n", proc_id >> 24, proc_id);
}
+
+ set_io_port_base(0);
+
#ifdef CONFIG_IDE_PCMCIA
/* PCMCIA is on a 36 bit physical address.
We need to map it into a 32 bit addresses */