Date: Sat, 9 Sep 2017 13:57:49 -0600 From: Sean Bruno <sbruno@freebsd.org> To: Warner Losh <imp@bsdimp.com> Cc: src-committers <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r323371 - head/sys/conf Message-ID: <67e6ff1d-e552-7b3a-e1ea-4e21867d7602@freebsd.org> In-Reply-To: <CANCZdfpDpGza3bag=1syB3V0sqG-eSq=M2wP--0e7YyGmSuDAA@mail.gmail.com> References: <201709091919.v89JJE8Z075009@repo.freebsd.org> <CANCZdfpDpGza3bag=1syB3V0sqG-eSq=M2wP--0e7YyGmSuDAA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --lNmPICpLFC8TD0hLfJSMNX0G62GAgn1JT Content-Type: multipart/mixed; boundary="oWOsgCogkfsiSNU8pbOlPQImQKsGG87rw"; protected-headers="v1" From: Sean Bruno <sbruno@freebsd.org> To: Warner Losh <imp@bsdimp.com> Cc: src-committers <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Message-ID: <67e6ff1d-e552-7b3a-e1ea-4e21867d7602@freebsd.org> Subject: Re: svn commit: r323371 - head/sys/conf References: <201709091919.v89JJE8Z075009@repo.freebsd.org> <CANCZdfpDpGza3bag=1syB3V0sqG-eSq=M2wP--0e7YyGmSuDAA@mail.gmail.com> In-Reply-To: <CANCZdfpDpGza3bag=1syB3V0sqG-eSq=M2wP--0e7YyGmSuDAA@mail.gmail.com> --oWOsgCogkfsiSNU8pbOlPQImQKsGG87rw Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 09/09/17 13:51, Warner Losh wrote: >=20 >=20 > On Sat, Sep 9, 2017 at 1:19 PM, Sean Bruno <sbruno@freebsd.org > <mailto:sbruno@freebsd.org>> wrote: >=20 > Author: sbruno > Date: Sat Sep 9 19:19:13 2017 > New Revision: 323371 > URL: https://svnweb.freebsd.org/changeset/base/323371 > <https://svnweb.freebsd.org/changeset/base/323371>; >=20 > Log: > r323359 instroduced an ARMv8 only uart(4) device to the tree but > placed > the driver in a place where it will be built for all targets. x8= 6 > doesn't > have all the required build bits for this device. >=20 > Move the uart(4) device mvebu to arm64 only. >=20 > Modified: > head/sys/conf/files > head/sys/conf/files.arm64 >=20 > Modified: head/sys/conf/files > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > --- head/sys/conf/files Sat Sep 9 18:39:55 2017 (r323370) > +++ head/sys/conf/files Sat Sep 9 19:19:13 2017 (r323371) > @@ -3053,7 +3053,6 @@ dev/uart/uart_bus_puc.c optional > uart puc > dev/uart/uart_bus_scc.c optional uart scc > dev/uart/uart_core.c optional uart > dev/uart/uart_dbg.c optional uart gdb > -dev/uart/uart_dev_mvebu.c optional uart uart_mvebu > dev/uart/uart_dev_ns8250.c optional uart uart_ns8250 | uart > uart_snps > dev/uart/uart_dev_pl011.c optional uart pl011 > dev/uart/uart_dev_quicc.c optional uart quicc >=20 > Modified: head/sys/conf/files.arm64 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > --- head/sys/conf/files.arm64 Sat Sep 9 18:39:55 2017 =20 > (r323370) > +++ head/sys/conf/files.arm64 Sat Sep 9 19:19:13 2017 =20 > (r323371) > @@ -176,6 +176,7 @@ dev/pci/pci_host_generic_fdt.c optional = > pci fdt > dev/psci/psci.c optional psci > dev/psci/psci_arm64.S optional psci > dev/uart/uart_cpu_arm64.c optional uart > +dev/uart/uart_dev_mvebu.c optional uart uart_mvebu > dev/uart/uart_dev_pl011.c optional uart pl011 > dev/usb/controller/dwc_otg_hisi.c optional dwcotg fdt > soc_hisi_hi6220 > dev/usb/controller/ehci_mv.c optional ehci_mv fdt >=20 >=20 > This is a bad change since we may support running the mvebu in 32-bit > mode, in which case we'd need it duplicated. >=20 > There's no harm in it being in the global files file, as it won't show > up automatically. >=20 > Warner >=20 I moved it around like this to unbreak the x86 build. I see explicit restrictions on the header inclusion in sys/modules/uart that would keep this from compiling on x86 and caused the breakage. I don't see an obvious way to get this device to build on 32bit and 64bit arm (unless files.arm is included automagically). Does this make sense? sean --oWOsgCogkfsiSNU8pbOlPQImQKsGG87rw-- --lNmPICpLFC8TD0hLfJSMNX0G62GAgn1JT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE6MTp+IA1BOHj9Lo0veT1/om1/LYFAlm0R71fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEU4 QzRFOUY4ODAzNTA0RTFFM0Y0QkEzNEJERTRGNUZFODlCNUZDQjYACgkQveT1/om1 /LazCAgAkT53vjYBfFyEEYHlHUBarzl713SAPZXAzLqibFBS2s7QfObr2EOy7yi7 hT/0pDv2TJFTV8J2tUM3ZAAcrgkJKt3LMnT8bo1ERIFEB5SaL2s4yJFN7+scN8lp 3tUWNpvonGhnSd0187gX7J7NEy5Q9gRG497uMyRfx58hFukpsMTGIev/DfyvWbrr W7/9v6Mc/GLbmtysBlwKyHQZHR+xuOHm4y6YJ2FTiYVvVHUJVCYhy5/ITpF8/cC/ 9VFrRzgNufnttkbVYXMoKAPT7CqVctmPfqyTLcQQOSAaP4paQVLzknQ8O8/4OPpL 5JvOJED8UmnoDogFSiEviG3M9dAsGg== =BjoF -----END PGP SIGNATURE----- --lNmPICpLFC8TD0hLfJSMNX0G62GAgn1JT--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?67e6ff1d-e552-7b3a-e1ea-4e21867d7602>