[U-Boot-Users] [PATCH 1/1] Fix mips_io_port_base multiple declaration
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c index d29e8d5..687a69c 100644 --- a/board/dbau1x00/dbau1x00.c +++ b/board/dbau1x00/dbau1x00.c @@ -26,6 +26,8 @@ #include <asm/au1x00.h> #include <asm/mipsregs.h>
+unsigned long mips_io_port_base = 0; + long int initdram(int board_type) { /* Sdram is setup by assembler code */ diff --git a/common/cmd_ide.c b/common/cmd_ide.c index bb064ea..feb89d6 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -54,10 +54,6 @@
#ifndef __PPC__ #include <asm/io.h> -#ifdef __MIPS__ -/* Macros depend on this variable */ -unsigned long mips_io_port_base = 0; -#endif #endif
#ifdef CONFIG_IDE_8xx_DIRECT
Jean-Christophe PLAGNIOL-VILLARD wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c index d29e8d5..687a69c 100644 --- a/board/dbau1x00/dbau1x00.c +++ b/board/dbau1x00/dbau1x00.c @@ -26,6 +26,8 @@ #include <asm/au1x00.h> #include <asm/mipsregs.h>
+unsigned long mips_io_port_base = 0;
long int initdram(int board_type) { /* Sdram is setup by assembler code */ diff --git a/common/cmd_ide.c b/common/cmd_ide.c index bb064ea..feb89d6 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -54,10 +54,6 @@
#ifndef __PPC__ #include <asm/io.h> -#ifdef __MIPS__ -/* Macros depend on this variable */ -unsigned long mips_io_port_base = 0; -#endif #endif
#ifdef CONFIG_IDE_8xx_DIRECT
Thanks, but NACK. Please don't move it to dbau1x00 part. See,
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/32132
Does this fix your problem? I'll pick this up after 1.3.0 is out.
Shinya
participants (2)
-
Jean-Christophe PLAGNIOL-VILLARD -
Shinya Kuribayashi