svn commit: r296825 - in head/sys: arm/conf arm/mv arm/mv/armada38x boot/fdt/dts/arm
Bjoern A. Zeeb
bzeeb-lists at lists.zabbadoz.net
Mon Mar 14 15:02:01 UTC 2016
> On 14 Mar 2016, at 07:05 , Wojciech Macek <wma at FreeBSD.org> wrote:
>
> Author: wma
> Date: Mon Mar 14 07:05:41 2016
> New Revision: 296825
> URL: https://svnweb.freebsd.org/changeset/base/296825
>
> Log:
> Make MPIC compatible with ARM_INTRNG
>
> After ARM_INTRNG introduction, MPIC code needed several modifications:
> - IRQ resource and its handler added
> - several DEVMETHODs of INTRNG interface implemented
> - defines enhanced to ensure code compiles as well for AXP as for A38X
> - added dummy MSI_IRQ, ERR_IRQ defines for Armada38x
> - MPIC driver was added to files.armada38x, ARM_INTRNG option enabled in
> kernconf file and regs of MPIC corrected in dts file.
>
> Instead of modifying Armada38X DTS, offsets to CPU registers defined in
> driver were changed. That required restoring 'reg' property of mpic node
> in ArmadaXP to state compliant with Linux DTS.
>
> Additionally, required ARM_INTRNG definitions were added to mv_common.c.
>
> Submitted by: Bartosz Szczepanek <bsz at semihalf.com>
> Obtained from: Semihalf
> Sponsored by: Stormshield
> Reviewed by: adrian, andrew, ian, skra
> Approved by: cognet (mentor)
> Differential Revision: https://reviews.freebsd.org/D5030
>
> Modified:
> head/sys/arm/conf/ARMADA38X
> head/sys/arm/mv/armada38x/files.armada38x
> head/sys/arm/mv/mpic.c
> head/sys/arm/mv/mvreg.h
> head/sys/boot/fdt/dts/arm/db78460.dts
>
> Modified: head/sys/arm/mv/mpic.c
> ==============================================================================
> --- head/sys/arm/mv/mpic.c Mon Mar 14 06:30:37 2016 (r296824)
> +++ head/sys/arm/mv/mpic.c Mon Mar 14 07:05:41 2016 (r296825)
>
> @@ -48,11 +54,16 @@ __FBSDID("$FreeBSD$");
> #include <machine/smp.h>
>
> #include <arm/mv/mvvar.h>
> +#include <arm/mv/mvreg.h>
This redefines at least IRQ_MASK now in this file and breaks the build. Can you have a look and fix it?
Thanks,
/bz
—
Bjoern A. Zeeb Charles Haddon Spurgeon:
"Friendship is one of the sweetest joys of life. Many might have failed
beneath the bitterness of their trial had they not found a friend."
More information about the svn-src-all
mailing list