From owner-svn-src-head@freebsd.org Sat Sep 9 19:57:54 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFD88E06548; Sat, 9 Sep 2017 19:57:54 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from mail.ignoranthack.me (ignoranthack.me [199.102.79.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8B6FD76A3D; Sat, 9 Sep 2017 19:57:53 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from [10.199.2.39] (unknown [50.235.236.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sbruno@ignoranthack.me) by mail.ignoranthack.me (Postfix) with ESMTPSA id 8074E192892; Sat, 9 Sep 2017 19:57:52 +0000 (UTC) Subject: Re: svn commit: r323371 - head/sys/conf To: Warner Losh Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" References: <201709091919.v89JJE8Z075009@repo.freebsd.org> From: Sean Bruno Message-ID: <67e6ff1d-e552-7b3a-e1ea-4e21867d7602@freebsd.org> Date: Sat, 9 Sep 2017 13:57:49 -0600 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="lNmPICpLFC8TD0hLfJSMNX0G62GAgn1JT" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Sep 2017 19:57:54 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --lNmPICpLFC8TD0hLfJSMNX0G62GAgn1JT Content-Type: multipart/mixed; boundary="oWOsgCogkfsiSNU8pbOlPQImQKsGG87rw"; protected-headers="v1" From: Sean Bruno To: Warner Losh Cc: src-committers , "svn-src-all@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> In-Reply-To: --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 > wrote: >=20 > Author: sbruno > Date: Sat Sep 9 19:19:13 2017 > New Revision: 323371 > URL: 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--