r4007 - in trunk/coreboot-v2/src: arch/ppc/include/arch include/boot mainboard/totalimpact/briq northbridge/ibm/cpc710

Author: stepan
Date: 2009-03-15 11:04:41 +0100 (Sun, 15 Mar 2009)
New Revision: 4007

Modified:
   trunk/coreboot-v2/src/arch/ppc/include/arch/pci_ops.h
   trunk/coreboot-v2/src/arch/ppc/include/arch/pciconf.h
   trunk/coreboot-v2/src/include/boot/elf.h
   trunk/coreboot-v2/src/mainboard/totalimpact/briq/Options.lb
   trunk/coreboot-v2/src/mainboard/totalimpact/briq/init.c
   trunk/coreboot-v2/src/northbridge/ibm/cpc710/cpc710_pci.c
Log:
Fix all build problems on PPC except the _SDA_BASE issues caused by the
code expecting too old binutils(?).

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/src/arch/ppc/include/arch/pci_ops.h
===================================================================
--- trunk/coreboot-v2/src/arch/ppc/include/arch/pci_ops.h	2009-03-15 09:55:17 UTC (rev 4006)
+++ trunk/coreboot-v2/src/arch/ppc/include/arch/pci_ops.h	2009-03-15 10:04:41 UTC (rev 4007)
@@ -1,6 +1,6 @@
 #ifndef ARCH_PPC_PCI_OPS_H
 #define ARCH_PPC_PCI_OPS_H

-const struct pci_bus_operations pci_ppc_conf1;
+extern const struct pci_bus_operations pci_ppc_conf1;

#endif /* ARCH_PPC_PCI_OPS_H */

Modified: trunk/coreboot-v2/src/arch/ppc/include/arch/pciconf.h
===================================================================
--- trunk/coreboot-v2/src/arch/ppc/include/arch/pciconf.h	2009-03-15 09:55:17 UTC (rev 4006)
+++ trunk/coreboot-v2/src/arch/ppc/include/arch/pciconf.h	2009-03-15 10:04:41 UTC (rev 4007)
@@ -4,12 +4,12 @@
 /*      
  * Direct access to PCI hardware...
  */     
-extern uint8_t pci_ppc_read_config8(unsigned char, int, int);
-extern uint16_t pci_ppc_read_config16(unsigned char, int, int);
-extern uint32_t pci_ppc_read_config32(unsigned char, int, int);
-extern int pci_ppc_write_config8(unsigned char, int, int, uint8_t);
-extern int pci_ppc_write_config16(unsigned char, int, int, uint16_t);
-extern int pci_ppc_write_config32(unsigned char, int, int, uint32_t);
+uint8_t pci_ppc_read_config8(unsigned char, int, int);
+uint16_t pci_ppc_read_config16(unsigned char, int, int);
+uint32_t pci_ppc_read_config32(unsigned char, int, int);
+int pci_ppc_write_config8(unsigned char, int, int, uint8_t);
+int pci_ppc_write_config16(unsigned char, int, int, uint16_t);
+int pci_ppc_write_config32(unsigned char, int, int, uint32_t);

#define CONFIG_CMD(bus,devfn,where) \
                 ((bus << 16) | (devfn << 8) | (where & ~3) | 0x80000000)

Modified: trunk/coreboot-v2/src/include/boot/elf.h
===================================================================
--- trunk/coreboot-v2/src/include/boot/elf.h	2009-03-15 09:55:17 UTC (rev 4006)
+++ trunk/coreboot-v2/src/include/boot/elf.h	2009-03-15 10:04:41 UTC (rev 4007)
@@ -389,10 +389,12 @@
 typedef Elf64_Phdr Elf_phdr;
 #endif

-extern int elf_check_arch(Elf_ehdr *ehdr);
-extern void jmp_to_elf_entry(void *entry, unsigned long buffer);
+int elf_check_arch(Elf_ehdr *ehdr);
+void jmp_to_elf_entry(void *entry, unsigned long buffer);
 struct lb_memory;
-extern int elfboot(struct lb_memory *mem);
+int elfboot(struct lb_memory *mem);
+/* Temporary compile fix, FILO should be dropped from coreboot */
+int filo(struct lb_memory *mem);

#define FIRMWARE_TYPE "coreboot"
 #define BOOTLOADER "elfboot"

Modified: trunk/coreboot-v2/src/mainboard/totalimpact/briq/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/totalimpact/briq/Options.lb	2009-03-15 09:55:17 UTC (rev 4006)
+++ trunk/coreboot-v2/src/mainboard/totalimpact/briq/Options.lb	2009-03-15 10:04:41 UTC (rev 4007)
@@ -11,7 +11,6 @@
 uses PCIC0_CFGADDR
 uses PCIC0_CFGDATA
 uses _IO_BASE
-uses CROSS_COMPILE 
 uses HAVE_OPTION_TABLE
 uses CONFIG_COMPRESS 
 uses DEFAULT_CONSOLE_LOGLEVEL

Modified: trunk/coreboot-v2/src/mainboard/totalimpact/briq/init.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/totalimpact/briq/init.c	2009-03-15 09:55:17 UTC (rev 4006)
+++ trunk/coreboot-v2/src/mainboard/totalimpact/briq/init.c	2009-03-15 10:04:41 UTC (rev 4007)
@@ -28,6 +28,7 @@
 #include <ppc.h>
 #include <arch/io.h>
 #include <console/console.h>
+#include <uart8250.h>

void
 board_init(void)

Modified: trunk/coreboot-v2/src/northbridge/ibm/cpc710/cpc710_pci.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/ibm/cpc710/cpc710_pci.c	2009-03-15 09:55:17 UTC (rev 4006)
+++ trunk/coreboot-v2/src/northbridge/ibm/cpc710/cpc710_pci.c	2009-03-15 10:04:41 UTC (rev 4007)
@@ -1,5 +1,7 @@
 #include <stdint.h>
 #include <arch/io.h>
+#include <arch/pciconf.h>
+#include <delay.h>
 #include "cpc710.h"
 #include "cpc710_pci.h"