From 4077100240aa4836244fca4f5505da1c05ca9e95 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 7 Aug 2015 15:27:30 +0200 Subject: [PATCH] meta-digi-arm: set preferred kernel version for ccimx6sbc to 3.14 Linux 3.10 is still available via project's local.conf. PREFERRED_VERSION_linux-dey = "3.10" KERNEL_DEVICETREE = "..." https://jira.digi.com/browse/DEL-1748 Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/ccimx6sbc.conf | 4 +--- meta-digi-arm/conf/machine/include/digi-defaults.inc | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index 7c3f722b1..f36dd5b9d 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -15,10 +15,8 @@ UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_config" UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_config" KERNEL_DEVICETREE ?= " \ - imx6dl-ccimx6sbc.dtb \ imx6dl-ccimx6sbc-w.dtb \ - imx6dl-ccimx6sbc-mw.dtb \ - imx6dl-ccimx6sbc-mwb.dtb \ + imx6dl-ccimx6sbc-wb.dtb \ imx6q-ccimx6sbc.dtb \ imx6q-ccimx6sbc-w.dtb \ imx6q-ccimx6sbc-wb.dtb \ diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 62b8f8485..887907161 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -17,6 +17,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # Digi BSP default versions PREFERRED_VERSION_linux-dey ?= "3.10" PREFERRED_VERSION_linux-dey_ccimx5 ?= "2.6.35.14" +PREFERRED_VERSION_linux-dey_ccimx6 ?= "3.14" PREFERRED_VERSION_u-boot-dey ?= "2013.01" PREFERRED_VERSION_u-boot-dey_ccimx5 ?= "2009.08" PREFERRED_VERSION_u-boot-dey_ccimx6 ?= "2013.04"