Merge pull request #2740 from stewart-ibm/skiboot-v6.3-rc1
skiboot v6.3-rc1
diff --git a/ci/Dockerfile/fedora29 b/ci/Dockerfile/fedora29
index 9ee2680..362fbc6 100644
--- a/ci/Dockerfile/fedora29
+++ b/ci/Dockerfile/fedora29
@@ -4,3 +4,4 @@
RUN dnf -y install which wget unzip tar cpio python bzip2 bc vim redhat-lsb-core
RUN dnf -y install findutils
RUN dnf -y install ncurses-devel openssl-devel
+RUN dnf -y install rsync
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index 9ddb542..3205788 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -162,6 +162,8 @@
CONFIG_MLX4_EN=m
# CONFIG_MLX4_CORE_GEN2 is not set
CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+# CONFIG_MLX5_EN_RXNFC is not set
# CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
CONFIG_MYRI10GE=m
diff --git a/openpower/package/hostboot-p8/hostboot-p8.mk b/openpower/package/hostboot-p8/hostboot-p8.mk
index c2ad607..3985419 100644
--- a/openpower/package/hostboot-p8/hostboot-p8.mk
+++ b/openpower/package/hostboot-p8/hostboot-p8.mk
@@ -3,7 +3,7 @@
# hostboot for POWER8
#
################################################################################
-HOSTBOOT_P8_VERSION ?= 839de20e2e7df7d7fb13b542f9e7d1ed7c5302df
+HOSTBOOT_P8_VERSION ?= c2074ad87972f2542d8313c4d8dec143bc96ac3d
HOSTBOOT_P8_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_P8_VERSION))
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 4d989ac..9f26f48 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_VERSION
string
- default "1564d45787cec40d0f80e2db04cd20c55ed1a2e9" if BR2_HOSTBOOT_LATEST_VERSION
+ default "30a512e3d84df2ac47c1ad1876e3ff0811a7aa2a" if BR2_HOSTBOOT_LATEST_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION