| commit | d1a90aa35d35426789d8f4061166a6dd8d27a30e | [log] [tgz] |
|---|---|---|
| author | George Liu <liuxiwei@inspur.com> | Fri Oct 02 16:39:04 2020 +0800 |
| committer | Andrew Geissler <geissonator@yahoo.com> | Mon Oct 05 17:10:25 2020 -0500 |
| tree | ab4fa879a050a7319486d1ed2fd8e399005ea880 | |
| parent | 56da762e1dc443e8e9eac3cabf31ec205d1f18e8 [diff] |
fp5280g2: Fix the occ-hwmon.*.conf config path Add the fsi-master file path to get the correct OCC information. Tested: built successfully on fp5280g2 and get the corrent OCC information by the D-Bus command. (From meta-inspur rev: bf4c44199ffa9cb3804df09932440002f9d0d2c7) Signed-off-by: George Liu <liuxiwei@inspur.com> Change-Id: I35ef99d98b3078b625e809e911265a56c4849cc9 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-inspur/meta-fp5280g2/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-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf similarity index 100% rename from meta-inspur/meta-fp5280g2/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 rename to meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
diff --git a/meta-inspur/meta-fp5280g2/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-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf similarity index 100% rename from meta-inspur/meta-fp5280g2/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 rename to meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 2dd9ee5..3b41663 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -22,7 +22,7 @@ 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ " -OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}"