diff options
Diffstat (limited to 'board/amcc')
| -rw-r--r-- | board/amcc/bamboo/bamboo.c | 23 | ||||
| -rw-r--r-- | board/amcc/canyonlands/canyonlands.c | 19 | ||||
| -rw-r--r-- | board/amcc/ebony/ebony.c | 23 | ||||
| -rw-r--r-- | board/amcc/katmai/katmai.c | 21 | ||||
| -rw-r--r-- | board/amcc/luan/luan.c | 23 | ||||
| -rw-r--r-- | board/amcc/ocotea/ocotea.c | 24 | ||||
| -rw-r--r-- | board/amcc/sequoia/sequoia.c | 21 | ||||
| -rw-r--r-- | board/amcc/taishan/taishan.c | 23 | ||||
| -rw-r--r-- | board/amcc/yosemite/yosemite.c | 23 | ||||
| -rw-r--r-- | board/amcc/yucca/yucca.c | 21 | 
10 files changed, 0 insertions, 221 deletions
| diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c index 2598f2cf4..313f9f36a 100644 --- a/board/amcc/bamboo/bamboo.c +++ b/board/amcc/bamboo/bamboo.c @@ -603,29 +603,6 @@ void pci_master_init(struct pci_controller *hose)  }  #endif				/* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */ -/************************************************************************* - *  is_pci_host - * - *	This routine is called to determine if a pci scan should be - *	performed. With various hardware environments (especially cPCI and - *	PPMC) it's insufficient to depend on the state of the arbiter enable - *	bit in the strap register, or generic host/adapter assumptions. - * - *	Rather than hard-code a bad assumption in the general 440 code, the - *	440 pci code requires the board to decide at runtime. - * - *	Return 0 for adapter mode, non-zero for host (monarch) mode. - * - * - ************************************************************************/ -#if defined(CONFIG_PCI) -int is_pci_host(struct pci_controller *hose) -{ -	/* Bamboo is always configured as host. */ -	return (1); -} -#endif				/* defined(CONFIG_PCI) */ -  /*----------------------------------------------------------------------------+    | is_powerpc440ep_pass1.    +----------------------------------------------------------------------------*/ diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index 8ce6788d4..9a8ca8ece 100644 --- a/board/amcc/canyonlands/canyonlands.c +++ b/board/amcc/canyonlands/canyonlands.c @@ -364,25 +364,6 @@ void pci_target_init(struct pci_controller * hose )  #endif	/* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */  #if defined(CONFIG_PCI) -/* - * is_pci_host - * - * This routine is called to determine if a pci scan should be - * performed. With various hardware environments (especially cPCI and - * PPMC) it's insufficient to depend on the state of the arbiter enable - * bit in the strap register, or generic host/adapter assumptions. - * - * Rather than hard-code a bad assumption in the general 440 code, the - * 440 pci code requires the board to decide at runtime. - * - * Return 0 for adapter mode, non-zero for host (monarch) mode. - */ -int is_pci_host(struct pci_controller *hose) -{ -	/* Board is always configured as host. */ -	return (1); -} -  int board_pcie_first(void)  {  	/* diff --git a/board/amcc/ebony/ebony.c b/board/amcc/ebony/ebony.c index 0ca1accec..1524b5333 100644 --- a/board/amcc/ebony/ebony.c +++ b/board/amcc/ebony/ebony.c @@ -234,26 +234,3 @@ void pci_target_init(struct pci_controller *hose)  	out16r(PCIL0_CMD, in16r(PCIL0_CMD) | PCI_COMMAND_MEMORY);  }  #endif				/* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ - -/************************************************************************* - *  is_pci_host - * - *	This routine is called to determine if a pci scan should be - *	performed. With various hardware environments (especially cPCI and - *	PPMC) it's insufficient to depend on the state of the arbiter enable - *	bit in the strap register, or generic host/adapter assumptions. - * - *	Rather than hard-code a bad assumption in the general 440 code, the - *	440 pci code requires the board to decide at runtime. - * - *	Return 0 for adapter mode, non-zero for host (monarch) mode. - * - * - ************************************************************************/ -#if defined(CONFIG_PCI) -int is_pci_host(struct pci_controller *hose) -{ -	/* The ebony board is always configured as host. */ -	return (1); -} -#endif				/* defined(CONFIG_PCI) */ diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c index 34ecd994d..f43e76448 100644 --- a/board/amcc/katmai/katmai.c +++ b/board/amcc/katmai/katmai.c @@ -330,27 +330,6 @@ void pci_target_init(struct pci_controller * hose )  #endif	/* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */  #if defined(CONFIG_PCI) -/************************************************************************* - *  is_pci_host - * - *	This routine is called to determine if a pci scan should be - *	performed. With various hardware environments (especially cPCI and - *	PPMC) it's insufficient to depend on the state of the arbiter enable - *	bit in the strap register, or generic host/adapter assumptions. - * - *	Rather than hard-code a bad assumption in the general 440 code, the - *	440 pci code requires the board to decide at runtime. - * - *	Return 0 for adapter mode, non-zero for host (monarch) mode. - * - * - ************************************************************************/ -int is_pci_host(struct pci_controller *hose) -{ -	/* The katmai board is always configured as host. */ -	return 1; -} -  int board_pcie_card_present(int port)  {  	u32 val; diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c index a04f2af3b..94ba6437f 100644 --- a/board/amcc/luan/luan.c +++ b/board/amcc/luan/luan.c @@ -200,29 +200,6 @@ void pci_target_init(struct pci_controller *hose)  /************************************************************************* - *  is_pci_host - * - *	This routine is called to determine if a pci scan should be - *	performed. With various hardware environments (especially cPCI and - *	PPMC) it's insufficient to depend on the state of the arbiter enable - *	bit in the strap register, or generic host/adapter assumptions. - * - *	Rather than hard-code a bad assumption in the general 440 code, the - *	440 pci code requires the board to decide at runtime. - * - *	Return 0 for adapter mode, non-zero for host (monarch) mode. - * - * - ************************************************************************/ -#if defined(CONFIG_PCI) -int is_pci_host(struct pci_controller *hose) -{ -	return  1; -} -#endif				/* defined(CONFIG_PCI) */ - - -/*************************************************************************   *  hw_watchdog_reset   *   *	This routine is called to reset (keep alive) the watchdog timer diff --git a/board/amcc/ocotea/ocotea.c b/board/amcc/ocotea/ocotea.c index 0aa317ec0..2f64764ee 100644 --- a/board/amcc/ocotea/ocotea.c +++ b/board/amcc/ocotea/ocotea.c @@ -347,30 +347,6 @@ void pci_target_init(struct pci_controller * hose )  #endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ -/************************************************************************* - *  is_pci_host - * - *	This routine is called to determine if a pci scan should be - *	performed. With various hardware environments (especially cPCI and - *	PPMC) it's insufficient to depend on the state of the arbiter enable - *	bit in the strap register, or generic host/adapter assumptions. - * - *	Rather than hard-code a bad assumption in the general 440 code, the - *	440 pci code requires the board to decide at runtime. - * - *	Return 0 for adapter mode, non-zero for host (monarch) mode. - * - * - ************************************************************************/ -#if defined(CONFIG_PCI) -int is_pci_host(struct pci_controller *hose) -{ -    /* The ocotea board is always configured as host. */ -    return(1); -} -#endif /* defined(CONFIG_PCI) */ - -  void fpga_init(void)  {  	unsigned long group; diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index 00f640872..439382006 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -509,27 +509,6 @@ void pci_master_init(struct pci_controller *hose)  }  #endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */ -/* - * is_pci_host - * - * This routine is called to determine if a pci scan should be - * performed. With various hardware environments (especially cPCI and - * PPMC) it's insufficient to depend on the state of the arbiter enable - * bit in the strap register, or generic host/adapter assumptions. - * - * Rather than hard-code a bad assumption in the general 440 code, the - * 440 pci code requires the board to decide at runtime. - * - * Return 0 for adapter mode, non-zero for host (monarch) mode. - */ -#if defined(CONFIG_PCI) -int is_pci_host(struct pci_controller *hose) -{ -	/* Cactus is always configured as host. */ -	return (1); -} -#endif /* defined(CONFIG_PCI) */ -  #if defined(CONFIG_POST)  /*   * Returns 1 if keys pressed to start the power-on long-running tests diff --git a/board/amcc/taishan/taishan.c b/board/amcc/taishan/taishan.c index 0c20faf9a..81e8fe14a 100644 --- a/board/amcc/taishan/taishan.c +++ b/board/amcc/taishan/taishan.c @@ -279,29 +279,6 @@ void pci_target_init(struct pci_controller * hose )  }  #endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ -/************************************************************************* - *  is_pci_host - * - *	This routine is called to determine if a pci scan should be - *	performed. With various hardware environments (especially cPCI and - *	PPMC) it's insufficient to depend on the state of the arbiter enable - *	bit in the strap register, or generic host/adapter assumptions. - * - *	Rather than hard-code a bad assumption in the general 440 code, the - *	440 pci code requires the board to decide at runtime. - * - *	Return 0 for adapter mode, non-zero for host (monarch) mode. - * - * - ************************************************************************/ -#if defined(CONFIG_PCI) -int is_pci_host(struct pci_controller *hose) -{ -	/* The ocotea board is always configured as host. */ -	return(1); -} -#endif /* defined(CONFIG_PCI) */ -  #ifdef CONFIG_POST  /*   * Returns 1 if keys pressed to start the power-on long-running tests diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c index ccbeb0e7a..e416eeb16 100644 --- a/board/amcc/yosemite/yosemite.c +++ b/board/amcc/yosemite/yosemite.c @@ -490,29 +490,6 @@ void pci_master_init(struct pci_controller *hose)  #endif				/* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */  /************************************************************************* - *  is_pci_host - * - *	This routine is called to determine if a pci scan should be - *	performed. With various hardware environments (especially cPCI and - *	PPMC) it's insufficient to depend on the state of the arbiter enable - *	bit in the strap register, or generic host/adapter assumptions. - * - *	Rather than hard-code a bad assumption in the general 440 code, the - *	440 pci code requires the board to decide at runtime. - * - *	Return 0 for adapter mode, non-zero for host (monarch) mode. - * - * - ************************************************************************/ -#if defined(CONFIG_PCI) -int is_pci_host(struct pci_controller *hose) -{ -	/* Bamboo is always configured as host. */ -	return (1); -} -#endif				/* defined(CONFIG_PCI) */ - -/*************************************************************************   *  hw_watchdog_reset   *   *	This routine is called to reset (keep alive) the watchdog timer diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c index 649315581..7315033dc 100644 --- a/board/amcc/yucca/yucca.c +++ b/board/amcc/yucca/yucca.c @@ -658,27 +658,6 @@ void pci_target_init(struct pci_controller * hose )  #endif	/* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */  #if defined(CONFIG_PCI) -/************************************************************************* - *  is_pci_host - * - *	This routine is called to determine if a pci scan should be - *	performed. With various hardware environments (especially cPCI and - *	PPMC) it's insufficient to depend on the state of the arbiter enable - *	bit in the strap register, or generic host/adapter assumptions. - * - *	Rather than hard-code a bad assumption in the general 440 code, the - *	440 pci code requires the board to decide at runtime. - * - *	Return 0 for adapter mode, non-zero for host (monarch) mode. - * - * - ************************************************************************/ -int is_pci_host(struct pci_controller *hose) -{ -	/* The yucca board is always configured as host. */ -	return 1; -} -  int board_pcie_card_present(int port)  {  	u16 reg; |