svn commit: r323371 - head/sys/conf

Sat Sep 9 20:18:38 UTC 2017

In message <b1b785ef-f158-f4be-60b6-67435d99172d at freebsd.org>, 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 <sbruno at freebsd.org>
> To: Cy Schubert <Cy.Schubert at komquats.com>
> Cc: src-committers at freebsd.org, svn-src-all at freebsd.org,
>  svn-src-head at freebsd.org
> Message-ID: <b1b785ef-f158-f4be-60b6-67435d99172d at freebsd.org>
> Subject: Re: svn commit: r323371 - head/sys/conf
> References: <201709091938.v89JcmZA025348 at slippy.cwsent.com>
> In-Reply-To: <201709091938.v89JcmZA025348 at 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 at 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} \



-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.


