diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2007-11-13 09:11:05 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-11-17 01:37:44 +0100 |
commit | 5c15010efad980ad5498cc565fc1ed70df2f52b4 (patch) | |
tree | 5b7a60ca24a84352b29e387a62ef0e5418ae88f9 /board/tb0229/tb0229.c | |
parent | e5e3d7d520073701be0276e3e1c607149fc9be87 (diff) | |
download | u-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/tb0229/tb0229.c')
-rw-r--r-- | board/tb0229/tb0229.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/board/tb0229/tb0229.c b/board/tb0229/tb0229.c index e7914bd..61c2e9b 100644 --- a/board/tb0229/tb0229.c +++ b/board/tb0229/tb0229.c @@ -13,10 +13,9 @@ #include <command.h> #include <asm/addrspace.h> #include <asm/inca-ip.h> +#include <asm/io.h> #include <pci.h> -unsigned long mips_io_port_base = 0; - #if defined(CONFIG_PCI) static struct pci_controller hose; @@ -26,17 +25,17 @@ void pci_init_board (void) } #endif - long int initdram(int board_type) { return get_ram_size (CFG_SDRAM_BASE, 0x8000000); } - int checkboard (void) { printf("Board: TANBAC TB0229 "); printf("(CPU Speed %d MHz)\n", (int)CPU_CLOCK_RATE/1000000); + set_io_port_base(0); + return 0; } |