Skip to contentSkip to conversation

Fix mips_io_port_base multiple declaration

PATCH New Jean-Christophe PLAGNIOL-VILLARD 2 participants 2 messages Oct 21, 2007 – Oct 22, 2007

lore
Share & tools
lore

Jean-Christophe PLAGNIOL-VILLARD

author
#0 lore raw

PATCH 1/1 Fix mips_io_port_base multiple declaration

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
board/dbau1x00/dbau1x00.c +2 -0
index d29e8d5..687a69c 100644
@@ -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 */
common/cmd_ide.c +0 -4
index bb064ea..feb89d6 100644
@@ -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
Signature · 1 line
1.5.3.2
#1 lore raw

PATCH 1/1 Fix mips_io_port_base multiple declaration

Quoted 20 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
board/dbau1x00/dbau1x00.c +2 -0
index d29e8d5..687a69c 100644
@@ -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 */
common/cmd_ide.c +0 -0
index bb064ea..feb89d6 100644

common/cmd_ide.c line 59

Quoted 10 lines
common/cmd_ide.c +0 -4
@@ -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