From owner-svn-src-head@freebsd.org Sat Sep 9 20:21:29 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 1F475E07D26; Sat, 9 Sep 2017 20:21:29 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id C7AA77C05D; Sat, 9 Sep 2017 20:21:28 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id qmFjdkEV9DJTWqmFkdi1LS; Sat, 09 Sep 2017 14:21:21 -0600 X-Authority-Analysis: v=2.2 cv=B4DJ6KlM c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=2JCJgTwv5E4A:10 a=6I5d2MoRAAAA:8 a=BWvPGDcYAAAA:8 a=VxmjJ2MpAAAA:8 a=YxBL1-UpAAAA:8 a=YL_OPB7AbxHosn8tsFUA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=pxhY87DP9d2VeQe4joPk:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 3E8A5713; Sat, 9 Sep 2017 13:21:19 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v89KLImc020571; Sat, 9 Sep 2017 13:21:18 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201709092021.v89KLImc020571@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: Sean Bruno , Cy Schubert , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r323371 - head/sys/conf In-Reply-To: Message from Cy Schubert of "Sat, 09 Sep 2017 13:18:29 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 09 Sep 2017 13:21:18 -0700 X-CMAE-Envelope: MS4wfJrcMEMy/qhJTwKt8tmPgiE4+9wPmkGwuhQq4kWkTXiTtRE6ZITV9WFdIugGQC+qREw+OboVkkhad7/CMb3pqNM15GBrwvPpfzn5ZKcwrSBOaqgf00bJ 1tJTzfU5TPmgXdzbunS0qp8IiFpoOkMknQH2KnXAX6pGWBfEoW/j7uX2tO1QcyPN5xziT0n1ushcHKeLiLCFDWdgM2dDE7dg9XVvNPyhXZJYXCUrn+Z1RxxP leDaYRq4rnjMoN3M4/xFpsSEMC6iW4wuOaRJndBnwW6f2mamIyOo/X4rPsbWQWpk 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 20:21:29 -0000 Cy Schubert writes: > In message , Sean Bruno > write > s: > > This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > > --TihrB0CKT3jqUaMs7S3eH1inAg6bsh5sX > > Content-Type: multipart/mixed; boundary="6nk2xUFgscbwBqdTs6JuLWhnhbTJx5KiL" > ; > > protected-headers="v1" > > From: Sean Bruno > > To: Cy Schubert > > Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, > > svn-src-head@freebsd.org > > Message-ID: > > Subject: Re: svn commit: r323371 - head/sys/conf > > References: <201709091938.v89JcmZA025348@slippy.cwsent.com> > > In-Reply-To: <201709091938.v89JcmZA025348@slippy.cwsent.com> > > > > --6nk2xUFgscbwBqdTs6JuLWhnhbTJx5KiL > > Content-Type: text/plain; charset=utf-8 > > Content-Language: en-US > > Content-Transfer-Encoding: quoted-printable > > > > > > > > On 09/09/17 13:38, Cy Schubert wrote: > > > In message <201709091919.v89JJE8Z075009@repo.freebsd.org>, Sean Bruno=20 > > > writes: > > >> Author: sbruno > > >> Date: Sat Sep 9 19:19:13 2017 > > >> New Revision: 323371 > > >> URL: https://svnweb.freebsd.org/changeset/base/323371 > > >> > > >> Log: > > >> r323359 instroduced an ARMv8 only uart(4) device to the tree but pla= > > ced > > >> the driver in a place where it will be built for all targets. x86 d= > > oesn't > > >> have all the required build bits for this device. > > >> =20 > > >> Move the uart(4) device mvebu to arm64 only. > > >> > > >> Modified: > > >> head/sys/conf/files > > >> head/sys/conf/files.arm64 > > >> > > >> 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 p > > uc > > >> 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_s > > nps= > > > > >> dev/uart/uart_dev_pl011.c optional uart pl011 > > >> dev/uart/uart_dev_quicc.c optional uart quicc > > >> > > >> 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 (r32337 > > 0) > > >> +++ head/sys/conf/files.arm64 Sat Sep 9 19:19:13 2017 (r32337 > > 1) > > >> @@ -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_hi6 > > 220= > > > > >> dev/usb/controller/ehci_mv.c optional ehci_mv fdt > > >> > > >=20 > > > Hi Sean, > > >=20 > > > Don't forget sys/modules/uart/Makefile. > > >=20 > > >=20 > > > > > > In what way should it be changed? > > To fix this: > > --- uart_dev_mvebu.o --- > In file included from /opt/src/svn-current/sys/dev/uart/uart_dev_mvebu.c:39: > /opt/src/svn-current/sys/dev/ofw/ofw_bus_subr.h:40:10: fatal error: > 'ofw_bus_if.h' file not found > #include "ofw_bus_if.h" > ^~~~~~~~~~~~~~ > 1 error generated. > *** [uart_dev_mvebu.o] Error code 1 > > make[4]: stopped in /opt/src/svn-current/sys/modules/uart > 1 error > > make[4]: stopped in /opt/src/svn-current/sys/modules/uart > *** [all_subdir_uart] Error code 2 > > make[3]: stopped in /opt/src/svn-current/sys/modules > --- all_subdir_udf_iconv --- > ctfconvert -L VERSION -g udf_iconv.o > A failure has been detected in another branch of the parallel make > > make[4]: stopped in /opt/src/svn-current/sys/modules/udf_iconv > *** [all_subdir_udf_iconv] Error code 2 > > make[3]: stopped in /opt/src/svn-current/sys/modules > 2 errors > > make[3]: stopped in /opt/src/svn-current/sys/modules > *** [modules-all] Error code 2 > > make[2]: stopped in /export/obj/opt/src/svn-current/sys/PROD2 > 1 error > > make[2]: stopped in /export/obj/opt/src/svn-current/sys/PROD2 > *** [buildkernel] Error code 2 > > make[1]: stopped in /opt/src/svn-current > 1 error > > make[1]: stopped in /opt/src/svn-current > *** [buildkernel] Error code 2 > > make: stopped in /opt/src/svn-current > 1 error > > make: stopped in /opt/src/svn-current > cwfw# > > How about something kind of like this but maybe more specific to armv8? > > Index: Makefile > =================================================================== > --- Makefile (revision 323371) > +++ Makefile (working copy) > @@ -8,6 +8,7 @@ > > .if ${MACHINE_CPUARCH} == "arm" > uart_dev_lpc= uart_dev_lpc.c > +uart_dev_mvebu= uart_dev_mvebu.c > .endif > > .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ > @@ -30,7 +31,7 @@ > uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \ > uart_core.c ${uart_cpu_machine} uart_dbg.c \ > ${uart_dev_lpc} uart_dev_ns8250.c uart_dev_quicc.c uart_dev_sab82532.c > \ > - uart_dev_z8530.c uart_dev_mvebu.c \ > + uart_dev_z8530.c ${uart_dev_mvebu} \ > uart_if.c uart_if.h uart_subr.c uart_tty.c > > SRCS+= acpi_if.h bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} > \ Looks like Warner fixed it. Thanks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.