From 9e8cf2f578b9d7330d708dc96d18e4e7e4220300 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Tue, 2 Oct 2018 13:38:46 -0700 Subject: meta-quanta: q71l: rename phosphor-hwmon bbappend Rename phosphor-hwmon%.bbappend to phosphor-hwmon_%.bbappend. Tested: Built quanta-q71l and found confs in rootfs. (From meta-quanta rev: 09536415f92461f26f357a341e63b4e0267bd6bb) Change-Id: I9b35e71eefef156eb8d76d79a7c599a940258715 Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- .../recipes-phosphor/sensors/phosphor-hwmon%.bbappend | 17 ----------------- .../ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf | 1 - .../ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf | 1 - .../ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf | 1 - .../sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf | 19 ------------------- .../obmc/hwmon/pwm-tacho-controller@1e786000.conf | 9 --------- .../ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf | 1 + .../ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf | 1 + .../ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf | 1 + .../sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf | 19 +++++++++++++++++++ .../obmc/hwmon/pwm-tacho-controller@1e786000.conf | 9 +++++++++ .../sensors/phosphor-hwmon_%.bbappend | 17 +++++++++++++++++ 12 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/pwm-tacho-controller@1e786000.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend (limited to 'meta-quanta') diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend deleted file mode 100644 index 19365c2fc..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -inherit obmc-phosphor-utils - -FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:" - -# More conf files can be added as sensors are added. - -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" - -ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_quanta-q71l := " ${@compose_list(d, 'ENVS', 'ITEMS')}" - -EXTRA_OECONF_append_quanta-q71l = " --enable-negative-errno-on-fail" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf deleted file mode 100644 index 4ac0ebfc9..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf +++ /dev/null @@ -1 +0,0 @@ -LABEL_temp1=temp2_inlet diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf deleted file mode 100644 index 504e4cfeb..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf +++ /dev/null @@ -1 +0,0 @@ -LABEL_temp1=temp3 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf deleted file mode 100644 index 10ec2653b..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf +++ /dev/null @@ -1 +0,0 @@ -LABEL_temp1=temp1 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf deleted file mode 100644 index cb8d54e18..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf +++ /dev/null @@ -1,19 +0,0 @@ -LABEL_in1=p3v3_scaled -GAIN_in1=1.62 -LABEL_in2=p5v_scaled -GAIN_in2=2.47 -LABEL_in3=p12v_aux_scaled -GAIN_in3=6.01 -LABEL_in4=p1v1_ssb -LABEL_in5=pvcc_cpu0 -LABEL_in6=pvcc_cpu1 -LABEL_in7=p3v3_aux_scaled -GAIN_in7=1.62 -LABEL_in8=p5v_aux_scaled -GAIN_in8=2.47 -LABEL_in9=pvcc_cpu2 -LABEL_in10=pvcc_cpu3 -LABEL_in11=p12v_scaled -GAIN_in11=6.01 -LABEL_in12=p3v_vbat -GAIN_in12=1.4992504 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/pwm-tacho-controller@1e786000.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/pwm-tacho-controller@1e786000.conf deleted file mode 100644 index dfdecb40d..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/pwm-tacho-controller@1e786000.conf +++ /dev/null @@ -1,9 +0,0 @@ -LABEL_fan1=fan1 -LABEL_fan2=fan2 -LABEL_fan3=fan3 -LABEL_fan4=fan4 -LABEL_fan5=fan5 -LABEL_fan6=fan6 -LABEL_fan7=fan7 -LABEL_fan8=fan8 - diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf new file mode 100644 index 000000000..4ac0ebfc9 --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf @@ -0,0 +1 @@ +LABEL_temp1=temp2_inlet diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf new file mode 100644 index 000000000..504e4cfeb --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf @@ -0,0 +1 @@ +LABEL_temp1=temp3 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf new file mode 100644 index 000000000..10ec2653b --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf @@ -0,0 +1 @@ +LABEL_temp1=temp1 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf new file mode 100644 index 000000000..cb8d54e18 --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf @@ -0,0 +1,19 @@ +LABEL_in1=p3v3_scaled +GAIN_in1=1.62 +LABEL_in2=p5v_scaled +GAIN_in2=2.47 +LABEL_in3=p12v_aux_scaled +GAIN_in3=6.01 +LABEL_in4=p1v1_ssb +LABEL_in5=pvcc_cpu0 +LABEL_in6=pvcc_cpu1 +LABEL_in7=p3v3_aux_scaled +GAIN_in7=1.62 +LABEL_in8=p5v_aux_scaled +GAIN_in8=2.47 +LABEL_in9=pvcc_cpu2 +LABEL_in10=pvcc_cpu3 +LABEL_in11=p12v_scaled +GAIN_in11=6.01 +LABEL_in12=p3v_vbat +GAIN_in12=1.4992504 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf new file mode 100644 index 000000000..dfdecb40d --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf @@ -0,0 +1,9 @@ +LABEL_fan1=fan1 +LABEL_fan2=fan2 +LABEL_fan3=fan3 +LABEL_fan4=fan4 +LABEL_fan5=fan5 +LABEL_fan6=fan6 +LABEL_fan7=fan7 +LABEL_fan8=fan8 + diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend new file mode 100644 index 000000000..19365c2fc --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -0,0 +1,17 @@ +inherit obmc-phosphor-utils + +FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:" + +# More conf files can be added as sensors are added. + +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" + +ENVS = "obmc/hwmon/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_quanta-q71l := " ${@compose_list(d, 'ENVS', 'ITEMS')}" + +EXTRA_OECONF_append_quanta-q71l = " --enable-negative-errno-on-fail" -- cgit v1.2.3