summaryrefslogtreecommitdiff
path: root/meta-ibm/meta-witherspoon
AgeCommit message (Collapse)AuthorFilesLines
2019-06-11swift.conf: Build an ext4 imageAdriana Kobylak1-0/+2
Build an ext4 image for swift to be used in its eMMC chip. Tested: An ext4 image was built in addition to the current ubi ones. (From meta-ibm rev: 59bef037b63a73626434bfbfa22e1a53ca7133cd) Change-Id: I102b821754e2dd4998797f29bb935bd69324e8a3 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-11swif: Add power supply sensorsMatthew Barth3-2/+48
Initially configure Swift's power supply sensors as they were on Witherspoon. Keep the config files separate between systems as they will be different due to differences between the power supplies used. Tested: Built Swift image that contained the config files Built Witherspoon image that still contained the config files (From meta-ibm rev: d8d27673f1b277db83859408842619ae24606235) Change-Id: I64d893c6c5dbea0e4d4a592042b17d6bad5b4596 Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-11swif: Add CP0/CP1 OCC sensorsMatthew Barth3-7/+809
Create Swift's OCC sensors initially using the same thresholds as they were on Witherspoon. Swift has 12 dimms/proc with 2 temp sensors per dimm. Also there are 2 GPUs/proc. Tested: Built image that contained the config files (From meta-ibm rev: 2bd366ab4bd4b9e085b70d46f07f5f1acdd35790) Change-Id: Ia381c561f283c4d542e0035534375fa14c493278 Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-10Swift: Swap power supply I2C bus addresses.Matt Spinler2-4/+4
The top supply, PS0, is 0x68, and PS1 is 0x69. (From meta-ibm rev: c4df414e0284f1859ff1c709eb84eace6d848e87) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: I4a9f38830f86b18932a918119bafaf1f5bd5d72a Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-10Swift: Fix UCD90160 device pathMatt Spinler1-1/+1
More than 1 directory in the path is dependent on the I2C bus. (From meta-ibm rev: dc4b6022d75a5ed50588c71f1890f5cb7df0dcd4) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: Iec2026ab941e735e684b939bca40482a7c603150 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-10Swift: run avsbus-disable.sh through dos2unixMatt Spinler1-18/+18
It had the '^M' which which prevented the BMC from running it. (From meta-ibm rev: 06b094f1a87a61da756323ce5ea3e75d6f4c709f) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: I42dfc1a8d3af5c8f949003775b3076218de9035a Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-10Swift: Run power-workarounds after PGOODMatt Spinler6-0/+41
On swift, the VRMs that power-workarounds.sh touches can't communicate until the system has been powered on. Rearrange the services to make this happen. (From meta-ibm rev: b5980e57561bc2f161bd61965551c1a3e1323131) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: I0ac7fb6adaa0de18feb525259f991e99c147e244 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-05swift: Add CP1 ir35219 and ir35221 sensorsMatthew Barth4-0/+96
On processor 1 in Swift, an IR35219 is used for the VDD vrm and IR35221s are used for the VDN & VCS vrms and VIO vrm. Initially the same warn/crit configuration values as Witherspoon will be used. Tested: Built image that contained the config files (From meta-ibm rev: a296aa3c0ad4278c060c66c4ca4c1ed5913cfe06) Change-Id: I961c12469c550d36ec03bc5f249fe46019d1c5d1 Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-05swift: Add CP0 ir35219 and ir35221 sensorsMatthew Barth4-0/+96
On processor 0 in Swift, an IR35219 is used for the VDD vrm and IR35221s are used for the VDN & VCS vrms and VIO vrm.. Initially the same warn/crit configuration values as Witherspoon will be used. Tested: Built image that contained the config files (From meta-ibm rev: e21e2d20610744cfbf1d96345e0781ae3a47159d) Change-Id: I94b687e77f988442e9b6a7f5583608be01a793c8 Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-05swift: Add si7021a20 ambient sensorMatthew Barth2-0/+6
Swift has 3 ambient temperature sensors, the si7021a20 will be labeled as `ambient2` and initially use the same warn/crit temperature configurations as Witherspoon. Tested: Built image that contained the config file (From meta-ibm rev: 44d15151813b30aeb9f93cf4afb2818be2ed0b70) Change-Id: Ie5e538d270ab27cd1ebd4979c79038c1b18bb1db Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-05swift: Add dps310 ambient sensorMatthew Barth2-0/+6
Swift has 3 ambient temperature sensors, the dps310 will be labeled as `ambient1` and initially use the same warn/crit temperature configurations as Witherspoon. Tested: Built image that contained the config file (From meta-ibm rev: b86d99ad97152a5932f0e53a3a80a422e421437b) Change-Id: Ibd7a11b9203d6ec82b500874d6d38a3e762e4173 Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-05swift: Add tmp275 ambient sensorMatthew Barth2-0/+6
Swift has 3 ambient temperature sensors, the tmp275 will be labeled as `ambient0` and initially use the same warn/crit temperature configurations as Witherspoon. Tested: Built image that contained the config file (From meta-ibm rev: 51daebff52005f4cf40fa5a4bf8c5f779bb6c997) Change-Id: Iebb780c517a41ec64e5ad99ebf41c401faab90e9 Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-04Swift: Bump MRW versionMatt Spinler1-1/+1
Pick up a change that assigns types to the panel and VRM cards so gen_openpower_fru.pl can find them when looking for VPD. (From meta-ibm rev: 318efca67822aa625b6868bcb08508e7695c5bf3) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: I26537326fb1fe0e653d3c7c470710c8a93cafb5e Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-04witherspoon-pfault-analysis: srcrev bump 9c7897ce91..03c19db6a8Andrew Geissler1-1/+1
Brandon Wyman (7): Use YAML for UCD definitions Fill in example YAML file based on Witherspoon Update script and template to parse index and path Update to get RailNames from parsing YAML Update to get GPIConfigs from parsing YAML Update to get GPIOAnalysis from parsing YAML Add YAML and error function for MEM_GOODx faults (From meta-ibm rev: a97929f0835cb2d4106e63ca7ddc33ce72f3f7aa) Change-Id: I83a10984a83916107f864d7c54209c1f1ab4f367 Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-30Swift: Fix BMC VPD pathMatt Spinler1-1/+1
Fix the EEPROM path to match what is on the real hardware. (From meta-ibm rev: 8396c6dfc1da6cfe7594e50999f947e5af9dd9c7) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: Ibd8fc6aae43aadbf242498ba82f3c0660121d6fa Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-30Swift: Fix syntax error in gpio_defs.jsonMatt Spinler1-1/+1
Add a missing comma. (From meta-ibm rev: 3ea8d6e97d452bd77b51e081e880b8e211211efc) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: I9b9f25767b47a4f48a2653c7ba7a88cf1d4bb779 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-30meta-ibm: Swift: Add inventory config YAMLMatt Spinler4-2/+18
It will create the xyz.openbmc_project.Inventory.Item.Chassis interface on the chassis. (From meta-ibm rev: 8074814d81f5bd8b3b9467e2392f1888059ec897) Change-Id: I40c3d94bfdce7388e6c525b253d6b456b10b8604 Signed-off-by: Matt Spinler <spinler@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-30meta-ibm: witherspoon: drop channel.yamlBrad Bishop2-9/+0
These files aren't used by ipmid anymore, so drop. See host-ipmid change 41ac50530a for details. (From meta-ibm rev: 19be7dbb08bb6c4e9a992a41972148240f955b75) Change-Id: I648cb8b7f1dba2a5a32ed1a1b05c18a15334763a Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-29meta-ibm: witherspoon: remove unused inventory recipesBrad Bishop2-17/+0
With the transition to target class recipes for phosphor-inventory a couple files are now dead code and can be removed. (From meta-ibm rev: 2728c26b8515a86d9c773948faa4b750e6d3e448) Change-Id: I4dc355349a7ad34e87314ea021963816f0ebe50e Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-29witherspoon-128: Use ${MACHINE} for device tree file nameAdriana Kobylak1-1/+1
Replace "witherspoon-128" with ${MACHINE} for the device tree file name as it's better practice to use bitbake variables instead of hard-coding values. Tested: Output of "bitbake obmc-phosphor-image -e": # pre-expansion value: # "${KMACHINE}-bmc-opp-${MACHINE}.dtb" KERNEL_DEVICETREE="aspeed-bmc-opp-witherspoon-128.dtb" (From meta-ibm rev: 8bbd213225ea5d6e3d1eb8537308f398dc85b6a2) Change-Id: I46e72947ddf47d3cbc20ab04f2b949ee717423cf Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-29swift: Point to swift's kernel device treeAdriana Kobylak1-3/+1
The kernel device tree for swift has been merged upstream. Tested: Output of "bitbake obmc-phosphor-image -e": # pre-expansion value: # "${KMACHINE}-bmc-opp-${MACHINE}.dtb" KERNEL_DEVICETREE="aspeed-bmc-opp-swift.dtb" (From meta-ibm rev: b652e467727899419334e6bf8b5b63e3a4150b56) Change-Id: Ib7f4063234d1412bdbeb01044947d92c75df704e Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-29YAML updates for Swift MEM_GOODx fault isolationBrandon Wyman1-2/+90
Use new memGoodError() function to analyze MEM_GOOD0 and MEM_GOOD1 faults for isolation. Add GPIOAnalysis sections to the YAML file to use the two PCA9539 devices that will be used to isolate and make the appropriate call outs. (From meta-ibm rev: bbca98df7f6d46709a840b5054f14eb0371851ad) Change-Id: Ieff5dfb9d514891f3ee3e1267256b165f69e7a08 Signed-off-by: Brandon Wyman <bjwyman@gmail.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-29Recipe updates for power sequencer YAML filesBrandon Wyman4-0/+216
Add YAML file for Witherspoon power sequencer information. Add YAML file for Swift power sequencer information. Add native recipe to pull in YAML files. Update recipe to set appropriate configuration variable for YAML file to use based on machine configuration. Depends-On: I54958ce49496464e601ff9c6f2b081ee8d2c07be gerrit.openbmc-project.xyz/c/openbmc/witherspoon-pfault-analysis/+/20513 (From meta-ibm rev: b5b193f18604177387d7ad0fd196415cd9098f51) Change-Id: I415f8226f23098b4e4af0a7dc1e9374c9699a327 Signed-off-by: Brandon Wyman <bjwyman@gmail.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-28meta-ibm: witherspoon: inventory: target class recipesBrad Bishop2-0/+20
In the near future meta-phosphor will switch phosphor-inventory-manager over to target class configuration recipes in place of native class configuration recipes. Configuration recipes populate the /usr/share/phosphor-inventory filesystem with the YAML configuration that the phosphor-inventory-manager build process expects. Those are preferable to native class config recipes because native recipes cannot be overridden based on MACHINE. Add a target class recipe for inventory-cleanup so meta-ibm is ready when meta-phosphor makes the cut-over. (From meta-ibm rev: 0105129e023c3e310b264a607eaeff41a8ed7ed7) Change-Id: I58f4a11bf8fb9d7f47ecdd4f73f83581ef507779 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-23swift: Increase read-write volume to 32MBAdriana Kobylak1-0/+5
Swift will be using UBI for its filesystem. Since it has 128MB flash chips, increase the size of the read-write volume to 32MB, same as witherspoon-128. (From meta-ibm rev: af07bab16662383dbf01ed4b7fae5083e66ae357) Change-Id: I631c69791e67f29903ae1e2377fc4414f33a0317 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-22meta-ibm: witherspoon: fans: drop unused variableBrad Bishop1-1/+0
meta-phosphor dropped support for native class config recipes and uses target class config recipes by default. Drop the reference to PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT as it is no longer used in meta-phosphor. (From meta-ibm rev: bed9adaf6d89aa2ac42b91c06e4ee4be4e17c40e) Change-Id: I3cd896636924a59ecebd0eb25cad261f1bc070ab Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-21meta-ibm: witherspoon: fans: switch to non-nativeBrad Bishop25-9/+10
meta-phosphor recently enabled target class config recipes. Those are preferable to native class config recipes because native recipes cannot be overridden based on MACHINE, so switch to target class config recipes. Switching to target class recipes consists of temporarily setting PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT to 0, overriding the phosphor distro default of 1. After all OpenBMC BSP layers have moved to target class config recipes PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT can be removed from meta-phosphor and any BSP layers. Any references to -native recipes are replaced with their target class counterparts. Any -native bbappends are re-worked to apply to their target class counterparts. Finally, use BPN instead of PN when setting FILESEXTRAPATHS, to avoid unfortunate directory hierarchies if these bbappends are copy/pasted and then used to bbappend a native recipe. Since this patch moves to target class recipes, this is a noop; however, this avoids unfortunate directory hierarchies with native bbappends such as: meta-base/recipes-foo/bar/baz-native.bb meta-base/recipes-foo/bar/baz/a-file meta-append/recipes-foo/bar/baz-native.bbappend meta-append/recipes-foo/bar/baz-native/b-file Using "${THISDIR}/${BPN}:" enables a more sensible hierarchy: meta-base/recipes-foo/bar/baz-native.bb meta-base/recipes-foo/bar/baz/a-file meta-append/recipes-foo/bar/baz-native.bbappend meta-append/recipes-foo/bar/baz/b-file This behavior occurs because By default FILESPATH is set in base.bbclass (in OE-Core) to look for files in ${BP}, ${BPN} and files (and a number of subdirectories of those based on ${FILESOVERRIDES}). (From meta-ibm rev: 6587e6ca03ca50411bc11cf87b5e11971dfe343f) Change-Id: Ib2c3f0052c1e01a84416da2eb868a54d8810e750 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-15swift: Add BMC riser EEPROMAnthony Wilson1-1/+6
Added the BMC riser EEPROM for swift. (From meta-ibm rev: 2203c6935c10a4cabff80b5d17e9e10e0c007910) Signed-off-by: Anthony Wilson <wilsonan@us.ibm.com> Change-Id: Id401da931e8ffbcf4d44151605d969e34af73276 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-15Add EXTRA_IFACES to power supply configurationsAnthony Wilson3-0/+3
Adding support for multiple interface associtions for inventory items. Testing: Verifed that the interface was associated properly. (From meta-ibm rev: d77ba6c270497a25c0eff607741bed9bac7a8a4c) Signed-off-by: Anthony Wilson <wilsonan@us.ibm.com> Change-Id: Ia3d83b58681f1ebf7befef1eb3f65f19fb8dc03a Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-14meta-ibm: witherspoon: fix file search pathsBrad Bishop5-5/+5
Typically it does not make any sense to append to FILESEXTRAPATHS. FILESEXTRAPATHS is set in a bbappend when overriding something from another layer. The typical desire will be to make bitbake search for files in the layer with the bbappend and not some other layer earlier in the priority list. Further, appending to FILESEXTRAPATHS will introduce unexpected behavior when multiple layers append the same recipe - layers with higher layer priorities that append to FILESEXTRAPATHS will find their files overriden by files in layers with lower priorities. (From meta-ibm rev: a588016cb556b425a00286ace2c8324590aac98b) Change-Id: I7672219fdab5e2c9cc03423d7f507ef2e6a842c2 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-11meta-ibm: witherspoon: fix up bbappend wildcardsBrad Bishop7-0/+0
A number of bbappend wildcards matched more than what was desired. Reduce the scope accordingly. phosphor-dbus-monitor-config-native%.bbappend -> phosphor-dbus-monitor-config-native.bbappend phosphor-ipmi-fru-read-bmc-inventory%.bbappend -> phosphor-ipmi-fru-read-bmc-inventory-native.bbappend phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml -> phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend -> phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend obmc-op-control-power%.bbappend -> obmc-op-control-power_%.bbappend (From meta-ibm rev: c828be02d177ece43006329ee99ca4d2ef733c58) Tested: bitbake-layers show-appends still shows the witherspoon bbappends Change-Id: I5133261a33c4101d6d526355817a0adbac0ce0d9 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-10meta-ibm: obmc-libobmc-intf: Remove MACHINE from pathAdriana Kobylak1-2/+1
Yocto already adds MACHINE as part of the file path. Tested: Verified witherspoon(-128) and swift still had the correct gpio_defs.json file in their image. (From meta-ibm rev: 1de2e7044a1c0fab64209be316f19cb8cd199e35) Change-Id: Ie2180e4af987e4ee43164c11ac4dacb19eb0ebe2 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-10meta-ibm: phosphor-hwmon: Create machine-specific structureAdriana Kobylak18-2/+0
Yocto automatically adds files/<MACHINE>/ to the file path, take advantage of this feature to simplify the recipe and directory structure. Tested: Built witherspoon, witherspoon-128, and swift, and verified they had the right conf file: $ diff tmp/work/witherspoon_128-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/default/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf \ tmp/work/witherspoon-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/default/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf $ $ diff tmp/work/witherspoon-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/default/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf \ tmp/work/swift-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/default/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf 2,3c2,3 < CRITLO_fan1 = "2974" < CRITHI_fan1 = "12076" --- ... (From meta-ibm rev: afdfaba229df3376f17ca063b53c9c8df0d84d0f) Change-Id: Id24796c17c24aad29770fbd591e885534eeee2f7 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-10meta-ibm: phosphor-ipmi-host: Remove witherspoon-128 appendAdriana Kobylak1-3/+0
The witherspoon-128 machine has a 'witherspoon' machine override so it'll pick up anything labeled as 'witherspoon', so no need to have an append for the 128 flavor. (From meta-ibm rev: aff453975179c4f57733dc5c209d3eba1cf55b82) Change-Id: I56cc2c58470cba07774c99c03eb4b155d50c5e1a Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-10meta-ibm: phosphor-gpio-monitor: Remove MACHINE from pathAdriana Kobylak1-1/+1
Yocto already adds MACHINE as part of the file path. Tested: Verified witherspoon and swift still had the correct phosphor-power-supply-1.conf file. (From meta-ibm rev: 4335b77ce985117765c1b673ba6a1f5ed1183ea2) Change-Id: Icbfd31f5ba2f8191cf01fac2c0747e948e01b5ba Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-10meta-ibm: fans: Create machine-specific structureAdriana Kobylak20-9/+7
Yocto automatically adds files/<MACHINE>/ to the file path, take advantage of this feature to simplify the recipe and directory structure. Tested: Built witherspoon, witherspoon-128, and swift, and verified they all had the correct fans files in their image. (From meta-ibm rev: 1c8b9d845092ccb6440fc9241993ac3d4db9c2d6) Change-Id: I2dfa0b04dfba68311d67af10ccfa979f733e630f Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-10meta-ibm: avsbus-control: Create machine-specific structureAdriana Kobylak7-33/+7
Yocto automatically adds files/<MACHINE>/ to the file path, take advantage of this feature to simplify the recipe and directory structure. Tested: Built witherspoon, witherspoon-128, and swift, and verified they all had the correct avsbus-control script in their image. (From meta-ibm rev: cd6c8359c35986169e3225f853e38fabb7aade1b) Change-Id: Id4051ebceef1bee6898d8637381970ba31dc9508 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-10witherspoon-128: Add witherspoon MACHINEOVERRIDESAdriana Kobylak1-0/+1
The witherspoon and witherspoon-128 machines are mostly the same. Add "witherspoon" as a MACHINEOVERRIDES to witherspoon-128 so that machine-specific features that apply only to witherspoon, including file paths, can be added to both flavors of witherspoon automatically. Tested: Built witherspoon and witherspoon-128, flashed images on HW and verified witherspoon powered on. (From meta-ibm rev: 6f44bb26247289aa46c6d21f04617838e596294a) Change-Id: I18ce6dd799cb0ab52b37f1f1f3d64c6189af4cd8 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09meta-witherspoon: layer.conf: set BBFILE_PATTERNBrad Bishop1-1/+1
Bitbake uses this regex to associate recipes and bbappends from BBFILES (which contains recipes and bbappends from -all- layers listed in bblayers.conf) to this layer. The association is then used to map the BBFILE_PRIORITY value for this layer onto the recipes provided by this layer. BBFILE_PRIORITY is used to determine which recipe to use when the same recipe appears in multiple layers. Without BBFILE_PATTERN set, recipes in this layer will get a default priority and not the priority specified in BBFILE_PRIORITY. This layer doesn't set a priority anyway, so functionally this patch is a noop but it is an improvement from a correctness standpoint, and it makes a warning go away: WARNING: No bb files matched BBFILE_PATTERN_foo-layer (From meta-ibm rev: ef6380a81fbd701b1052c12c8163498ba4e2de89) Change-Id: I1f4ab259befb094983df056c0f0f81cf8dc6f2e3 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09meta-ibm: witherspoon: Remove workbook recipeBrad Bishop1-6/+0
This recipe is only required by the legacy inventory manager, which is no longer used on Witherspoon. (From meta-ibm rev: 7f405bb87d8ce6a0bb2ac50ca56fab90c8bbddf7) Change-Id: Ia65e74b5ced87466af076bad7ac3d10ec8dcc279 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09swift: Add fan-presence and fan-monitorAdriana Kobylak3-5/+5
Swift fails to build because fan-presence is a dependency for fan-control, and fan-monitor is a dependency for inventory. So add them in swift with an empty yaml file. Also fix the FILESEXTRAPATHS_append to have the colon at the beginning (vs prepend where colon goes at the end) to be able to find the files in the right order. Tested: Built swift successfully. (From meta-ibm rev: 2493fdb38e1fe8e1488ea1bcc5c723c788d92bae) Change-Id: Ie41caf90a15c3c33ef49ce03ce1890ca9f0c7289 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09wspoon: Update inventory associationsMatt Spinler1-77/+284
Make the follow updates to the associations that PIM will create: Make a new association iface on /system/chassis that contains every sensor in that chassis, with some exceptions. The forward association type is 'sensors', and the reverse type is 'chassis'. The power supply sensors are not included in this new association list, as the power supplies also now have a new 'sensors' <-> 'chassis' association that associates power supplies to their sensors, as bmcweb treats a power supply as a chassis. Also not included in the new chassis associations are any remaining power sensors, as bmcweb currently makes fake power supply responses out of them and we want to avoid that. The final change is to change the association type of the associations that point to the sensors on their inventory item from 'sensors' to 'child_sensors', as 'sensors' is required to be used in bmcweb's chassis handling as mentioned above. (From meta-ibm rev: 5a4a28582beb2f854d2724e192873536363943da) Change-Id: Iebd15c4b5a97a16bb614d757ce7621f087777622 Signed-off-by: Matt Spinler <spinler@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-07wspoon: Add Chassis interface to the chassisMatt Spinler1-0/+13
Tell phosphor-inventor-manager to create the xyz.openbmc_project.Inventory.Item.Chassis interface on the /system/chassis inventory item at startup. (From meta-ibm rev: b6e3df22947fa563909d006afc95011a657f5383) Change-Id: I3576bce35bb3f2687fcd135393dc9b28172dadb8 Signed-off-by: Matt Spinler <spinler@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-29swift: Add pcie temp sensor hwmon configsMatt Spinler3-0/+14
Swift uses 2 TMP275s to monitor the PCIE inlet temp, one between cards 0 and 1, and the other between cards 2 and 3. They are both on I2C bus 12. Tested: Built an image and checked rootfs for the config files. (From meta-ibm rev: bd2a3a2a9b6bde8207f1d4f4a81ffab27f0b14b1) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: I51c449ad9c2a212693d28ed82e79f913bb096e29 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-29meta-ibm: spoon/palmetto: op-apps: remove fansBrad Bishop1-1/+0
obmc-control-fan is no longer included by the OpenPOWER layer, so there is no longer a need to explicitly remove it here. (From meta-ibm rev: 446d589ce72cebf974ffaca2dca61de2823a140d) Change-Id: Iba5fc8a745ffb128b83903dc0ad3ad787ebbcd21 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-29meta-ibm: witherspoon: remove legacy sync configsBrad Bishop4-13/+0
The sync_inventory_item.py script has been replaced by first-boot-set-mac.sh. first-boot-set-mac.sh doesn't sync any uuids but that feature is not required on witherspoon anyway. Remove the config files for sync_inventory_item.py. (From meta-ibm rev: e16c109bcd0d38aa5b09ad09d6d31e534f6b198b) Change-Id: I81553ef7b5ceb13125935c3167f70606e49725b8 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-26swift: Add max31785 device to hwmon for bring-upMatthew Barth3-4/+40
To support fan control for swift system bring-up, the max31785 device needs to be configured for hwmon to expose on dbus. Tested: All max31785 configs and service files exist in the image (From meta-ibm rev: 6dec46d2e34e1db46dff141f4495a4aa665af997) Change-Id: Ib7ebea8cc376f1fb3e2e340d56512440917f1420 Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-26Swift power supply presence detectsMatt Spinler3-1/+6
PS0 uses the same GPIO that witherspoon uses, but PS1 uses GPIOR7 (143). Tested: Built both images, made sure the correct conf files showed up in rootfs. (From meta-ibm rev: c4daa64b614ff35fcefcd6eabcc45f2ac3e54776) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: Ia89e9dbe32db84b265087b775716488da0d48b43 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-26swift: Add fan control for bring-upMatthew Barth6-6/+138
To support the swift system bring-up, install the cooling type and fan control application with minimal configuration to run fans at full speed(9500 RPMs). Tested: Cooling type included in image and configured correctly Fan control included in image and configured correctly (From meta-ibm rev: 2eb5a13421e2c5e5bc0a0cfac9de87f0cd8c9c59) Change-Id: I3359cf0444c1b4af8fae1b7f51ef608e4dc2c4c2 Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-26wspoon: Use machine in file path append for fansMatthew Barth15-7/+8
In preparation for additional systems under the witherspoon layer, add the machine name as a prefix to the phosphor-fan* configuration directories. This allows additional machines' phosphor-fan* configurations to be placed in this layer. Tested: Witherspoon phosphor-fan image still contains applications & phosphor-fan applications are correctly configured. (From meta-ibm rev: a63359eebc376e3340bdbc34fc4c83410172a5ae) Change-Id: I9d711cb68e4563e5a2c6dc88d12d2071364bf8ae Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>