summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Dudau <adrian.dudau@enea.com>2021-03-24 12:06:37 +0100
committerAdrian Dudau <adrian.dudau@enea.com>2021-03-24 12:06:37 +0100
commit9621dcb027782b683e87445239cc6677fcc00aaf (patch)
tree26a81e9a530ea54f77774114adb2d728d9a19d30
parentb7582167f4956d00a1f0377d957182d7cd06a6e9 (diff)
downloadmeta-nfv-access-bsp-x86-9621dcb027782b683e87445239cc6677fcc00aaf.tar.gz
Upgrade to gatesgarth
This is an initial commit, containing quick fixes and hacks to allow building the images. All these issues will be re-evaluated and fixed properly in their own commits. Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
-rw-r--r--conf/machine/atom-c3000.conf2
-rw-r--r--conf/machine/xeon-d.conf2
-rw-r--r--recipes-kernel/linux/linux-intel-guest_5.10.bb (renamed from recipes-kernel/linux/linux-intel-guest_4.14.bb)0
-rw-r--r--recipes-kernel/linux/linux-intel-host_5.10.bb (renamed from recipes-kernel/linux/linux-intel-host_4.14.bb)0
-rw-r--r--recipes-kernel/linux/linux-intel.inc13
5 files changed, 7 insertions, 10 deletions
diff --git a/conf/machine/atom-c3000.conf b/conf/machine/atom-c3000.conf
index 9ce89bd..d3fb5bb 100644
--- a/conf/machine/atom-c3000.conf
+++ b/conf/machine/atom-c3000.conf
@@ -11,7 +11,7 @@
11# Soft set linux-yocto as preferred kernel like x86-base.inc 11# Soft set linux-yocto as preferred kernel like x86-base.inc
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel-host" 12PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel-host"
13PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel-host" 13PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel-host"
14PREFERRED_VERSION_linux-intel-host ?= "4.14%" 14PREFERRED_VERSION_linux-intel-host ?= "5.10%"
15 15
16MACHINE_FEATURES += "pcbios efi" 16MACHINE_FEATURES += "pcbios efi"
17 17
diff --git a/conf/machine/xeon-d.conf b/conf/machine/xeon-d.conf
index bfa6322..f3ee8c0 100644
--- a/conf/machine/xeon-d.conf
+++ b/conf/machine/xeon-d.conf
@@ -9,7 +9,7 @@
9# Soft set linux-yocto as preferred kernel like x86-base.inc 9# Soft set linux-yocto as preferred kernel like x86-base.inc
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel-host" 10PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel-host"
11PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel-host" 11PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel-host"
12PREFERRED_VERSION_linux-intel ?= "4.14%" 12PREFERRED_VERSION_linux-intel ?= "5.10%"
13 13
14MACHINE_FEATURES += "pcbios efi" 14MACHINE_FEATURES += "pcbios efi"
15 15
diff --git a/recipes-kernel/linux/linux-intel-guest_4.14.bb b/recipes-kernel/linux/linux-intel-guest_5.10.bb
index 6be0508..6be0508 100644
--- a/recipes-kernel/linux/linux-intel-guest_4.14.bb
+++ b/recipes-kernel/linux/linux-intel-guest_5.10.bb
diff --git a/recipes-kernel/linux/linux-intel-host_4.14.bb b/recipes-kernel/linux/linux-intel-host_5.10.bb
index 6be0508..6be0508 100644
--- a/recipes-kernel/linux/linux-intel-host_4.14.bb
+++ b/recipes-kernel/linux/linux-intel-host_5.10.bb
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index d0b951a..52e6e62 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -1,10 +1,10 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:"
2require common/recipes-kernel/linux/linux-intel_4.14.bb 2require recipes-kernel/linux/linux-intel_5.10.bb
3require recipes-kernel/linux/linux-deploy-kconfig.inc 3require recipes-kernel/linux/linux-deploy-kconfig.inc
4require recipes-kernel/linux/linux-common-config.inc 4require recipes-kernel/linux/linux-common-config.inc
5 5
6LINUX_VERSION = "4.14.123" 6LINUX_VERSION = "5.10.8"
7SRCREV_machine = "6aab3d561d738f3ceb9230a828b3f0b1ed5e98a3" 7
8SRCREV_metaenea = "7a93e54032bb148a92e16b59736a1b76fedae319" 8SRCREV_metaenea = "7a93e54032bb148a92e16b59736a1b76fedae319"
9KENEABRANCH = "intel-4.14" 9KENEABRANCH = "intel-4.14"
10SRC_URI_append = " git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-meta" 10SRC_URI_append = " git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-meta"
@@ -32,13 +32,10 @@ KERNEL_FEATURES_append = " features/ipmi/ipmi.scc"
32KERNEL_FEATURES_append = " features/ipmi/ipmi_ssif.scc" 32KERNEL_FEATURES_append = " features/ipmi/ipmi_ssif.scc"
33 33
34# IPv4 waiting for carrier on 34# IPv4 waiting for carrier on
35KERNEL_FEATURES_append = " patches/ipv4/ipv4wait.scc" 35#KERNEL_FEATURES_append = " patches/ipv4/ipv4wait.scc"
36
37# Fixes for kernel
38KERNEL_FEATURES_append = " patches/security/keys.scc"
39 36
40# Fixes for pci 37# Fixes for pci
41KERNEL_FEATURES_append = " patches/drivers/pci/quirks.scc" 38KERNEL_FEATURES_append = " patches/drivers/pci/quirks.scc"
42 39
43# Fixes for ACPI PCCT (upstream in kernel v4.18-rc1 or newer) 40# Fixes for ACPI PCCT (upstream in kernel v4.18-rc1 or newer)
44KERNEL_FEATURES_append = " patches/drivers/mailbox/acpi-pcct.scc" 41#KERNEL_FEATURES_append = " patches/drivers/mailbox/acpi-pcct.scc"