From 559017307cd076a282bc38ccfc1fb25754a35330 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Dec 2019 13:03:03 -0800 Subject: Fixup hwmon filenames Our previous start_hwmon.sh script was not escaping the filenames properly, resulting in configuration filepaths that differed from the actual filepaths. (From meta-ingrasys rev: 66419549bc438ce800b9149ccae0ef02bf7e3bca) Change-Id: I4d7c634c8cbe0987ae4407d9fd1431ff16064119 Signed-off-by: William A. Kennington III Signed-off-by: Brad Bishop --- .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 84 ---------------------- .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 84 ---------------------- .../00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf | 84 ++++++++++++++++++++++ .../01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf | 84 ++++++++++++++++++++++ .../sensors/phosphor-hwmon_%.bbappend | 6 +- 5 files changed, 171 insertions(+), 171 deletions(-) delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf (limited to 'meta-ingrasys') diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf deleted file mode 100644 index a5ccf550d..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ /dev/null @@ -1,84 +0,0 @@ -REMOVERCS = "11, 74, 90, 110" -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -LABEL_temp34 = "p0_core0_temp" -LABEL_temp37 = "p0_core1_temp" -LABEL_temp40 = "p0_core2_temp" -LABEL_temp43 = "p0_core3_temp" -LABEL_temp46 = "p0_core4_temp" -LABEL_temp49 = "p0_core5_temp" -LABEL_temp52 = "p0_core6_temp" -LABEL_temp55 = "p0_core7_temp" -LABEL_temp58 = "p0_core8_temp" -LABEL_temp61 = "p0_core9_temp" -LABEL_temp64 = "p0_core10_temp" -LABEL_temp67 = "p0_core11_temp" -LABEL_temp70 = "p0_core12_temp" -LABEL_temp73 = "p0_core13_temp" -LABEL_temp76 = "p0_core14_temp" -LABEL_temp79 = "p0_core15_temp" -LABEL_temp82 = "p0_core16_temp" -LABEL_temp85 = "p0_core17_temp" -LABEL_temp88 = "p0_core18_temp" -LABEL_temp91 = "p0_core19_temp" -LABEL_temp94 = "p0_core20_temp" -LABEL_temp97 = "p0_core21_temp" -LABEL_temp100 = "p0_core22_temp" -LABEL_temp103 = "p0_core23_temp" -LABEL_temp224 = "dimm0_temp" -LABEL_temp226 = "dimm1_temp" -LABEL_temp228 = "dimm2_temp" -LABEL_temp230 = "dimm3_temp" -LABEL_temp232 = "dimm4_temp" -LABEL_temp234 = "dimm5_temp" -LABEL_temp236 = "dimm6_temp" -LABEL_temp238 = "dimm7_temp" -LABEL_temp240 = "dimm8_temp" -LABEL_temp242 = "dimm9_temp" -LABEL_temp244 = "dimm10_temp" -LABEL_temp246 = "dimm11_temp" -LABEL_temp248 = "dimm12_temp" -LABEL_temp250 = "dimm13_temp" -LABEL_temp252 = "dimm14_temp" -LABEL_temp254 = "dimm15_temp" -LABEL_power2 = "p0_power" -LABEL_power3 = "p0_vdd_power" -LABEL_power4 = "p0_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf deleted file mode 100644 index 55f3f1dcf..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ /dev/null @@ -1,84 +0,0 @@ -REMOVERCS = "11, 74, 90, 110" -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -LABEL_temp114 = "p1_core0_temp" -LABEL_temp117 = "p1_core1_temp" -LABEL_temp120 = "p1_core2_temp" -LABEL_temp123 = "p1_core3_temp" -LABEL_temp126 = "p1_core4_temp" -LABEL_temp129 = "p1_core5_temp" -LABEL_temp132 = "p1_core6_temp" -LABEL_temp135 = "p1_core7_temp" -LABEL_temp138 = "p1_core8_temp" -LABEL_temp141 = "p1_core9_temp" -LABEL_temp144 = "p1_core10_temp" -LABEL_temp147 = "p1_core11_temp" -LABEL_temp150 = "p1_core12_temp" -LABEL_temp153 = "p1_core13_temp" -LABEL_temp156 = "p1_core14_temp" -LABEL_temp159 = "p1_core15_temp" -LABEL_temp162 = "p1_core16_temp" -LABEL_temp165 = "p1_core17_temp" -LABEL_temp168 = "p1_core18_temp" -LABEL_temp171 = "p1_core19_temp" -LABEL_temp174 = "p1_core20_temp" -LABEL_temp177 = "p1_core21_temp" -LABEL_temp180 = "p1_core22_temp" -LABEL_temp183 = "p1_core23_temp" -LABEL_temp192 = "dimm16_temp" -LABEL_temp194 = "dimm17_temp" -LABEL_temp196 = "dimm18_temp" -LABEL_temp198 = "dimm19_temp" -LABEL_temp200 = "dimm20_temp" -LABEL_temp202 = "dimm21_temp" -LABEL_temp204 = "dimm22_temp" -LABEL_temp206 = "dimm23_temp" -LABEL_temp208 = "dimm24_temp" -LABEL_temp210 = "dimm25_temp" -LABEL_temp212 = "dimm26_temp" -LABEL_temp224 = "dimm27_temp" -LABEL_temp216 = "dimm28_temp" -LABEL_temp218 = "dimm29_temp" -LABEL_temp220 = "dimm30_temp" -LABEL_temp222 = "dimm31_temp" -LABEL_power2 = "p1_power" -LABEL_power3 = "p1_vdd_power" -LABEL_power4 = "p1_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf new file mode 100644 index 000000000..a5ccf550d --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf @@ -0,0 +1,84 @@ +REMOVERCS = "11, 74, 90, 110" +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp34 = "p0_core0_temp" +LABEL_temp37 = "p0_core1_temp" +LABEL_temp40 = "p0_core2_temp" +LABEL_temp43 = "p0_core3_temp" +LABEL_temp46 = "p0_core4_temp" +LABEL_temp49 = "p0_core5_temp" +LABEL_temp52 = "p0_core6_temp" +LABEL_temp55 = "p0_core7_temp" +LABEL_temp58 = "p0_core8_temp" +LABEL_temp61 = "p0_core9_temp" +LABEL_temp64 = "p0_core10_temp" +LABEL_temp67 = "p0_core11_temp" +LABEL_temp70 = "p0_core12_temp" +LABEL_temp73 = "p0_core13_temp" +LABEL_temp76 = "p0_core14_temp" +LABEL_temp79 = "p0_core15_temp" +LABEL_temp82 = "p0_core16_temp" +LABEL_temp85 = "p0_core17_temp" +LABEL_temp88 = "p0_core18_temp" +LABEL_temp91 = "p0_core19_temp" +LABEL_temp94 = "p0_core20_temp" +LABEL_temp97 = "p0_core21_temp" +LABEL_temp100 = "p0_core22_temp" +LABEL_temp103 = "p0_core23_temp" +LABEL_temp224 = "dimm0_temp" +LABEL_temp226 = "dimm1_temp" +LABEL_temp228 = "dimm2_temp" +LABEL_temp230 = "dimm3_temp" +LABEL_temp232 = "dimm4_temp" +LABEL_temp234 = "dimm5_temp" +LABEL_temp236 = "dimm6_temp" +LABEL_temp238 = "dimm7_temp" +LABEL_temp240 = "dimm8_temp" +LABEL_temp242 = "dimm9_temp" +LABEL_temp244 = "dimm10_temp" +LABEL_temp246 = "dimm11_temp" +LABEL_temp248 = "dimm12_temp" +LABEL_temp250 = "dimm13_temp" +LABEL_temp252 = "dimm14_temp" +LABEL_temp254 = "dimm15_temp" +LABEL_power2 = "p0_power" +LABEL_power3 = "p0_vdd_power" +LABEL_power4 = "p0_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf new file mode 100644 index 000000000..55f3f1dcf --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf @@ -0,0 +1,84 @@ +REMOVERCS = "11, 74, 90, 110" +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp114 = "p1_core0_temp" +LABEL_temp117 = "p1_core1_temp" +LABEL_temp120 = "p1_core2_temp" +LABEL_temp123 = "p1_core3_temp" +LABEL_temp126 = "p1_core4_temp" +LABEL_temp129 = "p1_core5_temp" +LABEL_temp132 = "p1_core6_temp" +LABEL_temp135 = "p1_core7_temp" +LABEL_temp138 = "p1_core8_temp" +LABEL_temp141 = "p1_core9_temp" +LABEL_temp144 = "p1_core10_temp" +LABEL_temp147 = "p1_core11_temp" +LABEL_temp150 = "p1_core12_temp" +LABEL_temp153 = "p1_core13_temp" +LABEL_temp156 = "p1_core14_temp" +LABEL_temp159 = "p1_core15_temp" +LABEL_temp162 = "p1_core16_temp" +LABEL_temp165 = "p1_core17_temp" +LABEL_temp168 = "p1_core18_temp" +LABEL_temp171 = "p1_core19_temp" +LABEL_temp174 = "p1_core20_temp" +LABEL_temp177 = "p1_core21_temp" +LABEL_temp180 = "p1_core22_temp" +LABEL_temp183 = "p1_core23_temp" +LABEL_temp192 = "dimm16_temp" +LABEL_temp194 = "dimm17_temp" +LABEL_temp196 = "dimm18_temp" +LABEL_temp198 = "dimm19_temp" +LABEL_temp200 = "dimm20_temp" +LABEL_temp202 = "dimm21_temp" +LABEL_temp204 = "dimm22_temp" +LABEL_temp206 = "dimm23_temp" +LABEL_temp208 = "dimm24_temp" +LABEL_temp210 = "dimm25_temp" +LABEL_temp212 = "dimm26_temp" +LABEL_temp224 = "dimm27_temp" +LABEL_temp216 = "dimm28_temp" +LABEL_temp218 = "dimm29_temp" +LABEL_temp220 = "dimm30_temp" +LABEL_temp222 = "dimm31_temp" +LABEL_power2 = "p1_power" +LABEL_power3 = "p1_vdd_power" +LABEL_power4 = "p1_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index b5b0fbced..5260498b8 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -25,10 +25,10 @@ ZAIUS_ITEMS += " onewire2.conf" ZAIUS_ITEMS += " onewire3.conf" ZAIUS_OCCS = " \ - 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ - 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ + 00:00:00:06/sbefifo1-dev0/occ-hwmon.1 \ + 00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2 \ " -ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00:00/{0}.conf" ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}" ENVS = "obmc/hwmon/{0}" -- cgit v1.2.3