#if EFSYS_OPT_EVB
/* Support enterprise virtual bridging */
-# if !(EFX_OPTS_EF10())
-# error "EVB requires EF10 arch"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10())
+# error "EVB requires RIVERHEAD or EF10 arch"
# endif
#endif /* EFSYS_OPT_EVB */
+#if EFSYS_OPT_PCI
+# if !EFSYS_OPT_RIVERHEAD
+# error "PCI requires RIVERHEAD"
+# endif
+#endif /* EFSYS_OPT_PCI */
+
+/* Support extended width event queues */
+#if EFSYS_OPT_EV_EXTENDED_WIDTH
+# if !EFSYS_OPT_RIVERHEAD
+# error "EV_EXTENDED_WIDTH requires RIVERHEAD"
+# endif
+#endif /* EFSYS_OPT_EV_EXTENDED_WIDTH */
+
+/* Support descriptor proxy queues */
+#if EFSYS_OPT_DESC_PROXY
+# if !EFSYS_OPT_RIVERHEAD
+# error "DESC_PROXY requires RIVERHEAD"
+# endif
+# if !EFSYS_OPT_EV_EXTENDED_WIDTH
+# error "DESC_PROXY requires EV_EXTENDED_WIDTH"
+# endif
+#endif /* EFSYS_OPT_DESC_PROXY */
+
+#if EFSYS_OPT_MAE
+# if !EFSYS_OPT_RIVERHEAD
+# error "MAE requires RIVERHEAD"
+# endif
+#endif /* EFSYS_OPT_MAE */
+
#endif /* _SYS_EFX_CHECK_H */