UBUNTU: [Config] CONFIG_OPENNSL=y for amd64

BugLink: https://launchpad.net/bugs/1665783
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index 5c2e4e1d3a9f6301d2fe0cd6069ab567444eb073..4a9632273ebc8c852b762d0c69fcd3d82f4ad2e0 100644 (file)
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -5,5 +5,6 @@ CONFIG_HZ=250
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ_250=y
 # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
+CONFIG_OPENNSL=y
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_VOLUNTARY=y

diff --git a/debian.master/config/amd64/config.flavour.lowlatency b/debian.master/config/amd64/config.flavour.lowlatency
index 6b121e3f433bbbdfe3d8d45eb088ab154969bb0d..305bd16afecef53818e9ef1d49254fba755d463b 100644 (file)
--- a/debian.master/config/amd64/config.flavour.lowlatency
+++ b/debian.master/config/amd64/config.flavour.lowlatency
@@ -5,5 +5,6 @@ CONFIG_HZ=1000
 CONFIG_HZ_1000=y
 # CONFIG_HZ_250 is not set
 CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
+# CONFIG_OPENNSL is not set
 CONFIG_PREEMPT=y
 # CONFIG_PREEMPT_VOLUNTARY is not set

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 0c2bf6cfaee6da5db7eaf65a990a0e7b48837f7c..ed55849221c887433d9da5064f41c2b77e54ed28 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -273,6 +273,7 @@ CONFIG_NVMEM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
+# CONFIG_OPENNSL is not set
 CONFIG_OSF_PARTITION=y
 # CONFIG_PAGE_EXTENSION is not set
 CONFIG_PARPORT=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 8298d7f12d42194c14ec188865e2b68f8d57b85e..054ec4d4d4dd29b6a2ac5ad75aaf7608ab62686b 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -263,6 +263,7 @@ CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
+# CONFIG_OPENNSL is not set
 CONFIG_OSF_PARTITION=y
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OFFSET=0xC0000000

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a012224b91889891d13787bcb483c5361a2e8437..dadf8065cfa2801d884578f46cc3a39a25bca79f 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5496,6 +5496,9 @@ CONFIG_OMAP_SSI_PORT=m
 CONFIG_OMAP_USB2=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_OPAL_PRD=m
+CONFIG_OPENNSL_BCM_KNET=m
+CONFIG_OPENNSL_KERNEL_BDE=m
+CONFIG_OPENNSL_USER_BDE=m
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GENEVE=m
 CONFIG_OPENVSWITCH_GRE=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index a8bff36bf9d2a500effee9a2f2f9f6d90a610416..5cad5b702ff56049ba9d6b032360c4e6ebe310e6 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -266,6 +266,7 @@ CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 # CONFIG_OF is not set
 CONFIG_OMFS_FS=m
+# CONFIG_OPENNSL is not set
 CONFIG_OSF_PARTITION=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGE_EXTENSION=y

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index a5a87a3fb679b0e7a353097359613bc03361d6bf..a14ff52f7f9da5e258190c13d8d047cd11b5c3d3 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -259,6 +259,7 @@ CONFIG_NVRAM=y
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
+# CONFIG_OPENNSL is not set
 CONFIG_OSF_PARTITION=y
 CONFIG_PARPORT=m
 CONFIG_PATA_SIS=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 1298dc3408c416a71370bf71b75cffba739b09df..6974b045cb0c6842051dbcee7fffe8340d657e5a 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -285,6 +285,7 @@ CONFIG_NVMEM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
+# CONFIG_OPENNSL is not set
 CONFIG_OSF_PARTITION=y
 # CONFIG_PAGE_EXTENSION is not set
 CONFIG_PAGE_OFFSET=0xc000000000000000