From 267fa80fea2d3672e631b560b00dfbbd6bfba214 Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Mon, 9 Apr 2018 12:30:07 +0200 Subject: [PATCH] dragonboard820c: switch to 4.14 kernel Now that the LT 4.14 kernel branch has support for 8096 and DB820c, let's use it by default. We no longer need (and maintain the 4.11 based recipe). At this point, the 4.14 recipe is expected to be used for all 8064, 8016 and 8096 machines. Signed-off-by: Nicolas Dechesne --- conf/machine/include/qcom-apq8096.inc | 2 +- .../linux/linux-linaro-qcomlt-db820c_4.11.bb | 20 ------------------- .../linux/linux-linaro-qcomlt_4.14.bb | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 recipes-kernel/linux/linux-linaro-qcomlt-db820c_4.11.bb diff --git a/conf/machine/include/qcom-apq8096.inc b/conf/machine/include/qcom-apq8096.inc index 6ce96c1..1023f95 100644 --- a/conf/machine/include/qcom-apq8096.inc +++ b/conf/machine/include/qcom-apq8096.inc @@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa" PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt-db820c" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt" # Fastboot expects an ext4 image, which needs to be 4096 aligned IMAGE_FSTYPES_append = " ext4.gz" diff --git a/recipes-kernel/linux/linux-linaro-qcomlt-db820c_4.11.bb b/recipes-kernel/linux/linux-linaro-qcomlt-db820c_4.11.bb deleted file mode 100644 index be6b8a7..0000000 --- a/recipes-kernel/linux/linux-linaro-qcomlt-db820c_4.11.bb +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2014 Linaro -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Linaro Qualcomm Landing team 4.11 Kernel" - -require recipes-kernel/linux/linux-linaro-qcom.inc -require recipes-kernel/linux/linux-qcom-bootimg.inc - -LOCALVERSION ?= "-linaro-lt-qcom" -SRCBRANCH ?= "release/db820c/qcomlt-4.11" -SRCREV ?= "9dae2e87b04e2448146e6d7f812fc1c7cc18ed11" - -COMPATIBLE_MACHINE = "(apq8064|apq8016|apq8096)" - -# preferred kernel branch for 8064 and 8016 is 4.4 -DEFAULT_PREFERENCE_apq8064 = "-1" -DEFAULT_PREFERENCE_apq8016 = "-1" - -# Wifi firmware has a recognizable arch :( -ERROR_QA_remove = "arch" diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_4.14.bb b/recipes-kernel/linux/linux-linaro-qcomlt_4.14.bb index d7db2bf..e724baf 100644 --- a/recipes-kernel/linux/linux-linaro-qcomlt_4.14.bb +++ b/recipes-kernel/linux/linux-linaro-qcomlt_4.14.bb @@ -12,7 +12,7 @@ LOCALVERSION ?= "-linaro-lt-qcom" SRCBRANCH ?= "release/qcomlt-4.14" SRCREV ?= "a0bbc24175535dc7e4ec898f36c8070ae3c67b2c" -COMPATIBLE_MACHINE = "(ifc6410|sd-600eval|dragonboard-410c)" +COMPATIBLE_MACHINE = "(apq8064|apq8016|apq8096)" # Wifi firmware has a recognizable arch :( ERROR_QA_remove = "arch"