From fbb0b559ae564d80b5ea3199ad530aa0e419a668 Mon Sep 17 00:00:00 2001 From: Marian Balakowicz Date: Tue, 4 Jul 2006 00:55:47 +0200 Subject: Add system memory to the PCI region list for AMCC PPC44x CPUs. Enabled it for Yucca board. --- CHANGELOG | 3 +++ cpu/ppc4xx/405gp_pci.c | 13 +++++++++++++ include/configs/yucca.h | 5 +++++ 3 files changed, 21 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 8081859..afd34f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,9 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Add system memory to the PCI region list for AMCC PPC44x CPUs. + Enabled it for Yucca board. + * Cleanup config file and bootup output for Yucca board. * Fix CONFIG_440_GX define usage. diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/405gp_pci.c index 0ccb3d8..cf5eccb 100644 --- a/cpu/ppc4xx/405gp_pci.c +++ b/cpu/ppc4xx/405gp_pci.c @@ -465,17 +465,30 @@ void pci_440_init (struct pci_controller *hose) hose->first_busno = 0; hose->last_busno = 0xff; + /* PCI I/O space */ pci_set_region(hose->regions + reg_num++, 0x00000000, PCIX0_IOBASE, 0x10000, PCI_REGION_IO); + /* PCI memory space */ pci_set_region(hose->regions + reg_num++, CFG_PCI_TARGBASE, CFG_PCI_MEMBASE, 0x10000000, PCI_REGION_MEM ); + +#if defined(CONFIG_PCI_SYS_MEM_BUS) && defined(CONFIG_PCI_SYS_MEM_PHYS) && \ + defined(CONFIG_PCI_SYS_MEM_SIZE) + /* System memory space */ + pci_set_region(hose->regions + reg_num++, + CONFIG_PCI_SYS_MEM_BUS, + CONFIG_PCI_SYS_MEM_PHYS, + CONFIG_PCI_SYS_MEM_SIZE, + PCI_REGION_MEM | PCI_REGION_MEMORY ); +#endif + hose->region_count = reg_num; pci_setup_indirect(hose, PCIX0_CFGADR, PCIX0_CFGDATA); diff --git a/include/configs/yucca.h b/include/configs/yucca.h index be2e7db..e6d9843 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -75,6 +75,11 @@ /* #define CFG_PCI_BASE_REGS 0xBEC00000 */ /* internal PCI regs */ /* #define CFG_PCI_BASE_CYCLE 0xBED00000 */ /* internal PCI regs */ +/* System RAM mapped to PCI space */ +#define CONFIG_PCI_SYS_MEM_BUS CFG_SDRAM_BASE +#define CONFIG_PCI_SYS_MEM_PHYS CFG_SDRAM_BASE +#define CONFIG_PCI_SYS_MEM_SIZE (1024 * 1024 * 1024) + #define CFG_FPGA_BASE 0xe2000000 /* epld */ #define CFG_OPER_FLASH 0xe7000000 /* SRAM - OPER Flash */ -- cgit v1.1