#if EFSYS_OPT_CHECK_REG
/* Verify chip implements accessed registers */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-# error "CHECK_REG requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+# error "CHECK_REG requires RIVERHEAD or EF10 arch or SIENA"
# endif
#endif /* EFSYS_OPT_CHECK_REG */
#if EFSYS_OPT_FILTER
/* Support hardware packet filters */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-# error "FILTER requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+# error "FILTER requires RIVERHEAD or EF10 arch or SIENA"
# endif
#endif /* EFSYS_OPT_FILTER */
-#if EFX_OPTS_EF10()
+#if EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10()
# if !EFSYS_OPT_FILTER
-# error "EF10 arch requires FILTER"
+# error "RIVERHEAD or EF10 arch requires FILTER"
# endif
#endif /* EFX_OPTS_EF10() */
#if EFSYS_OPT_LOOPBACK
/* Support hardware loopback modes */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-# error "LOOPBACK requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+# error "LOOPBACK requires RIVERHEAD or EF10 arch or SIENA"
# endif
#endif /* EFSYS_OPT_LOOPBACK */
#if EFSYS_OPT_MAC_STATS
/* Support MAC statistics */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-# error "MAC_STATS requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+# error "MAC_STATS requires RIVERHEAD or EF10 arch or SIENA"
# endif
#endif /* EFSYS_OPT_MAC_STATS */
#if EFSYS_OPT_MCDI
/* Support management controller messages */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-# error "MCDI requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+# error "MCDI requires RIVERHEAD or EF10 arch or SIENA"
# endif
#endif /* EFSYS_OPT_MCDI */
-#if (EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#if (EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
# if !EFSYS_OPT_MCDI
-# error "EF10 arch or SIENA requires MCDI"
+# error "RIVERHEAD or EF10 arch or SIENA requires MCDI"
# endif
#endif
#if EFSYS_OPT_RX_SCALE
/* Support receive scaling (RSS) */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-# error "RX_SCALE requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+# error "RX_SCALE requires RIVERHEAD or EF10 arch or SIENA"
# endif
#endif /* EFSYS_OPT_RX_SCALE */
#if EFSYS_OPT_RX_SCATTER
/* Support receive scatter DMA */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-# error "RX_SCATTER requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+# error "RX_SCATTER requires RIVERHEAD or EF10 arch or SIENA"
# endif
#endif /* EFSYS_OPT_RX_SCATTER */
#if EFSYS_OPT_ALLOW_UNCONFIGURED_NIC
/* Support adapters with missing static config (for factory use only) */
-# if !(EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-# error "ALLOW_UNCONFIGURED_NIC requires MEDFORD or MEDFORD2"
+# if !(EFSYS_OPT_RIVERHEAD || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
+# error "ALLOW_UNCONFIGURED_NIC requires RIVERHEAD or MEDFORD or MEDFORD2"
# endif
#endif /* EFSYS_OPT_ALLOW_UNCONFIGURED_NIC */
/* Support hardware assistance for tunnels */
#if EFSYS_OPT_TUNNEL
-# if !(EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-# error "TUNNEL requires MEDFORD or MEDFORD2"
+# if !(EFSYS_OPT_RIVERHEAD || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
+# error "TUNNEL requires RIVERHEAD or MEDFORD or MEDFORD2"
# endif
#endif /* EFSYS_OPT_TUNNEL */
#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 */