diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index e602c12..c18604c 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -26,7 +26,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index cebb62e..b079318 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -26,7 +26,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE_RADEON=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index 63b401f..9e5bd55 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -26,7 +26,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index 7ad6d86..21cb22e 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -26,7 +26,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 97017f7..ddeefd8 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -27,7 +27,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index c0c6bad..567763e 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -72,13 +72,11 @@
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_NVME=m
 CONFIG_EEPROM_AT24=y
 # CONFIG_CXL is not set
 CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -95,8 +93,6 @@
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
 CONFIG_SCSI_IPR=m
 # CONFIG_SCSI_IPR_TRACE is not set
 # CONFIG_SCSI_IPR_DUMP is not set
@@ -124,13 +120,8 @@
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
-CONFIG_NETCONSOLE=m
-CONFIG_TUN=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VORTEX=m
 CONFIG_ACENIC=m
 CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_PCNET32=m
 CONFIG_TIGON3=y
 CONFIG_BNX2X=m
 CONFIG_CHELSIO_T1=y
@@ -148,6 +139,7 @@
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 CONFIG_SFC=m
+# CONFIG_USB_NET_DRIVERS is not set
 # CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_MISC=y
@@ -198,7 +190,6 @@
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_AUTOFS4_FS=m
 CONFIG_ISO9660_FS=m
 CONFIG_UDF_FS=m
 CONFIG_MSDOS_FS=m
@@ -206,11 +197,7 @@
 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_CIFS=m
-# CONFIG_CIFS_DEBUG is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
diff --git a/openpower/configs/linux/skiroot_p9_defconfig b/openpower/configs/linux/skiroot_p9_defconfig
index 1c6a4c5..1130b8e 100644
--- a/openpower/configs/linux/skiroot_p9_defconfig
+++ b/openpower/configs/linux/skiroot_p9_defconfig
@@ -77,7 +77,6 @@
 CONFIG_EEPROM_AT24=y
 # CONFIG_CXL is not set
 CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -120,15 +119,13 @@
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
-CONFIG_NETCONSOLE=m
-CONFIG_TUN=m
-CONFIG_VIRTIO_NET=m
 CONFIG_ACENIC=m
 CONFIG_ACENIC_OMIT_TIGON_I=y
 CONFIG_TIGON3=y
 CONFIG_BNX2X=m
 CONFIG_CHELSIO_T1=y
 CONFIG_BE2NET=m
+CONFIG_S2IO=m
 CONFIG_E100=m
 CONFIG_E1000=m
 CONFIG_E1000E=m
@@ -137,9 +134,11 @@
 CONFIG_MLX4_EN=m
 CONFIG_MLX5_CORE=m
 CONFIG_MLX5_CORE_EN=y
+CONFIG_MYRI10GE=m
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 CONFIG_SFC=m
+# CONFIG_USB_NET_DRIVERS is not set
 # CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_MISC=y
@@ -189,7 +188,6 @@
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_AUTOFS4_FS=m
 CONFIG_ISO9660_FS=m
 CONFIG_UDF_FS=m
 CONFIG_MSDOS_FS=m
@@ -198,6 +196,7 @@
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_MISC_FILESYSTEMS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 7b0df3f..f40ace9 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -24,7 +24,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig
index ded6eff..432639b 100644
--- a/openpower/configs/openpower_p9_mambo_defconfig
+++ b/openpower/configs/openpower_p9_mambo_defconfig
@@ -24,7 +24,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig
index 7617ed7..63feea3 100644
--- a/openpower/configs/p9dsu_defconfig
+++ b/openpower/configs/p9dsu_defconfig
@@ -27,7 +27,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 393d7a3..0bf08e3 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -26,7 +26,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/redbud_defconfig b/openpower/configs/redbud_defconfig
index 2e87831..399ffee 100644
--- a/openpower/configs/redbud_defconfig
+++ b/openpower/configs/redbud_defconfig
@@ -28,7 +28,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index 459b296..13bc715 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -27,7 +27,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 1397a91..2a6a21c 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -27,7 +27,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index 86fe8c0..9bca1f1 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -27,7 +27,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index f1c493c..d948a05 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -26,7 +26,6 @@
 BR2_PACKAGE_LINUX_FIRMWARE_RADEON=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y