diff options
| author | Wolfgang Denk <[email protected]> | 2009-10-27 20:56:31 +0100 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2009-10-27 20:56:31 +0100 |
| commit | 98cecb610f3fa53aa7d825a634d35ef9cf6c5487 (patch) | |
| tree | f9a153be5ec31919981e4d53e5ee274cffa3d15b /include/asm-ppc | |
| parent | a747a7f31059b9069e97c78bba5496409c33aa05 (diff) | |
| parent | 3fca80375981fe83d4674a0267183b469a1ea7ff (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/config.h | 10 | ||||
| -rw-r--r-- | include/asm-ppc/fsl_pci.h | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h index eba79010b15..af0853b0d7e 100644 --- a/include/asm-ppc/config.h +++ b/include/asm-ppc/config.h @@ -47,6 +47,16 @@ #define CONFIG_MAX_CPUS 1 #endif +/* + * Provide a default boot page translation virtual address that lines up with + * Freescale's default e500 reset page. + */ +#if (defined(CONFIG_E500) && defined(CONFIG_MP)) +#ifndef CONFIG_BPTR_VIRT_ADDR +#define CONFIG_BPTR_VIRT_ADDR 0xfffff000 +#endif +#endif + /* Relocation to SDRAM works on all PPC boards */ #define CONFIG_RELOC_FIXUP_WORKS diff --git a/include/asm-ppc/fsl_pci.h b/include/asm-ppc/fsl_pci.h index 2790da7ed16..6b0c89bd3f3 100644 --- a/include/asm-ppc/fsl_pci.h +++ b/include/asm-ppc/fsl_pci.h @@ -62,6 +62,7 @@ typedef struct pci_inbound_window { #define PIWAR_LOCAL 0x00f00000 #define PIWAR_READ_SNOOP 0x00050000 #define PIWAR_WRITE_SNOOP 0x00005000 +#define PIWAR_IWS_4K 0x0000000b u32 res2[3]; } pit_t; @@ -171,7 +172,7 @@ struct fsl_pci_info { }; int fsl_pci_init_port(struct fsl_pci_info *pci_info, - struct pci_controller *hose, int busno); + struct pci_controller *hose, int busno, int pcie_ep); #define SET_STD_PCI_INFO(x, num) \ { \ |