diff --git a/doc/boot-devices.rst b/doc/boot-devices.rst
index da2fd5b..01d3730 100644
--- a/doc/boot-devices.rst
+++ b/doc/boot-devices.rst
@@ -25,16 +25,12 @@
 +-------------------------------+-----------------------+--------+----------------------------+
 | Mellanox ConnectX-4           | MLX5_CORE_EN          |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
-| Alteon AceNIC                 | ACENIC                |        |                            |
-+-------------------------------+-----------------------+--------+----------------------------+
 | Broadcom Tigon3               | TIGON3                |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
 | Chelsio 10Gb Ethernet         | CHELSIO_T1            |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
 | SeverEngine BladeEngine 10Gb  | BE2NET                |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
-| Exar Xframe 10Gb              | S2IO                  |        |                            |
-+-------------------------------+-----------------------+--------+----------------------------+
 | Intel PRO/1000 PCIe           | E1000E                |        |                            |
 | Intel PRO/1000                | E1000                 | Qemu   | stewart@linux.vnet.ibm.com |
 +-------------------------------+-----------------------+--------+----------------------------+
@@ -46,25 +42,15 @@
 +-------------------------------+-----------------------+--------+----------------------------+
 | Mellanox 1/10/40Gbit Ethernet | MLX4_EN               |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
-| Myricom Myri-10G Ethernet     | MYRI10GE              |        |                            |
-+-------------------------------+-----------------------+--------+----------------------------+
 | QLogic QLGE 10Gb Ethernet     | QLGE                  |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
 | NetXen Gigabit Ethernet       | NETXEN_NIC            |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
 | Adaptec AACRAID               | SCSI_AACRAID          |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
-| QLogic BNX2                   | SCSI_BNX2_ISCSI       |        |                            |
-+-------------------------------+-----------------------+--------+----------------------------+
-| Chelsio T3 iSCSI              | SCSI_CXGB3_ISCSI      |        |                            |
-+-------------------------------+-----------------------+--------+----------------------------+
-| Chelsio T4 iSCSI              | SCSI_CXGB4_ISCSI      |        |                            |
-+-------------------------------+-----------------------+--------+----------------------------+
 | LSI Logic MegaRAID            | MEGARAID_NEWGEN       |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
 | LSI MPT Fusion SAS (legacy)   | SCSI_MPT2SAS          |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
 | QLogic QLA2xxx Fibrechannel   | SCSI_QLA_FC           |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
-| QLogic ISP4xxx and ISP82xxx   | SCSI_QLA_ISCSI        |        |                            |
-+-------------------------------+-----------------------+--------+----------------------------+
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index 02a3ea7..41688c7 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -89,9 +89,6 @@
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_FC_ATTRS=y
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_SCSI_AACRAID=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
@@ -102,7 +99,6 @@
 # CONFIG_SCSI_IPR_TRACE is not set
 # CONFIG_SCSI_IPR_DUMP is not set
 CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_DH=y
@@ -125,12 +121,11 @@
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
+CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_ADAPTEC is not set
 # CONFIG_NET_VENDOR_AGERE is not set
 # CONFIG_NET_VENDOR_ALACRITECH is not set
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
 # CONFIG_NET_VENDOR_AMAZON is not set
 # CONFIG_NET_VENDOR_AMD is not set
 # CONFIG_NET_VENDOR_AQUANTIA is not set
@@ -143,6 +138,8 @@
 # CONFIG_NET_VENDOR_CADENCE is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
 # CONFIG_NET_VENDOR_CISCO is not set
 # CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_NET_VENDOR_DEC is not set
@@ -164,9 +161,7 @@
 # CONFIG_MLX5_EN_RXNFC is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
-CONFIG_MYRI10GE=m
 # CONFIG_NET_VENDOR_NATSEMI is not set
-CONFIG_S2IO=m
 # CONFIG_NET_VENDOR_NETRONOME is not set
 # CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_NVIDIA is not set
@@ -182,7 +177,6 @@
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_SFC=m
 # CONFIG_NET_VENDOR_SILAN is not set
 # CONFIG_NET_VENDOR_SIS is not set
 # CONFIG_NET_VENDOR_SMSC is not set
@@ -216,7 +210,6 @@
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_HELPER_AUTO is not set
 CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_OPAL=y
 CONFIG_PPS=y
 CONFIG_SENSORS_IBMPOWERNV=m
 CONFIG_DRM=m