| Message ID | 1303758635-9469-1-git-send-email-msm@freescale.com |
|---|---|
| State | Accepted |
| Commit | ae425c1ecaff40111720f2f81817d8939c2c7395 |
| Delegated to: | Kumar Gala |
| Headers | show |
On Apr 25, 2011, at 2:10 PM, Matthew McClintock wrote: > A lot of boards set FT_FSL_PCI_SETUP directly in their board code > and don't check to see if CONFIG_PCI is actually defined. This > will cause the board compilation to fail if CONFIG_PCI is not > defined. The p1022ds board is one such example. > > Instead of fixing every board this patch wraps FT_FSL_PCI_SETUP > around CONFIG_PCI so we can remove CONFIG_PCI and boards will > still build properly. > > cc: Kumar Gala <kumar.gala@freescale.com> > Signed-off-by: Matthew McClintock <msm@freescale.com> > --- > arch/powerpc/include/asm/fsl_pci.h | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) applied to 85xx - k
diff --git a/arch/powerpc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h index 82d75be..fc47a9f 100644 --- a/arch/powerpc/include/asm/fsl_pci.h +++ b/arch/powerpc/include/asm/fsl_pci.h @@ -230,7 +230,9 @@ int fsl_pcie_init_board(int busno); #define FT_FSL_PCIE3_SETUP __FT_FSL_PCIE_SETUP(blob, FSL_PCIE_COMPAT, 3) #define FT_FSL_PCIE4_SETUP __FT_FSL_PCIE_SETUP(blob, FSL_PCIE_COMPAT, 4) -#if defined(CONFIG_FSL_CORENET) +#if !defined(CONFIG_PCI) +#define FT_FSL_PCI_SETUP +#elif defined(CONFIG_FSL_CORENET) #define FSL_PCIE_COMPAT "fsl,p4080-pcie" #define FT_FSL_PCI_SETUP \ FT_FSL_PCIE1_SETUP; \
A lot of boards set FT_FSL_PCI_SETUP directly in their board code and don't check to see if CONFIG_PCI is actually defined. This will cause the board compilation to fail if CONFIG_PCI is not defined. The p1022ds board is one such example. Instead of fixing every board this patch wraps FT_FSL_PCI_SETUP around CONFIG_PCI so we can remove CONFIG_PCI and boards will still build properly. cc: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Matthew McClintock <msm@freescale.com> --- arch/powerpc/include/asm/fsl_pci.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)