svn commit: r299330 - head/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Tue May 10 07:15:09 2016
New Revision: 299330
URL: https://svnweb.freebsd.org/changeset/base/299330

Log:
  sfxge(4): remove EFSYS_OPT_NVRAM_SFX7101
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Modified:
  head/sys/dev/sfxge/common/efx_check.h

Modified: head/sys/dev/sfxge/common/efx_check.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:14:49 2016	(r299329)
+++ head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:15:09 2016	(r299330)
@@ -47,8 +47,6 @@
 # error "FALCON is obsolete and is not supported."
 #else
 /* FIXME: remove this after Falcon support has been removed */
-#define	EFSYS_OPT_NVRAM_SFX7101			(0)
-
 #define	EFSYS_OPT_PHY_NULL			(0)
 #define	EFSYS_OPT_PHY_QT2022C2			(0)
 #define	EFSYS_OPT_PHY_QT2025C			(0)
@@ -218,15 +216,9 @@
 # error "NVRAM_SFT9001 is obsolete and is not supported."
 #endif
 
-/* Support NVRAM config for SFX7101 */
-#if EFSYS_OPT_NVRAM_SFX7101
-# if !EFSYS_OPT_NVRAM
-#  error "NVRAM_SFX7101 requires NVRAM"
-# endif
-# if !EFSYS_OPT_FALCON
-#  error "NVRAM_SFX7101 requires FALCON"
-# endif
-#endif /* EFSYS_OPT_NVRAM_SFX7101 */
+#ifdef EFSYS_OPT_NVRAM_SFX7101
+# error "NVRAM_SFX7101 is obsolete and is not supported."
+#endif
 
 #ifdef EFSYS_OPT_PCIE_TUNE
 # error "PCIE_TUNE is obsolete and is not supported."