There is no reason to diverge from mainline so we revert the device tree name change.
This patch changes the machine definition and the Linux kernel recipe so the tree is kept buildable. Signed-off-by: Otavio Salvador <[email protected]> --- conf/machine/wandboard.conf | 6 ------ recipes-kernel/linux/linux-wandboard_4.1-2.0.x.bb | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/conf/machine/wandboard.conf b/conf/machine/wandboard.conf index a3b04ea..c13ca3d 100644 --- a/conf/machine/wandboard.conf +++ b/conf/machine/wandboard.conf @@ -21,12 +21,6 @@ WANDBOARD_DEFAULT_KERNEL = "linux-wandboard" WANDBOARD_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc" PREFERRED_PROVIDER_virtual/kernel ?= "${WANDBOARD_DEFAULT_KERNEL}" KERNEL_DEVICETREE = " \ - imx6dl-wandboard-revb1.dtb \ - imx6dl-wandboard-revc1.dtb \ - imx6q-wandboard-revb1.dtb \ - imx6q-wandboard-revc1.dtb \ -" -KERNEL_DEVICETREE_use-mainline-bsp = " \ imx6dl-wandboard.dtb \ imx6dl-wandboard-revb1.dtb \ imx6q-wandboard.dtb \ diff --git a/recipes-kernel/linux/linux-wandboard_4.1-2.0.x.bb b/recipes-kernel/linux/linux-wandboard_4.1-2.0.x.bb index 1936640..cc1a9d6 100644 --- a/recipes-kernel/linux/linux-wandboard_4.1-2.0.x.bb +++ b/recipes-kernel/linux/linux-wandboard_4.1-2.0.x.bb @@ -6,6 +6,6 @@ include linux-wandboard.inc DEPENDS += "lzop-native bc-native" SRCBRANCH = "4.1-2.0.x-imx" -SRCREV = "18945fa6f63c4c5d2df14998c5e74bf799e6f65e" +SRCREV = "0d698de42426a92e3ba47071f11960aeb91eb349" COMPATIBLE_MACHINE = "(wandboard)" -- 2.14.2 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
