summaryrefslogtreecommitdiff
path: root/conf/bitbake.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/bitbake.conf')
-rw-r--r--conf/bitbake.conf19
1 files changed, 19 insertions, 0 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 37b17d6ccf..c4af34e8d7 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -716,3 +716,22 @@ COMBINED_FEATURES = "\
${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \
${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
+
+# We want madwifi if all of the following are true:
+# - distro has pci, wifi, and madwifi in its features
+# - machine has pci in its features
+COMBINED_FEATURES += "${@base_ifelse( \
+ base_contains('DISTRO_FEATURES', ('pci', 'wifi', 'madwifi'), True, False, d) and \
+ base_contains('MACHINE_FEATURES', 'pci', True, False, d), \
+ 'madwifi', '')}"
+
+# We want hostap if all of the following are true:
+# - 'wifi' and 'hostap' are in distro features
+# - either 'pci' or 'pcmcia' are in both distro and machine features
+COMBINED_FEATURES += "${@base_ifelse( \
+ base_contains('DISTRO_FEATURES', ('wifi', 'hostap'), True, False, d) and \
+ ((base_contains('MACHINE_FEATURES', 'pci', True, False, d) and \
+ base_contains('DISTRO_FEATURES', 'pci', True, False, d)) or \
+ (base_contains('MACHINE_FEATURES', 'pcmcia', True, False, d) and \
+ base_contains('DISTRO_FEATURES', 'pcmcia', True, False, d))), \
+ 'hostap', '')}"