diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-06-20 19:46:38 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-20 19:46:38 +0300 |
commit | 43a183cc0926da36e3a218efa02ab4838ace316f (patch) | |
tree | 9ea192b408585fc2a19b54d196c3d56eaddc4acb /meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | |
parent | 5575b1d27fc222f973d96dc06af0f21ba7656f28 (diff) | |
parent | 2c7e8f4ce61f2e0407c37e98e22bbb13e562b414 (diff) | |
download | openbmc-43a183cc0926da36e3a218efa02ab4838ace316f.tar.xz |
Merge pull request #12 from Intel-BMC/update
Update
Diffstat (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend')
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 75e7655af..993ca281f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -9,12 +9,12 @@ SRC_URI += " \ CHIPS = " \ bus@1e78a000/i2c-bus@100/max31785@52_air \ bus@1e78a000/i2c-bus@100/max31785@52_water \ + bus@1e78a000/i2c-bus@100/power-supply@68 \ + bus@1e78a000/i2c-bus@100/power-supply@69 \ " CHIPS_append_witherspoon = " \ bus@1e78a000/i2c-bus@100/bmp280@77 \ bus@1e78a000/i2c-bus@100/dps310@76 \ - bus@1e78a000/i2c-bus@100/power-supply@68 \ - bus@1e78a000/i2c-bus@100/power-supply@69 \ bus@1e78a000/i2c-bus@140/ir35221@70 \ bus@1e78a000/i2c-bus@140/ir35221@71 \ bus@1e78a000/i2c-bus@180/ir35221@70 \ @@ -24,21 +24,30 @@ CHIPS_append_witherspoon = " \ CHIPS_append_swift = " \ bus@1e78a000/i2c-bus@440/tmp275@4a \ bus@1e78a000/i2c-bus@440/tmp275@48 \ + bus@1e78a000/i2c-bus@300/tmp275@48 \ + bus@1e78a000/i2c-bus@300/dps310@76 \ + bus@1e78a000/i2c-bus@300/si7021a20@20 \ + bus@1e78a000/i2c-bus@380/ir35219@70 \ + bus@1e78a000/i2c-bus@380/ir35221@71 \ + bus@1e78a000/i2c-bus@380/ir35221@72 \ + bus@1e78a000/i2c-bus@3c0/ir35219@70 \ + bus@1e78a000/i2c-bus@3c0/ir35221@71 \ + bus@1e78a000/i2c-bus@3c0/ir35221@72 \ " ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" -OCCS_witherspoon = " \ - 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 \ - " -OCCSFMT_witherspoon = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" -OCCITEMS_witherspoon = "${@compose_list(d, 'OCCSFMT_witherspoon', 'OCCS_witherspoon')}" +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 \ + " +OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_witherspoon = " ${@compose_list(d, 'ENVS', 'OCCITEMS_witherspoon')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/max31785.conf" SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" |