From 328a6cdb5e657267a25e8c1108ee1b2a46b3112d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 17 Oct 2013 10:36:51 +0200 Subject: [PATCH] meta-digi: move helper variables to a common place Those boolean helper variables can be used in different recipes so move them to a common place. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 9 ++++++++- meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb | 8 -------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 6efbeb6b3..87dbf1f12 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -7,7 +7,14 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/libx11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11', '', d)}" PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native" -IS_KERNEL_2X ?= "${@base_version_less_or_equal('PREFERRED_VERSION_linux-dey', '2.6.35.14', '1', '', d)}" +# Help variables used in recipes +HAVE_WIFI = "${@base_contains('MACHINE_FEATURES', 'wifi', '1', '', d)}" +HAVE_EXT_ETH = "${@base_contains('MACHINE_FEATURES', 'ext-eth', '1', '', d)}" +HAVE_BT = "${@base_contains('MACHINE_FEATURES', 'bluetooth', '1', '', d)}" +HAVE_1WIRE = "${@base_contains('MACHINE_FEATURES', '1-wire', '1', '', d)}" +HAVE_GUI = "${@base_contains('DISTRO_FEATURES', 'x11', '1', '', d)}" +HAVE_EXAMPLE = "${@base_contains('IMAGE_FEATURES', 'dey-examples', '1', '', d)}" +IS_KERNEL_2X = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-dey', '2.6.35.14', '1', '', d)}" # Digi BSP default settings IMAGE_CLASSES = "image_types_digi" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 5aaeb242c..26f2a9a0c 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -12,14 +12,6 @@ PR = "${DISTRO}.${INC_PR}.0" LOCALVERSION_mxs = "mxs" LOCALVERSION_cpx2_mxs = "mxs+gateways" -# Features to configure DTS and kernel config -HAVE_WIFI = "${@base_contains('MACHINE_FEATURES', 'wifi', '1', '', d)}" -HAVE_EXT_ETH = "${@base_contains('MACHINE_FEATURES', 'ext-eth', '1', '', d)}" -HAVE_BT = "${@base_contains('MACHINE_FEATURES', 'bluetooth', '1', '', d)}" -HAVE_1WIRE = "${@base_contains('MACHINE_FEATURES', '1-wire', '1', '', d)}" -HAVE_GUI = "${@base_contains('DISTRO_FEATURES', 'x11', '1', '', d)}" -HAVE_EXAMPLE = "${@base_contains('IMAGE_FEATURES', 'dey-examples', '1', '', d)}" - # Kernel configuration fragments KERNEL_CFG_FRAGS ?= "" KERNEL_CFG_FRAGS_append = " ${@base_conditional('HAVE_EXAMPLE', '1' , 'file://config-spidev.cfg', '', d)}"