Merge VESNIN server defconfig from https://github.com/artemsen/op-build
In the merge, point vesnin-xml to the OpenPOWER repository
diff --git a/openpower/configs/linux/skiroot_p9_defconfig b/openpower/configs/linux/skiroot_p9_defconfig
index 309f182..e52fd9f 100644
--- a/openpower/configs/linux/skiroot_p9_defconfig
+++ b/openpower/configs/linux/skiroot_p9_defconfig
@@ -133,6 +133,7 @@
CONFIG_E100=m
CONFIG_E1000=m
CONFIG_E1000E=m
+CONFIG_IGB=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
CONFIG_I40E=m
diff --git a/openpower/configs/vesnin_defconfig b/openpower/configs/vesnin_defconfig
index d7d7104..0425d18 100644
--- a/openpower/configs/vesnin_defconfig
+++ b/openpower/configs/vesnin_defconfig
@@ -33,9 +33,7 @@
BR2_OPENPOWER_PLATFORM=y
BR2_OPENPOWER_POWER8=y
BR2_HOSTBOOT_CONFIG_FILE="vesnin.config"
-BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
-BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT_VALUE="https://github.com/artemsen/vesnin-xml.git"
-# BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="vesnin-xml"
+BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="vesnin-xml"
BR2_OPENPOWER_MACHINE_XML_VERSION="38ff4b8db62d43e330fab404cd2b76bd35a4a062"
BR2_OPENPOWER_MACHINE_XML_FILENAME="vesnin.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="VESNIN_hb.system.xml"
diff --git a/openpower/package/ima-catalog/ima-catalog.mk b/openpower/package/ima-catalog/ima-catalog.mk
index 7e469bd..9ee205f 100644
--- a/openpower/package/ima-catalog/ima-catalog.mk
+++ b/openpower/package/ima-catalog/ima-catalog.mk
@@ -3,7 +3,7 @@
# ima-catalog.mk
#
################################################################################
-IMA_CATALOG_VERSION ?= 01b26a136da16a87c0b6b3c4d9f27555dca104dc
+IMA_CATALOG_VERSION ?= 90237254664cadab529a397965083e38806d92e6
IMA_CATALOG_SITE ?= $(call github,open-power,ima-catalog,$(IMA_CATALOG_VERSION))
IMA_CATALOG_LICENSE = Apache-2.0
IMA_CATALOG_DEPENDENCIES = host-dtc host-xz
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 537ab4c..fa50a0c 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SBE_VERSION ?= 75ddac2a41a9f5cb32a7028b811e6852d5aead89
+SBE_VERSION ?= ab0fc4ba6ffbc830c9e48b8b6542a1bb12ebdbbd
SBE_SITE ?= $(call github,open-power,sbe,$(SBE_VERSION))
SBE_LICENSE = Apache-2.0