diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-03-06 22:30:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-03-06 22:30:21 +0000 |
| commit | 1144907f57b9a57e5235ef201de2b6633d23f834 (patch) | |
| tree | 5cacb29d261facef56b0b17a9c386440e26539e9 | |
| parent | 9bda1264f34b9b2250fea50cf4895bf0ff818028 (diff) | |
| parent | 8c0f97cdd12f30dc30291bacf9bdf8a928fb4a55 (diff) | |
Merge "enabling kernel 4.14"
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_intel-corei7-64.inc | 3 | ||||
| -rw-r--r-- | meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend (renamed from meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend) | 2 | ||||
| l--------- | meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend | 1 |
3 files changed, 3 insertions, 3 deletions
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 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 |