From 06d353c410eca1edb6e03c809689d0ae5991b11f Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 3 Aug 2017 19:45:38 +0200 Subject: [PATCH] meta-digi-arm: clean not used variables and machine features After the 'ccardimx28js' platform removal, these variables and machine features are not used anymore, so remove them. https://jira.digi.com/browse/DEL-4771 Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/ccimx6ulsbc.conf | 2 -- meta-digi-arm/conf/machine/include/digi-defaults.inc | 3 --- 2 files changed, 5 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf index 33664cb87..2f99f4cf3 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf @@ -28,8 +28,6 @@ KERNEL_DEVICETREE ?= " \ SERIAL_CONSOLES ?= "115200;ttymxc4" -MACHINE_FEATURES += "second-eth" - # Bluetooth tty BT_TTY ?= "ttymxc0" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index fe6f69e66..29567ceff 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -16,11 +16,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # Help variables used in recipes HAVE_WIFI = "${@bb.utils.contains('MACHINE_FEATURES', 'wifi', '1', '', d)}" -HAVE_SECOND_ETH = "${@bb.utils.contains('MACHINE_FEATURES', 'second-eth', '1', '', d)}" HAVE_BT = "${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', '1', '', d)}" -HAVE_1WIRE = "${@bb.utils.contains('MACHINE_FEATURES', '1-wire', '1', '', d)}" HAVE_GUI = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '1', '', d)}" -HAVE_EXAMPLE = "${@bb.utils.contains('IMAGE_FEATURES', 'dey-examples', '1', '', d)}" # # Ethernet configuration used in recipes