Merge branch 'op-build-update_043_3-14-2018' of https://github.com/op-jenkins/op-build
diff --git a/doc/boot-devices.rst b/doc/boot-devices.rst
new file mode 100644
index 0000000..1f08da1
--- /dev/null
+++ b/doc/boot-devices.rst
@@ -0,0 +1,69 @@
+Supported Boot Devices
+======================
+
+The OpenPower firmware uses Linux as a bootloader in order to discover boot
+devices, and boot the final operating system. In order to discover boot devices
+and load the operating system image from them, the bootloader's kernel needs to
+include support for that hardware.
+
+This table lists the network adaptors and disk controllers that are currently
+enabled.
+
+If you are adding a device to the kernel, please add the details here including
+your email address in the owner field. We will use this to contact users when
+considering the removal of modules.
+
+Likewise, if you are removing an option from the kernel config, please remove
+it from this table and notify the person mentioned in the owner field.
+
++-------------------------------+-----------------------+--------+----------------------------+
+| Device name | Kconfig option | System | Owner |
++===============================+=======================+========+============================+
+| AOC-SG-I2 NIC | IGB | Boston | maurosr@linux.vnet.ibm.com |
++-------------------------------+-----------------------+--------+----------------------------+
+| Broadcom NetExtreme II | BNX2X | | |
++-------------------------------+-----------------------+--------+----------------------------+
+| 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 | E1000 | Qemu | stewart@linux.vnet.ibm.com |
++-------------------------------+-----------------------+--------+----------------------------+
+| Intel PRO/10GbE | IXGB | | |
++-------------------------------+-----------------------+--------+----------------------------+
+| Intel 10GbE PCIe | IXGBE | | |
++-------------------------------+-----------------------+--------+----------------------------+
+| Intel XL710 Ethernet | I40E | P9DSU | jk@ozlabs.org |
++-------------------------------+-----------------------+--------+----------------------------+
+| 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/doc/index.rst b/doc/index.rst
index 4bbc061..d4d9668 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -19,6 +19,7 @@
introduction
testing
process/index
+ boot-devices
versioning
release-notes/index
diff --git a/openpower/configs/hostboot/vesnin.config b/openpower/configs/hostboot/vesnin.config
new file mode 100644
index 0000000..3aa5fba
--- /dev/null
+++ b/openpower/configs/hostboot/vesnin.config
@@ -0,0 +1,61 @@
+# The Serial Flash Controller is the AST2400 BMC.
+set SFC_IS_AST2400
+set BMC_DOES_SFC_INIT
+unset SFC_IS_IBM_DPSS
+set ALLOW_MICRON_PNOR
+set ALLOW_MACRONIX_PNOR
+
+# VPD options.
+set MVPD_READ_FROM_HW
+set MVPD_WRITE_TO_HW
+set MVPD_READ_FROM_PNOR
+set MVPD_WRITE_TO_PNOR
+set DJVPD_READ_FROM_HW
+set DJVPD_WRITE_TO_HW
+set DJVPD_READ_FROM_PNOR
+set DJVPD_WRITE_TO_PNOR
+set CVPD_READ_FROM_HW
+set CVPD_WRITE_TO_HW
+set CVPD_READ_FROM_PNOR
+set CVPD_WRITE_TO_PNOR
+set PVPD_READ_FROM_HW
+set PVPD_WRITE_TO_HW
+set PVPD_READ_FROM_PNOR
+set PVPD_WRITE_TO_PNOR
+set SKIP_RESTRICT_EX_UNITS
+unset CDIMM_FORMAT_FOR_CVPD
+
+# gpio config
+set GPIODD
+set PALMETTO_VDDR
+
+# Enable SBE updates
+set SBE_UPDATE_INDEPENDENT
+
+unset PCIE_HOTPLUG_CONTROLLER
+
+# turn on console output
+set CONSOLE
+set BMC_AST2400
+
+unset DISABLE_HOSTBOOT_RUNTIME
+
+# Compile in hostboot runtime PRD
+set HBRT_PRD
+set HTMGT
+set START_OCC_DURING_BOOT
+
+#PNOR flags
+set PNOR_TWO_SIDE_SUPPORT
+
+set BMC_BT_LPC_IPMI
+
+# Enable Checktop Analysis
+set ENABLE_CHECKSTOP_ANALYSIS
+set IPLTIME_CHECKSTOP_ANALYSIS
+
+# Hostboot will detect hardware changes
+set HOST_HCDB_SUPPORT
+
+# set for trace debug to console
+unset CONSOLE_OUTPUT_TRACE
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index 7af1ebe..fd3a786 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -128,9 +128,7 @@
CONFIG_BE2NET=m
CONFIG_S2IO=m
# CONFIG_NET_VENDOR_HUAWEI is not set
-CONFIG_E100=m
CONFIG_E1000=m
-CONFIG_E1000E=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
CONFIG_I40E=m
diff --git a/openpower/configs/linux/skiroot_p9_defconfig b/openpower/configs/linux/skiroot_p9_defconfig
index 309f182..1c12e98 100644
--- a/openpower/configs/linux/skiroot_p9_defconfig
+++ b/openpower/configs/linux/skiroot_p9_defconfig
@@ -130,9 +130,8 @@
CONFIG_BE2NET=m
CONFIG_S2IO=m
# CONFIG_NET_VENDOR_HUAWEI is not set
-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
new file mode 100644
index 0000000..0425d18
--- /dev/null
+++ b/openpower/configs/vesnin_defconfig
@@ -0,0 +1,57 @@
+BR2_powerpc64le=y
+BR2_powerpc_power8=y
+BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TARGET_GENERIC_HOSTNAME="skiroot"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
+BR2_GENERATE_LOCALE="en_US.UTF-8"
+BR2_ROOTFS_OVERLAY="../openpower/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.6"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
+BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_NCURSES_WCHAR=y
+BR2_PACKAGE_DROPBEAR=y
+# BR2_PACKAGE_DROPBEAR_SERVER is not set
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_NETCAT=y
+BR2_PACKAGE_RSYNC=y
+BR2_TARGET_ROOTFS_CPIO_XZ=y
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
+BR2_HOSTBOOT_CONFIG_FILE="vesnin.config"
+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"
+BR2_OPENPOWER_MRW_XML_FILENAME="VESNIN_hb.mrw.xml"
+BR2_OPENPOWER_BIOS_XML_FILENAME="VESNIN_bios.xml"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
+BR2_OPENPOWER_CONFIG_NAME="vesnin"
+BR2_OPENPOWER_PNOR_FILENAME="vesnin.pnor"
+BR2_OPENPOWER_PNOR_UPDATE_FILENAME="vesnin_update.pnor"
+BR2_HOSTBOOT_BINARY_SBE_FILENAME="venice_sbe.img.ecc"
+BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
+BR2_HOSTBOOT_BINARY_WINK_FILENAME="p8.ref_image.hdr.bin.ecc"
+BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="VESNIN_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="VESNIN_HB.targeting.bin.ecc"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_OCC_BIN_FILENAME="occ.bin"
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
+BR2_PACKAGE_LOADKEYS=y
+BR2_IMA_CATALOG_DTS="POWER8"
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