From: Dominig ar Foll Intel Open Source Date: Fri, 2 Mar 2018 16:40:04 +0000 (+0100) Subject: enabling kernel 4.14 X-Git-Tag: 5.99.1~55^2 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=inline;h=refs%2Fchanges%2F47%2F13547%2F1;p=AGL%2Fmeta-agl.git enabling kernel 4.14 Change-Id: I95916851bcdb730767206c736b2e2b2510c9517b Signed-off-by: Dominig ar Foll Intel Open Source --- diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc index cc181ddaa..534d36475 100644 --- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc +++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc @@ -11,3 +11,6 @@ INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz" # Modify this file under meta-agl-bsp/meta-intel/wic to change the # kernel command line, including to change the screen resolution. WKS_FILE = "systemd-intel-corei7-64-bootdisk.wks" + +PREFERRED_VERSION_linux-intel ?= "4.14%" +PREFERRED_VERSION_linux-intel-rt ?= "4.14%" diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend similarity index 93% rename from meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend rename to meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend index 7f249f207..c49b8ecb0 100644 --- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend +++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -require recipes-kernel/linux/linux-agl-4.9.inc - # adding most supported USB Bluetooth, Wifi, and Ethernet devices SRC_URI_append = " file://usb-devices.cfg" KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/usb-devices.cfg" diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend deleted file mode 120000 index 323cbe55a..000000000 --- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend +++ /dev/null @@ -1 +0,0 @@ -linux-intel_4.9%.bbappend \ No newline at end of file