svn commit: r297392 - in head/sys: conf dev/ofw powerpc/mpc85xx powerpc/powermac powerpc/pseries

[Zbigniew Bodek]

Hello Ed,

Please check out the attached patch. For powerpc we should compile-in
ofwpci.c regardless of FDT option.
However, it seems that LINT for powerpc does not have FDT. What do you
thing about adding it (as can be seen in the attached patch)?. This would
be done in a separate commit.

Best regards
zbb

2016-03-30 1:53 GMT+02:00 Ed Maste <emaste at freebsd.org>:

> On 29 March 2016 at 15:19, Zbigniew Bodek <zbb at freebsd.org> wrote:
> > Author: zbb
> > Date: Tue Mar 29 15:19:56 2016
> > New Revision: 297392
> > URL: https://svnweb.freebsd.org/changeset/base/297392
> >
> > Log:
> >   Reduce OFW PCI code duplication - involves ARM, PPC and SPARC64
>
> My 'make tinderbox' build is now failing (powerpc LINT) with:
>
> linking kernel
> cpcht.o: In function `cpcht_attach':
> cpcht.c:(.text+0x17dc): undefined reference to `ofw_pci_attach'
> cpcht.o:(.data.rel+0x0): undefined reference to `ofw_pci_driver'
> grackle.o: In function `grackle_attach':
> grackle.c:(.text+0x2dc): undefined reference to `ofw_pci_attach'
> grackle.o:(.data.rel+0x0): undefined reference to `ofw_pci_driver'
> uninorthpci.o: In function `uninorth_attach':
> uninorthpci.c:(.text+0x68c): undefined reference to `ofw_pci_attach'
> uninorthpci.o:(.data.rel+0x0): undefined reference to `ofw_pci_driver'
> *** [kernel] Error code 1
> _______________________________________________
> svn-src-all at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"
>
-------------- next part --------------
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index e39343b..d2e8e3b 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -57,7 +57,7 @@ dev/ofw/ofw_console.c		optional	aim
 dev/ofw/ofw_disk.c		optional	ofwd aim
 dev/ofw/ofw_iicbus.c		optional	iicbus aim
 dev/ofw/ofwbus.c		optional	aim | fdt
-dev/ofw/ofwpci.c		optional 	fdt pci
+dev/ofw/ofwpci.c		optional 	pci
 dev/ofw/ofw_standard.c		optional	aim powerpc
 dev/ofw/ofw_subr.c		optional	aim powerpc
 dev/powermac_nvram/powermac_nvram.c optional	powermac_nvram powermac
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 75e774f..b00def4 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -46,6 +46,7 @@ options 	POWERMAC		#NewWorld Apple PowerMacs
 options 	PSIM			#GDB PSIM ppc simulator
 options 	MAMBO			#IBM Mambo Full System Simulator
 
+options 	FDT
 options 	SC_OFWFB		# OFW frame buffer
 
 # The cpufreq(4) driver provides support for CPU frequency control