From: Matthew McClintock Date: Mon, 25 Apr 2011 19:10:35 +0000 (-0500) Subject: powerpc/85xx: Don't set FT_FSL_PCI_SETUP if CONFIG_PCI is not set X-Git-Tag: v2011.06-rc1~89^2~14 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ae425c1ecaff40111720f2f81817d8939c2c7395;p=u-boot powerpc/85xx: Don't set FT_FSL_PCI_SETUP if CONFIG_PCI is not set 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. Signed-off-by: Matthew McClintock Signed-off-by: Kumar Gala --- diff --git a/arch/powerpc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h index 82d75bef6a..fc47a9f7ec 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; \