Patchwork [U-Boot] integrator: stop calling pci_init() twice

login
register
mail settings
Submitter Linus Walleij
Date Jan. 21, 2012, 11:13 p.m.
Message ID <1327187599-26076-1-git-send-email-linus.walleij@linaro.org>
Download mbox | patch
Permalink /patch/137216/
State Accepted
Commit 4ae6a91a86279c78c773f570057919dffecee484
Delegated to: Albert ARIBAUD
Headers show

Comments

Linus Walleij - Jan. 21, 2012, 11:13 p.m.
The U-Boot startup infrastructure already makes sure pci_init() is
called at a proper time, calling it again from within the board
setup code will not make things better.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 board/armltd/integrator/integrator.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
Albert ARIBAUD - Feb. 18, 2012, 11:22 a.m.
Hi Linus,

Le 22/01/2012 00:13, Linus Walleij a écrit :
> The U-Boot startup infrastructure already makes sure pci_init() is
> called at a proper time, calling it again from within the board
> setup code will not make things better.
>
> Signed-off-by: Linus Walleij<linus.walleij@linaro.org>
> ---
>   board/armltd/integrator/integrator.c |    3 ---
>   1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
> index a507c09..4658ac1 100644
> --- a/board/armltd/integrator/integrator.c
> +++ b/board/armltd/integrator/integrator.c
> @@ -115,9 +115,6 @@ extern void cm_remap(void);
>
>   int misc_init_r (void)
>   {
> -#ifdef CONFIG_PCI
> -	pci_init();
> -#endif
>   	setenv("verify", "n");
>   	return (0);
>   }

Applied to u-boot-arm/master as a potential bug fix.

Amicalement,

Patch

diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index a507c09..4658ac1 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -115,9 +115,6 @@  extern void cm_remap(void);
 
 int misc_init_r (void)
 {
-#ifdef CONFIG_PCI
-	pci_init();
-#endif
 	setenv("verify", "n");
 	return (0);
 }