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

[Andrew Rybchenko]

Author: arybchik
Date: Tue May 10 07:12:27 2016
New Revision: 299327
URL: https://svnweb.freebsd.org/changeset/base/299327

Log:
  sfxge(4): remove EFSYS_OPT_FALCON_BOOTROM
  
  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:11:09 2016	(r299326)
+++ head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:12:27 2016	(r299327)
@@ -47,7 +47,6 @@
 # error "FALCON is obsolete and is not supported."
 #else
 /* FIXME: remove this after Falcon support has been removed */
-#define	EFSYS_OPT_NVRAM_FALCON_BOOTROM		(0)
 #define	EFSYS_OPT_NVRAM_SFT9001			(0)
 #define	EFSYS_OPT_NVRAM_SFX7101			(0)
 
@@ -212,15 +211,9 @@
 # endif
 #endif /* EFSYS_OPT_NVRAM */
 
-/* Support Falcon bootrom */
-#if EFSYS_OPT_NVRAM_FALCON_BOOTROM
-# if !EFSYS_OPT_NVRAM
-#  error "NVRAM_FALCON_BOOTROM requires NVRAM"
-# endif
-# if !EFSYS_OPT_FALCON
-#  error "NVRAM_FALCON_BOOTROM requires FALCON"
-# endif
-#endif /* EFSYS_OPT_NVRAM_FALCON_BOOTROM */
+#ifdef EFSYS_OPT_NVRAM_FALCON_BOOTROM
+# error "NVRAM_FALCON_BOOTROM is obsolete and is not supported."
+#endif
 
 /* Support NVRAM config for SFT9001 */
 #if EFSYS_OPT_NVRAM_SFT9001