ppc4xx: Remove duplicated is_pci_host() functions
PATCH 1/1 ppc4xx: Remove duplicated is_pci_host() functions
This patch introduces a weak default function for is_pci_host(), returning 1. This is the default behaviour, since most boards only implement PCI host functionality. This weak default can be overridden by a board specific version if needed.
--- board/amcc/bamboo/bamboo.c | 23 ----------------------- board/amcc/canyonlands/canyonlands.c | 19 ------------------- board/amcc/ebony/ebony.c | 23 ----------------------- board/amcc/katmai/katmai.c | 21 --------------------- board/amcc/luan/luan.c | 23 ----------------------- board/amcc/ocotea/ocotea.c | 24 ------------------------ board/amcc/sequoia/sequoia.c | 21 --------------------- board/amcc/taishan/taishan.c | 23 ----------------------- board/amcc/yosemite/yosemite.c | 23 ----------------------- board/amcc/yucca/yucca.c | 21 --------------------- board/esd/du440/du440.c | 21 --------------------- board/esd/pmc440/pmc440.c | 2 +- board/gdsys/gdppc440etx/gdppc440etx.c | 22 ---------------------- board/gdsys/intip/intip.c | 21 --------------------- board/korat/korat.c | 21 --------------------- board/lwmon5/lwmon5.c | 23 ----------------------- board/netstal/hcu5/hcu5.c | 19 ------------------- board/pcs440ep/pcs440ep.c | 23 ----------------------- board/prodrive/alpr/alpr.c | 2 +- board/prodrive/p3p440/p3p440.c | 2 +- board/sandburst/common/sb_common.c | 13 ------------- board/xes/xpedite1000/xpedite1000.c | 2 ++ cpu/ppc4xx/4xx_pci.c | 20 ++++++++++++++++++++ 23 files changed, 25 insertions(+), 387 deletions(-)
board/amcc/bamboo/bamboo.c +0 -23
@@ -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. +----------------------------------------------------------------------------*/
board/amcc/canyonlands/canyonlands.c +0 -19
@@ -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 ) {/*
board/amcc/ebony/ebony.c +0 -23
@@ -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) */
board/amcc/katmai/katmai.c +0 -21
@@ -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;
board/amcc/luan/luan.c +0 -23
@@ -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
board/amcc/ocotea/ocotea.c +0 -24
@@ -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;
board/amcc/sequoia/sequoia.c +0 -21
@@ -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
board/amcc/taishan/taishan.c +0 -23
@@ -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
board/amcc/yosemite/yosemite.c +0 -23
@@ -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
board/amcc/yucca/yucca.c +0 -21
@@ -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;
board/esd/du440/du440.c +0 -21
@@ -498,27 +498,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) -{ -/* always configured as host. */ -return (1 ); -} -#endif /* defined(CONFIG_PCI) */ -int last_stage_init (void ) {int e, i;
board/esd/pmc440/pmc440.c +1 -1
@@ -712,7 +712,7 @@ static void wait_for_pci_ready(void) }/* -* is_pci_host +* Override weak is_pci_host() * * This routine is called to determine if a pci scan should be * performed. With various hardware environments (especially cPCI and
board/gdsys/gdppc440etx/gdppc440etx.c +0 -22
@@ -299,25 +299,3 @@ void pci_master_init(struct pci_controller *hose) PCI_COMMAND_MEMORY); }#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) -{ -return 1 ; -} -#endif /* defined(CONFIG_PCI) */
board/gdsys/intip/intip.c +0 -21
@@ -178,27 +178,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 ; -} -#endif /* CONFIG_PCI */ -int board_early_init_r (void ) {/*
board/korat/korat.c +0 -21
@@ -748,27 +748,6 @@ void pci_master_init(struct pci_controller *hose) }#endif -/* -* 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) -{ -/* Korat 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
board/lwmon5/lwmon5.c +0 -23
@@ -412,29 +412,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) */ -void hw_watchdog_reset (void ) {int val;
board/netstal/hcu5/hcu5.c +0 -19
@@ -460,25 +460,6 @@ void pci_master_init(struct pci_controller *hose) temp_short |PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY); } - -/* -* 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) -{ -return 1 ; -}#endif /* defined(CONFIG_PCI) */ #if defined(CONFIG_POST )
board/pcs440ep/pcs440ep.c +0 -23
@@ -688,29 +688,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) -{ -/* PCS440EP 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
board/prodrive/alpr/alpr.c +1 -1
@@ -218,7 +218,7 @@ void pci_target_init(struct pci_controller * hose )#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ /************************************************************************* -* is_pci_host +* Override weak is_pci_host() * * This routine is called to determine if a pci scan should be * performed. With various hardware environments (especially cPCI and
board/prodrive/p3p440/p3p440.c +1 -1
@@ -235,7 +235,7 @@ void pci_target_init(struct pci_controller *hose)#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ /************************************************************************* -* is_pci_host +* Override weak is_pci_host() * * This routine is called to determine if a pci scan should be * performed. With various hardware environments (especially cPCI and
board/sandburst/common/sb_common.c +0 -13
@@ -373,19 +373,6 @@ void pci_target_init(struct pci_controller * hose )/************************************************************************* -* is_pci_host -* -* -************************************************************************/ -#if defined(CONFIG_PCI ) -int is_pci_host (struct pci_controller *hose) -{ -/* The metrobox is always configured as host. */ -return (1 ); -} -#endif /* defined(CONFIG_PCI) */ - -/************************************************************************* * board_get_enetaddr * * Get the ethernet MAC address for the management ethernet from the
board/xes/xpedite1000/xpedite1000.c +2 -0
@@ -200,6 +200,8 @@ void pci_target_init(struct pci_controller * hose)#if defined(CONFIG_PCI )/* +* Override weak 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
cpu/ppc4xx/4xx_pci.c +20 -0
@@ -478,6 +478,26 @@ void pci_init_board(void)static struct pci_controller ppc440_hose = {0 }; +/* +* 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. +* +* Weak default implementation: "Normal" boards implement the PCI +* host functionality. This can be overridden for PCI adapter boards. +*/ +int __is_pci_host (struct pci_controller *hose) +{ +return 1 ; +} +int is_pci_host (struct pci_controller *hose) + __attribute__((weak,alias ("__is_pci_host" )));int pci_440_init (struct pci_controller *hose) {
Signature · 1 line
1.6.5.1
PATCH 1/1 ppc4xx: Remove duplicated is_pci_host() functions
Quoted 4 lines · On Thursday 29 October 2009 18:47:05 Stefan Roese wrote:
This patch introduces a weak default function for
is_pci_host(), returning 1. This is the default behaviour, since most boards only implement PCI host functionality. This weak default can be overridden by a board specific version if needed.
Applied to u-boot-ppc4xx/next. Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de