Skip to contentSkip to conversation

integrator: stop calling pci_init() twice

PATCH New Linus Walleij 2 participants 2 messages Jan 21, 2012 – Feb 18, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 integrator: stop calling pci_init() twice

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.

---
 board/armltd/integrator/integrator.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
board/armltd/integrator/integrator.c +0 -3
index a507c09..4658ac1 100644
@@ -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);
 }
Signature · 1 line
1.7.7.5
#1 lore raw

PATCH 1/1 integrator: stop calling pci_init() twice

Hi Linus,

Le 22/01/2012 00:13, Linus Walleij a ?crit :

Quoted 14 lines

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.

---
  board/armltd/integrator/integrator.c |    3 ---
  1 files changed, 0 insertions(+), 3 deletions(-)
board/armltd/integrator/integrator.c +0 -0
index a507c09..4658ac1 100644

board/armltd/integrator/integrator.c extern void cm_remap(void); · line 120

Quoted 9 lines
board/armltd/integrator/integrator.c +0 -3
@@ -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,

Signature · 1 line
Albert.