From cbf4210231674f83d3feb839c46808bef788a5e2 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Fri, 1 Feb 2019 09:13:58 -0800 Subject: meta-quanta: q71l: add prefixes to phosphor-hwmon Add prefixes to phosphor-hwmon variables so they won't interfere with other machines variables of the same name. (From meta-quanta rev: 9b85273bcf43426b3a8b712a55a7d80b4d49afeb) Change-Id: I94f24923c89ea5e61ad7c1e9e69f723c920ab915 Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- .../recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 19365c2fc..6da5ccb90 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -4,14 +4,16 @@ FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:" # More conf files can be added as sensors are added. -ITEMS = "pwm-tacho-controller@1e786000.conf" +Q71L_ITEMS = "pwm-tacho-controller@1e786000.conf" -TEMPS = "tmp75@4c tmp75@4e tmp75@4f" -TEMPBASE = "ahb/apb/i2c@1e78a000/i2c-bus@80/{0}.conf" -ITEMS += "${@compose_list(d, 'TEMPBASE', 'TEMPS')}" -ITEMS += "iio-hwmon.conf" +Q71L_TEMPS = "tmp75@4c tmp75@4e tmp75@4f" +Q71L_TEMPBASE = "ahb/apb/i2c@1e78a000/i2c-bus@80/{0}.conf" + +Q71L_ITEMS += "${@compose_list(d, 'Q71L_TEMPBASE', 'Q71L_TEMPS')}" + +Q71L_ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_quanta-q71l := " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_quanta-q71l := " ${@compose_list(d, 'ENVS', 'Q71L_ITEMS')}" EXTRA_OECONF_append_quanta-q71l = " --enable-negative-errno-on-fail" -- cgit v1.2.3