Add this dependency to the Kconfig file to fix the following
build error when CONFIG_INTEGRATOR_AP is set but CONFIG_PCI
is not:
LD init/built-in.o
arch/arm/mach-integrator/built-in.o: In function `ap_map_io':
integrator_cp.c:(.init.text+0x570): undefined reference to `pci_v3_early_init'
make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2
Signed-off-by: Joerg Roedel <[email protected]>
---
arch/arm/mach-integrator/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index abeff25..be16569 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -9,6 +9,7 @@ config ARCH_INTEGRATOR_AP
select SERIAL_AMBA_PL010
select SERIAL_AMBA_PL010_CONSOLE
select SOC_BUS
+ depends on PCI
help
Include support for the ARM(R) Integrator/AP and
Integrator/PP2 platforms.
--
1.7.9.5
On Wed, Aug 14, 2013 at 09:50:18PM +0200, Joerg Roedel wrote:
> Add this dependency to the Kconfig file to fix the following
> build error when CONFIG_INTEGRATOR_AP is set but CONFIG_PCI
> is not:
No, integrator does not require PCI, so this needs to be fixed by other
means, such as finding out how the breakage was introduced, and fixing
the real cause of this regression.
On Wed, Aug 14, 2013 at 08:57:01PM +0100, Russell King - ARM Linux wrote:
> On Wed, Aug 14, 2013 at 09:50:18PM +0200, Joerg Roedel wrote:
> > Add this dependency to the Kconfig file to fix the following
> > build error when CONFIG_INTEGRATOR_AP is set but CONFIG_PCI
> > is not:
>
> No, integrator does not require PCI, so this needs to be fixed by other
> means, such as finding out how the breakage was introduced, and fixing
> the real cause of this regression.
You are right, just found out that this introduces a recursive
dependency while compiling another config:
arch/arm/Kconfig:1403:error: recursive dependency detected!
arch/arm/Kconfig:1403: symbol PCI depends on MIGHT_HAVE_PCI
arch/arm/Kconfig:108: symbol MIGHT_HAVE_PCI is selected by ARCH_INTEGRATOR_AP
arch/arm/mach-integrator/Kconfig:5: symbol ARCH_INTEGRATOR_AP depends on PCI
So when integrator does not depend on PCI this diff is more appropriate?
diff --git a/arch/arm/mach-integrator/pci_v3.h b/arch/arm/mach-integrator/pci_v3.h
index 755fd29..51738e0 100644
--- a/arch/arm/mach-integrator/pci_v3.h
+++ b/arch/arm/mach-integrator/pci_v3.h
@@ -1,2 +1,9 @@
-/* Simple oneliner include to the PCIv3 early init */
+/* Define PCIv3 early init */
+#ifdef CONFIG_PCI
extern int pci_v3_early_init(void);
+#else
+static inline int pci_v3_early_init(void)
+{
+ return 0;
+}
+#endif
On Wed, Aug 14, 2013 at 10:04 PM, Joerg Roedel <[email protected]> wrote:
> So when integrator does not depend on PCI this diff is more appropriate?
>
> diff --git a/arch/arm/mach-integrator/pci_v3.h b/arch/arm/mach-integrator/pci_v3.h
> index 755fd29..51738e0 100644
> --- a/arch/arm/mach-integrator/pci_v3.h
> +++ b/arch/arm/mach-integrator/pci_v3.h
> @@ -1,2 +1,9 @@
> -/* Simple oneliner include to the PCIv3 early init */
> +/* Define PCIv3 early init */
> +#ifdef CONFIG_PCI
> extern int pci_v3_early_init(void);
> +#else
> +static inline int pci_v3_early_init(void)
> +{
> + return 0;
> +}
> +#endif
Yes.
Reviewed-by: Linus Walleij <[email protected]>
And can you please create and send a proper patch with this
content to [email protected] and the mailing list on CC, with
a request for the ARM SoC maintainers to apply it directly
as a fix?
You might as well add Cc: [email protected] as well.
Yours,
Linus Walleij
On Wed, Aug 28, 2013 at 09:26:57AM +0200, Linus Walleij wrote:
> On Wed, Aug 14, 2013 at 10:04 PM, Joerg Roedel <[email protected]> wrote:
>
> > So when integrator does not depend on PCI this diff is more appropriate?
> >
> > diff --git a/arch/arm/mach-integrator/pci_v3.h b/arch/arm/mach-integrator/pci_v3.h
> > index 755fd29..51738e0 100644
> > --- a/arch/arm/mach-integrator/pci_v3.h
> > +++ b/arch/arm/mach-integrator/pci_v3.h
> > @@ -1,2 +1,9 @@
> > -/* Simple oneliner include to the PCIv3 early init */
> > +/* Define PCIv3 early init */
> > +#ifdef CONFIG_PCI
> > extern int pci_v3_early_init(void);
> > +#else
> > +static inline int pci_v3_early_init(void)
> > +{
> > + return 0;
> > +}
> > +#endif
>
> Yes.
> Reviewed-by: Linus Walleij <[email protected]>
>
> And can you please create and send a proper patch with this
> content to [email protected] and the mailing list on CC, with
> a request for the ARM SoC maintainers to apply it directly
> as a fix?
>
> You might as well add Cc: [email protected] as well.
Will do, thanks for your review.
Cheers,
Joerg
On Wed, Aug 28, 2013 at 09:26:57AM +0200, Linus Walleij wrote:
> Yes.
> Reviewed-by: Linus Walleij <[email protected]>
>
> And can you please create and send a proper patch with this
> content to [email protected] and the mailing list on CC, with
> a request for the ARM SoC maintainers to apply it directly
> as a fix?
>
> You might as well add Cc: [email protected] as well.
Okay, sorry, forgot about this one. But my compile-tests kindly reminded
me and I sent the patch out again now :)
Joerg