[U-Boot] [PATCH] Minor corrections for i386 (v2008.10-rc2)

[U-Boot] [PATCH] Minor corrections for i386 (v2008.10-rc2)

[Graeme Russ]

Several minor corrections to allow clean builds of new i386 and sc520
based boards based on 2008.10

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
---

diff --git a/cpu/i386/sc520.c b/cpu/i386/sc520.c
index 640b255..b68dfd6 100644
--- a/cpu/i386/sc520.c
+++ b/cpu/i386/sc520.c
@@ -32,7 +32,7 @@
 #include <config.h>
 #include <pci.h>
 #ifdef CONFIG_SC520_SSI
-#include <ssi.h>
+#include <asm/ic/ssi.h>
 #endif
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/examples/82559_eeprom.c b/examples/82559_eeprom.c
index d99af26..5e2eee9 100644
--- a/examples/82559_eeprom.c
+++ b/examples/82559_eeprom.c
@@ -19,7 +19,6 @@
  */
 
 #define _PPC_STRING_H_		/* avoid unnecessary str/mem functions */
-#define _LINUX_STRING_H_	/* avoid unnecessary str/mem functions */
 
 #include <common.h>
 #include <exports.h>
diff --git a/include/asm-i386/ic/sc520.h b/include/asm-i386/ic/sc520.h
index 0f7e7a5..5922e8e 100644
--- a/include/asm-i386/ic/sc520.h
+++ b/include/asm-i386/ic/sc520.h
@@ -24,6 +24,10 @@
 #ifndef _ASM_IC_SC520_H_
 #define _ASM_IC_SC520_H_ 1
 
+#ifdef CONFIG_PCI
+#include <pci.h>
+#endif
+
 /* Memory mapped configuration registers, MMCR */
 #define SC520_REVID		0x0000	/* ElanSC520 Microcontroller Revision ID Register */
 #define SC520_CPUCTL		0x0002	/* Am5x86 CPU Control Register */
@@ -312,7 +316,8 @@ extern int sc520_pci_ints[];
 
 void init_sc520(void);
 unsigned long init_sc520_dram(void);
+#ifdef CONFIG_PCI
 void pci_sc520_init(struct pci_controller *hose);
 int pci_sc520_set_irq(int pci_pin, int irq);
-
+#endif
 #endif
diff --git a/lib_i386/video_bios.c b/lib_i386/video_bios.c
index ce96a3e..1541773 100644
--- a/lib_i386/video_bios.c
+++ b/lib_i386/video_bios.c
@@ -21,6 +21,8 @@
  * MA 02111-1307 USA
  */
 
+#ifdef CONFIG_VIDEO
+
 #include <common.h>
 #include <pci.h>
 #include <malloc.h>
@@ -136,7 +138,6 @@ static u32 probe_pci_video(void)
 
 #endif
 
-#ifdef CONFIG_VIDEO
 
 static int probe_isa_video(void)
 {

[U-Boot] [PATCH] Minor corrections for i386 (v2008.10-rc2)

[Wolfgang Denk]

Dear Graeme Russ,

In message <48CE15B3.1030305@gmail.com> you wrote:
> Several minor corrections to allow clean builds of new i386 and sc520
> based boards based on 2008.10

Soory, but some parts of this cannot work:

> --- a/examples/82559_eeprom.c
> +++ b/examples/82559_eeprom.c
> @@ -19,7 +19,6 @@
>   */
>  
>  #define _PPC_STRING_H_		/* avoid unnecessary str/mem functions */
> -#define _LINUX_STRING_H_	/* avoid unnecessary str/mem functions */

Will this still build for other architectures, say ARM and MIPS and
Power?

> diff --git a/lib_i386/video_bios.c b/lib_i386/video_bios.c
> index ce96a3e..1541773 100644
> --- a/lib_i386/video_bios.c
> +++ b/lib_i386/video_bios.c
> @@ -21,6 +21,8 @@
>   * MA 02111-1307 USA
>   */
>  
> +#ifdef CONFIG_VIDEO
> +
>  #include <common.h>
>  #include <pci.h>
>  #include <malloc.h>

This cannot work. CONFIG_VIDEO can only be set in the board config
file, which gets included implicitly by #include <common.h>, but you
use the variable before that, so it will always be undefined, which is
probably not what you intend.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"...and the fully armed nuclear warheads, are, of  course,  merely  a
courtesy detail."