diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainboard/motorola/sandpoint/flash/amd800.c | 2 | ||||
| -rw-r--r-- | src/mainboard/motorola/sandpoint/flash/flash.c | 2 | ||||
| -rw-r--r-- | src/mainboard/motorola/sandpoint/nvram/nvram.c | 2 | ||||
| -rw-r--r-- | src/northbridge/motorola/mpc107/meminfo.c | 2 | ||||
| -rw-r--r-- | src/northbridge/motorola/mpc107/mpc107.c | 47 | ||||
| -rw-r--r-- | src/northbridge/motorola/mpc107/mpc107_smp.c | 9 | ||||
| -rw-r--r-- | src/pmc/altimus/mpc7410/mpc7410.c | 3 |
7 files changed, 37 insertions, 30 deletions
diff --git a/src/mainboard/motorola/sandpoint/flash/amd800.c b/src/mainboard/motorola/sandpoint/flash/amd800.c index 8623c0dfb6..a9064a3aba 100644 --- a/src/mainboard/motorola/sandpoint/flash/amd800.c +++ b/src/mainboard/motorola/sandpoint/flash/amd800.c @@ -3,7 +3,7 @@ /* This code is distributed without warranty under the GPL v2 (see COPYING) */ #include <types.h> -#include <printk.h> +#include <console/console.h> #include <stdlib.h> #include "../flash.h" diff --git a/src/mainboard/motorola/sandpoint/flash/flash.c b/src/mainboard/motorola/sandpoint/flash/flash.c index b9401ec9e6..be0d40cefe 100644 --- a/src/mainboard/motorola/sandpoint/flash/flash.c +++ b/src/mainboard/motorola/sandpoint/flash/flash.c @@ -4,7 +4,7 @@ #include <types.h> #include <string.h> -#include <printk.h> +#include <console/console.h> #include <stdlib.h> #include "../flash.h" diff --git a/src/mainboard/motorola/sandpoint/nvram/nvram.c b/src/mainboard/motorola/sandpoint/nvram/nvram.c index d715dee4ac..13735748b7 100644 --- a/src/mainboard/motorola/sandpoint/nvram/nvram.c +++ b/src/mainboard/motorola/sandpoint/nvram/nvram.c @@ -3,7 +3,7 @@ /* This code is distributed without warranty under the GPL v2 (see COPYING) */ #include <types.h> -#include <printk.h> +#include <console/console.h> #include <stdlib.h> #include "../nvram.h" diff --git a/src/northbridge/motorola/mpc107/meminfo.c b/src/northbridge/motorola/mpc107/meminfo.c index 7245fc419d..935a5e0ac8 100644 --- a/src/northbridge/motorola/mpc107/meminfo.c +++ b/src/northbridge/motorola/mpc107/meminfo.c @@ -18,7 +18,7 @@ * MA 02111-1307 USA */ -#include <printk.h> +#include <console/console.h> #include "mpc107.h" void diff --git a/src/northbridge/motorola/mpc107/mpc107.c b/src/northbridge/motorola/mpc107/mpc107.c index 76f368a9a5..ed02fb73d1 100644 --- a/src/northbridge/motorola/mpc107/mpc107.c +++ b/src/northbridge/motorola/mpc107/mpc107.c @@ -19,11 +19,12 @@ */ #include <bsp.h> #include <ppc.h> -#include <pci.h> +#include <types.h> +#include <device/pci.h> #include <mem.h> #include <types.h> #include <string.h> -#include <printk.h> +#include <console/console.h> #include <arch/io.h> #include "i2c.h" #include "mpc107.h" @@ -32,10 +33,8 @@ #define NUM_DIMMS 1 #define NUM_BANKS 2 -extern struct pci_ops pci_direct_ppc; - struct mem_range * -getmeminfo(void) +sizeram(void) { int i; sdram_dimm_info dimm[NUM_DIMMS]; @@ -99,6 +98,10 @@ hostbridge_config_memory(int no_banks, sdram_bank_info * bank, int for_real) u32 memend1, memend2; u32 extmemend1, extmemend2; u32 address; + struct device *dev; + + if ((dev = dev_find_slot(0, 0)) == NULL ) + return 0; /* Set up the ignore mask */ for(i = 0; i < no_banks; i++) @@ -146,9 +149,9 @@ hostbridge_config_memory(int no_banks, sdram_bank_info * bank, int for_real) } /* Read in configuration of port X */ - pci_direct_ppc.read_dword(0, 0, 0xf0, &mccr1); - pci_direct_ppc.read_dword(0, 0, 0xf4, &mccr2); - pci_direct_ppc.read_dword(0, 0, 0xfc, &mccr4); + mccr1 = pci_read_config32(dev, 0xf0); + mccr2 = pci_read_config32(dev, 0xf4); + mccr4 = pci_read_config32(dev, 0xfc); mccr1 &= 0xfff00000; mccr2 &= 0xffe00000; mccr3 = 0; @@ -265,20 +268,20 @@ hostbridge_config_memory(int no_banks, sdram_bank_info * bank, int for_real) if (for_real) { - pci_direct_ppc.write_byte(0, 0, 0xa0, bank_enable); - pci_direct_ppc.write_dword(0, 0, 0x80, memstart1); - pci_direct_ppc.write_dword(0, 0, 0x84, memstart2); - pci_direct_ppc.write_dword(0, 0, 0x88, extmemstart1); - pci_direct_ppc.write_dword(0, 0, 0x8c, extmemstart2); - pci_direct_ppc.write_dword(0, 0, 0x90, memend1); - pci_direct_ppc.write_dword(0, 0, 0x94, memend2); - pci_direct_ppc.write_dword(0, 0, 0x98, extmemend1); - pci_direct_ppc.write_dword(0, 0, 0x9c, extmemend2); - - pci_direct_ppc.write_dword(0, 0, 0xfc, mccr4); - pci_direct_ppc.write_dword(0, 0, 0xf8, mccr3); - pci_direct_ppc.write_dword(0, 0, 0xf4, mccr2); - pci_direct_ppc.write_dword(0, 0, 0xf0, mccr1); + pci_write_config8(dev, 0xa0, bank_enable); + pci_write_config32(dev, 0x80, memstart1); + pci_write_config32(dev, 0x84, memstart2); + pci_write_config32(dev, 0x88, extmemstart1); + pci_write_config32(dev, 0x8c, extmemstart2); + pci_write_config32(dev, 0x90, memend1); + pci_write_config32(dev, 0x94, memend2); + pci_write_config32(dev, 0x98, extmemend1); + pci_write_config32(dev, 0x9c, extmemend2); + + pci_write_config32(dev, 0xfc, mccr4); + pci_write_config32(dev, 0xf8, mccr3); + pci_write_config32(dev, 0xf4, mccr2); + pci_write_config32(dev, 0xf0, mccr1); } return address; diff --git a/src/northbridge/motorola/mpc107/mpc107_smp.c b/src/northbridge/motorola/mpc107/mpc107_smp.c index 408a87fddb..c23e686334 100644 --- a/src/northbridge/motorola/mpc107/mpc107_smp.c +++ b/src/northbridge/motorola/mpc107/mpc107_smp.c @@ -1,4 +1,5 @@ -#include <pci.h> +#include <types.h> +#include <device/pci.h> #include "mpc107.h" void @@ -10,8 +11,12 @@ unsigned long this_processors_id(void) { u32 pic1; + struct device *dev; - pcibios_read_config_dword(0, 0, MPC107_PIC1, &pic1); + if ((dev = dev_find_slot(0, 0)) == NULL) + return 0; + + pic1 = pci_read_config32(dev, MPC107_PIC1); return (pic1 & MPC107_PIC1_CF_MP_ID) >> 14; } diff --git a/src/pmc/altimus/mpc7410/mpc7410.c b/src/pmc/altimus/mpc7410/mpc7410.c index ee1dc4b096..29f65d796b 100644 --- a/src/pmc/altimus/mpc7410/mpc7410.c +++ b/src/pmc/altimus/mpc7410/mpc7410.c @@ -6,8 +6,7 @@ #include <ppcreg.h> #include <types.h> #include <string.h> -#include <pci.h> -#include <printk.h> +#include <console/console.h> #define ONEMEG 0x00100000 #define HALFMEG 0x00080000 |