Skip to contentSkip to conversation

mpc83xx: fix 837x MDS PCI HOST build

PATCH New Kim Phillips 3 participants 7 messages Sep 30, 2010 – Oct 18, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mpc83xx: fix 837x MDS PCI HOST build

commit 6aa3d3bfaa986f1aff5e21a9b9f68d087715b1a9
"83xx: Remove warmboot parameter from PCI init functions" missed one mpc83xx_pcie_init callsite, causing this build error:

Configuring for MPC837XEMDS_HOST board...
pci.c: In function 'pci_init_board':
pci.c:141: error: too many arguments to function 'mpc83xx_pcie_init'

this patch extends the commit to include that callsite.

---
 board/freescale/mpc837xemds/pci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
board/freescale/mpc837xemds/pci.c +1 -1
index 77c5bda..edb3ff0 100644
@@ -138,7 +138,7 @@ skip_pci:
 	out_be32(&pcie_law[1].bar, CONFIG_SYS_PCIE2_BASE & LAWBAR_BAR);
 	out_be32(&pcie_law[1].ar, LBLAWAR_EN | LBLAWAR_512MB);
 
-	mpc83xx_pcie_init(pex2 ? 1 : 2, pcie_reg, 0);
+	mpc83xx_pcie_init(pex2 ? 1 : 2, pcie_reg);
 }
 
 void ft_pcie_fixup(void *blob, bd_t *bd)
Signature · 1 line
1.7.3
#1 lore raw

PATCH 1/1 mpc83xx: fix 837x MDS PCI HOST build

Quoted 9 lines · Kim Phillips

commit 6aa3d3bfaa986f1aff5e21a9b9f68d087715b1a9
"83xx: Remove warmboot parameter from PCI init functions" missed one mpc83xx_pcie_init callsite, causing this build error:

Configuring for MPC837XEMDS_HOST board...
pci.c: In function 'pci_init_board':
pci.c:141: error: too many arguments to function 'mpc83xx_pcie_init'

this patch extends the commit to include that callsite.

Thanks for catching that. Should the MPC837XEMDS MAKEALL target be changed to MPC837XEMDS_HOST to include coverage of its PCI code? I tried running ./MAKEALL 83xx prior to submitting the offending change, but didn't catch this issue. Same for the MPC832XEMDS?

Regards,
Peter

#2 lore raw

PATCH 1/1 mpc83xx: fix 837x MDS PCI HOST build

Quoted 5 lines · On Thu, 30 Sep 2010 14:09:11 -0500 Peter Tyser <[email protected]> wrote:
Quoted 4 lines · Kim Phillips

commit 6aa3d3bfaa986f1aff5e21a9b9f68d087715b1a9
"83xx: Remove warmboot parameter from PCI init functions" missed one mpc83xx_pcie_init callsite, causing this build error:

Quoted 8 lines
Quoted 5 lines

Configuring for MPC837XEMDS_HOST board...
pci.c: In function 'pci_init_board':
pci.c:141: error: too many arguments to function 'mpc83xx_pcie_init'

this patch extends the commit to include that callsite.

Thanks for catching that. Should the MPC837XEMDS MAKEALL target be changed to MPC837XEMDS_HOST to include coverage of its PCI code? I

either that or the makeall code that uses boards.cfg could be extended to do certain board build variants...needs looking into.

Quoted 2 lines

tried running ./MAKEALL 83xx prior to submitting the offending change, but didn't catch this issue. Same for the MPC832XEMDS?

the 832x mds looks ok to me.

Kim

#3 lore raw

PATCH 1/1 mpc83xx: fix 837x MDS PCI HOST build

Dear Kim Phillips,

Quoted 6 lines · In message <[email protected]> you wrote:
Quoted 3 lines

Thanks for catching that. Should the MPC837XEMDS MAKEALL target be changed to MPC837XEMDS_HOST to include coverage of its PCI code? I

either that or the makeall code that uses boards.cfg could be extended to do certain board build variants...needs looking into.

boards.cfg is supposed to have a single line entry for each supported board configuration.

If you have several board build variants, then please use separate entries in boards.cfg for each of them (and see previous discussion about how config params should be passed).

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
When you die, the first thing you lose is your life. The  next  thing
is the illusions.                       - Terry Pratchett, _Pyramids_
#4 lore raw

PATCH 1/1 mpc83xx: fix 837x MDS PCI HOST build

In reply to Peter Tyser

Dear Peter Tyser,

Quoted 9 lines · In message <1285873751.28947.19984.camel@petert> you wrote:
Quoted 9 lines

commit 6aa3d3bfaa986f1aff5e21a9b9f68d087715b1a9
"83xx: Remove warmboot parameter from PCI init functions" missed one mpc83xx_pcie_init callsite, causing this build error:

Configuring for MPC837XEMDS_HOST board...
pci.c: In function 'pci_init_board':
pci.c:141: error: too many arguments to function 'mpc83xx_pcie_init'

Quoted 6 lines
Quoted 1 line

this patch extends the commit to include that callsite.

Thanks for catching that. Should the MPC837XEMDS MAKEALL target be changed to MPC837XEMDS_HOST to include coverage of its PCI code? I tried running ./MAKEALL 83xx prior to submitting the offending change, but didn't catch this issue. Same for the MPC832XEMDS?

Not needed any more. The new MAKEALL auto-generates the list of board configurations from boards.cfg, so we don't miss such cases any longer.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"I like your game but we have to change the rules."
#5 lore raw

PATCH 1/1 mpc83xx: fix 837x MDS PCI HOST build

In reply to Kim Phillips
Quoted 4 lines · On Thu, 30 Sep 2010 13:40:34 -0500 Kim Phillips <[email protected]>…

commit 6aa3d3bfaa986f1aff5e21a9b9f68d087715b1a9
"83xx: Remove warmboot parameter from PCI init functions" missed one mpc83xx_pcie_init callsite, causing this build error:

Quoted 8 lines

Configuring for MPC837XEMDS_HOST board...
pci.c: In function 'pci_init_board':
pci.c:141: error: too many arguments to function 'mpc83xx_pcie_init'

this patch extends the commit to include that callsite.

---

applied to u-boot-mpc83xx master.

Kim

#6 lore raw

PATCH 1/1 mpc83xx: fix 837x MDS PCI HOST build

In reply to Kim Phillips

Dear Kim Phillips,

Quoted 8 lines · In message <[email protected]> you wrote:

commit 6aa3d3bfaa986f1aff5e21a9b9f68d087715b1a9
"83xx: Remove warmboot parameter from PCI init functions" missed one mpc83xx_pcie_init callsite, causing this build error:

Configuring for MPC837XEMDS_HOST board...
pci.c: In function 'pci_init_board':
pci.c:141: error: too many arguments to function 'mpc83xx_pcie_init'

Quoted 6 lines

this patch extends the commit to include that callsite.

---
 board/freescale/mpc837xemds/pci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Applied directly, hope this is OK with you. Thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Cigarette, n.: A fire at one end, a fool at the other, and a  bit  of
tobacco in between.