[U-Boot] [PATCH] 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.
Signed-off-by: Kim Phillips kim.phillips@freescale.com --- board/freescale/mpc837xemds/pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c index 77c5bda..edb3ff0 100644 --- a/board/freescale/mpc837xemds/pci.c +++ b/board/freescale/mpc837xemds/pci.c @@ -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)
On Thu, 2010-09-30 at 13:40 -0500, Kim Phillips 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'
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
On Thu, 30 Sep 2010 14:09:11 -0500 Peter Tyser ptyser@xes-inc.com wrote:
On Thu, 2010-09-30 at 13:40 -0500, Kim Phillips 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'
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.
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
Dear Kim Phillips,
In message 20100930141517.92dacbb7.kim.phillips@freescale.com you wrote:
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
Dear Peter Tyser,
In message 1285873751.28947.19984.camel@petert 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'
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
On Thu, 30 Sep 2010 13:40:34 -0500 Kim Phillips kim.phillips@freescale.com 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'
this patch extends the commit to include that callsite.
Signed-off-by: Kim Phillips kim.phillips@freescale.com
applied to u-boot-mpc83xx master.
Kim
Dear Kim Phillips,
In message 20100930134034.7dab7977.kim.phillips@freescale.com 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'
this patch extends the commit to include that callsite.
Signed-off-by: Kim Phillips kim.phillips@freescale.com
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
participants (3)
-
Kim Phillips -
Peter Tyser -
Wolfgang Denk