Date: Thu, 26 Jun 2014 17:20:46 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267922 - in head/sys: conf dev/netfpga10g/nf10bmac mips/conf modules/netfpga10g/nf10bmac Message-ID: <201406261720.s5QHKkkG006496@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Thu Jun 26 17:20:45 2014 New Revision: 267922 URL: http://svnweb.freebsd.org/changeset/base/267922 Log: Introduce opt_netfpga.h and allow setting NF10BMAC_64BIT from mips kernel configs. Switch the BERI_NETFPGA_MDROOT to 64bit by default. Give we have working interrupts also cleanup the extra polling CFLAGS from the module Makefile. MFC after: 2 weeks Modified: head/sys/conf/options.mips head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c head/sys/mips/conf/BERI_NETFPGA_MDROOT head/sys/modules/netfpga10g/nf10bmac/Makefile Modified: head/sys/conf/options.mips ============================================================================== --- head/sys/conf/options.mips Thu Jun 26 17:15:41 2014 (r267921) +++ head/sys/conf/options.mips Thu Jun 26 17:20:45 2014 (r267922) @@ -91,6 +91,11 @@ OCTEON_BOARD_CAPK_0100ND opt_cvmx.h BERI_LARGE_TLB opt_global.h # +# Options that control the NetFPGA-10G Embedded CPU Ethernet Core. +# +NF10BMAC_64BIT opt_netfpga.h + +# # Options that control the Atheros SoC peripherals # ARGE_DEBUG opt_arge.h Modified: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c ============================================================================== --- head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c Thu Jun 26 17:15:41 2014 (r267921) +++ head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c Thu Jun 26 17:20:45 2014 (r267922) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include "opt_device_polling.h" +#include "opt_netfpga.h" #include <sys/param.h> #include <sys/systm.h> Modified: head/sys/mips/conf/BERI_NETFPGA_MDROOT ============================================================================== --- head/sys/mips/conf/BERI_NETFPGA_MDROOT Thu Jun 26 17:15:41 2014 (r267921) +++ head/sys/mips/conf/BERI_NETFPGA_MDROOT Thu Jun 26 17:20:45 2014 (r267922) @@ -23,6 +23,7 @@ device bpf options DEVICE_POLLING device netfpga10g_nf10bmac +options NF10BMAC_64BIT # # This kernel configuration uses an embedded memory root file system. Modified: head/sys/modules/netfpga10g/nf10bmac/Makefile ============================================================================== --- head/sys/modules/netfpga10g/nf10bmac/Makefile Thu Jun 26 17:15:41 2014 (r267921) +++ head/sys/modules/netfpga10g/nf10bmac/Makefile Thu Jun 26 17:20:45 2014 (r267922) @@ -6,11 +6,10 @@ KMOD= if_nf10bmac SRCS= if_nf10bmac.c SRCS+= device_if.h bus_if.h pci_if.h SRCS+= opt_device_polling.h +SRCS+= opt_netfpga.h .if ${MACHINE_CPUARCH} == "mips" SRCS+= if_nf10bmac_fdt.c ofw_bus_if.h .endif -CFLAGS+= -DDEVICE_POLLING - .include <bsd.kmod.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406261720.s5QHKkkG006496>