From: Matthias Fuchs Date: Mon, 7 Sep 2009 15:00:40 +0000 (+0200) Subject: ppc4xx: Allow overwriting pci target registers for all 4xx boards X-Git-Tag: v2009.11-rc1~163 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=99bcf14d553f399148a7660b98f7acbd8cc72d80;p=u-boot ppc4xx: Allow overwriting pci target registers for all 4xx boards This patch adds the CONFIG_PCI_4xx_PTM_OVERWRITE option and replaces the ugly 'if defined(BOARD1) || ... || defined(BOARDn)' construct in 4xx pci code. When CONFIG_PCI_4xx_PTM_OVERWRITE is defined the default ptm register setup can be overwritten through environment variables ptm1la, ptm1ms, ptm2la and ptm2ms to do application specific pci target BAR configuration. Signed-off-by: Matthias Fuchs Signed-off-by: Stefan Roese --- diff --git a/cpu/ppc4xx/4xx_pci.c b/cpu/ppc4xx/4xx_pci.c index 5d7d59c0ea..184cef5d11 100644 --- a/cpu/ppc4xx/4xx_pci.c +++ b/cpu/ppc4xx/4xx_pci.c @@ -138,7 +138,7 @@ void pci_405gp_init(struct pci_controller *hose) unsigned short temp_short; unsigned long ptmpcila[2] = {CONFIG_SYS_PCI_PTM1PCI, CONFIG_SYS_PCI_PTM2PCI}; -#if defined(CONFIG_CPCI405) || defined(CONFIG_PMC405) +#if defined(CONFIG_PCI_4xx_PTM_OVERWRITE) char *ptmla_str, *ptmms_str; #endif unsigned long ptmla[2] = {CONFIG_SYS_PCI_PTM1LA, CONFIG_SYS_PCI_PTM2LA}; @@ -160,7 +160,7 @@ void pci_405gp_init(struct pci_controller *hose) #endif #endif -#if defined(CONFIG_CPCI405) || defined(CONFIG_PMC405) +#if defined(CONFIG_PCI_4xx_PTM_OVERWRITE) ptmla_str = getenv("ptm1la"); ptmms_str = getenv("ptm1ms"); if(NULL != ptmla_str && NULL != ptmms_str ) {