From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Sun, 28 Jun 2015 08:17:09 +0000 (-0700)
Subject: uek-rpm: configs: Enabel Oracle HXGE and ASM driver
X-Git-Tag: v4.1test1^0
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ee3bed61bc16e766eddfb00191152fac23860642;p=users%2Fjedix%2Flinux-maple.git

uek-rpm: configs: Enabel Oracle HXGE and ASM driver

While doing that just sync up the config

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
---

diff --git a/uek-rpm/ol6/config-x86_64 b/uek-rpm/ol6/config-x86_64
index 37b3fcef204b..88c2a93278cc 100644
--- a/uek-rpm/ol6/config-x86_64
+++ b/uek-rpm/ol6/config-x86_64
@@ -414,6 +414,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
+CONFIG_MICROCODE_XEN=y
 CONFIG_XEN_PVH=y
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -567,6 +568,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 # CONFIG_KEXEC_VERIFY_SIG is not set
+CONFIG_KEXEC_AUTO_RESERVE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
@@ -1755,6 +1757,7 @@ CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
 CONFIG_BLK_DEV_RSXX=m
+CONFIG_ORACLEASM=m
 
 #
 # Misc devices
@@ -2299,6 +2302,9 @@ CONFIG_I40E_FCOE=y
 CONFIG_I40EVF=m
 # CONFIG_FM10K is not set
 CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_ORACLE=y
+CONFIG_HXGE=m
+# CONFIG_HXGE_NAPI is not set
 CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
diff --git a/uek-rpm/ol6/config-x86_64-debug b/uek-rpm/ol6/config-x86_64-debug
index 117c841c4d21..dbb9981a2272 100644
--- a/uek-rpm/ol6/config-x86_64-debug
+++ b/uek-rpm/ol6/config-x86_64-debug
@@ -409,6 +409,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
+CONFIG_MICROCODE_XEN=y
 CONFIG_XEN_PVH=y
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -563,6 +564,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 # CONFIG_KEXEC_VERIFY_SIG is not set
+CONFIG_KEXEC_AUTO_RESERVE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
@@ -1757,6 +1759,7 @@ CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
 CONFIG_BLK_DEV_RSXX=m
+CONFIG_ORACLEASM=m
 
 #
 # Misc devices
@@ -2302,6 +2305,9 @@ CONFIG_I40E_DCB=y
 CONFIG_I40EVF=m
 # CONFIG_FM10K is not set
 CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_ORACLE=y
+CONFIG_HXGE=m
+# CONFIG_HXGE_NAPI is not set
 CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
diff --git a/uek-rpm/ol7/config-x86_64 b/uek-rpm/ol7/config-x86_64
index b9f739e47759..6967ae2fd1ec 100644
--- a/uek-rpm/ol7/config-x86_64
+++ b/uek-rpm/ol7/config-x86_64
@@ -415,6 +415,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
+CONFIG_MICROCODE_XEN=y
 CONFIG_XEN_PVH=y
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -570,6 +571,7 @@ CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 CONFIG_KEXEC_VERIFY_SIG=y
 CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
+CONFIG_KEXEC_AUTO_RESERVE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
@@ -1764,6 +1766,7 @@ CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
 # CONFIG_BLK_DEV_RSXX is not set
+CONFIG_ORACLEASM=m
 
 #
 # Misc devices
@@ -2318,6 +2321,9 @@ CONFIG_I40E_FCOE=y
 CONFIG_I40EVF=m
 # CONFIG_FM10K is not set
 CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_ORACLE=y
+CONFIG_HXGE=m
+# CONFIG_HXGE_NAPI is not set
 CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
diff --git a/uek-rpm/ol7/config-x86_64-debug b/uek-rpm/ol7/config-x86_64-debug
index db5b7826f2c3..ee6652d6b407 100644
--- a/uek-rpm/ol7/config-x86_64-debug
+++ b/uek-rpm/ol7/config-x86_64-debug
@@ -410,6 +410,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
+CONFIG_MICROCODE_XEN=y
 CONFIG_XEN_PVH=y
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -566,6 +567,7 @@ CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 CONFIG_KEXEC_VERIFY_SIG=y
 CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
+CONFIG_KEXEC_AUTO_RESERVE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
@@ -1766,6 +1768,7 @@ CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
 # CONFIG_BLK_DEV_RSXX is not set
+CONFIG_ORACLEASM=m
 
 #
 # Misc devices
@@ -2320,6 +2323,9 @@ CONFIG_I40E_FCOE=y
 CONFIG_I40EVF=m
 # CONFIG_FM10K is not set
 CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_ORACLE=y
+CONFIG_HXGE=m
+# CONFIG_HXGE_NAPI is not set
 CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y