commit 77e76885c7ec0e50c5af50a80de1c10413627b7d
author Patrick Williams <patrick@stwcx.xyz> Tue Feb 16 11:12:29 2016 -0600
committer Patrick Williams <patrick@stwcx.xyz> Tue Feb 16 11:12:29 2016 -0600
tree 8e3d25eaecfd7f0d43d29f0ce6b99c3dd78591f6
parent 964766989a691d063b3d34c6e10f5e2e3ebb5e1f
parent 5175c83472384eaaf9ee9e26a9e3464a055f53d5

Merge pull request #350 from stewart-ibm/bump-skiboot-5.1.13

Bump skiboot to 5.1.13

openpower/configs/garrison_defconfig

diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index 1b5dc49..29cd799 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -34,7 +34,7 @@
 BR2_TARGET_SKIBOOT=y
 BR2_TARGET_SKIBOOT_EMBED_PAYLOAD=n
 BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="aa57046e6c908fdd87cf7a24239f33996c2df51f"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="09d10f9c6146f67d0b3f897a6249990b69f686b9"
 
 # petitboot requirements
 BR2_ENABLE_LOCALE_PURGE=y

openpower/configs/linux/skiroot_defconfig

diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index 56d80ed..59e3a2b 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -79,6 +79,9 @@
 CONFIG_SCSI_BNX2_ISCSI=y
 CONFIG_BE2ISCSI=y
 CONFIG_SCSI_AACRAID=y
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=y
+CONFIG_MEGARAID_MAILBOX=y
 CONFIG_SCSI_MPT2SAS=y
 CONFIG_SCSI_SYM53C8XX_2=y
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0