svn commit: r299602 - in head/sys: dev/sfxge/common modules/sfxge

[Andrew Rybchenko]

Author: arybchik
Date: Fri May 13 07:04:28 2016
New Revision: 299602
URL: https://svnweb.freebsd.org/changeset/base/299602

Log:
  sfxge(4): move ef10_nvram_* to ef10_nvram.c
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Added:
  head/sys/dev/sfxge/common/ef10_nvram.c
     - copied, changed from r299592, head/sys/dev/sfxge/common/hunt_nvram.c
Deleted:
  head/sys/dev/sfxge/common/hunt_nvram.c
Modified:
  head/sys/modules/sfxge/Makefile

Copied and modified: head/sys/dev/sfxge/common/ef10_nvram.c (from r299592, head/sys/dev/sfxge/common/hunt_nvram.c)
==============================================================================
--- head/sys/dev/sfxge/common/hunt_nvram.c	Fri May 13 06:26:42 2016	(r299592, copy source)
+++ head/sys/dev/sfxge/common/ef10_nvram.c	Fri May 13 07:04:28 2016	(r299602)
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
 #include "efx.h"
 #include "efx_impl.h"
 
-#if EFSYS_OPT_HUNTINGTON
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
 
 #if EFSYS_OPT_VPD || EFSYS_OPT_NVRAM
 
@@ -2330,4 +2330,4 @@ ef10_nvram_partn_rw_finish(
 
 #endif	/* EFSYS_OPT_NVRAM */
 
-#endif	/* EFSYS_OPT_HUNTINGTON */
+#endif	/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */

Modified: head/sys/modules/sfxge/Makefile
==============================================================================
--- head/sys/modules/sfxge/Makefile	Fri May 13 07:03:04 2016	(r299601)
+++ head/sys/modules/sfxge/Makefile	Fri May 13 07:04:28 2016	(r299602)
@@ -30,10 +30,11 @@ SRCS+=	siena_sram.c siena_vpd.c
 SRCS+=	siena_flash.h siena_impl.h
 
 SRCS+=	ef10_ev.c ef10_filter.c ef10_intr.c ef10_mac.c ef10_mcdi.c ef10_nic.c
+SRCS+=	ef10_nvram.c
 SRCS+=	ef10_impl.h
 
 SRCS+=	hunt_nic.c
-SRCS+=	hunt_nvram.c hunt_rx.c hunt_phy.c hunt_tx.c hunt_vpd.c
+SRCS+=	hunt_rx.c hunt_phy.c hunt_tx.c hunt_vpd.c
 SRCS+=	hunt_impl.h
 
 SRCS+=	medford_nic.c