summaryrefslogtreecommitdiff
path: root/meta-ibm
AgeCommit message (Collapse)AuthorFilesLines
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-13meta-ibm: palmetto: fix up bbappend wildcardsBrad Bishop4-0/+0
A number of bbappend wildcards matched more than what was desired. Reduce the scope accordingly. (From meta-ibm rev: d383ecde351fa80ff94fd7220b951e6458bdda2b) Change-Id: I448531975e594674013709a77ac003ea8f480c18 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-13meta-ibm: romulus: fix file search pathsBrad Bishop2-2/+2
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: e11f36155c0fc8a6cc4bb6ef5abee777b8ae6b5a) Change-Id: Idcd839211e009f260a38ae9cb6351154a8074c28 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-13meta-ibm: romulus: override variable assignmentsBrad Bishop18-25/+25
Add overrides to variable assignments as described in "Modify Variables to Support a Different Machine" in the yocto development tasks manual: https://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#best-practices-to-follow-when-creating-layers In a nutshell this allows multiple BSP layers to be included simultaneously in bblayers.conf, which increases the potential for meta data sharing between layers. (From meta-ibm rev: 0ccb228f770fe8688fd926ad822244fab6926298) Change-Id: I4f648d1c2232a6f246b63b8e46731b7ef1af13ac Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-13meta-ibm: romulus: Remove workbook recipeBrad Bishop1-6/+0
This recipe is only required by the legacy inventory manager, which is no longer used on Romulus. (From meta-ibm rev: 952dd07412311c294ad3ad767da97eb2512a781f) Change-Id: Ide0596e3834d94e1884a470c836bd7717246ec33 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-09meta-ibm: palmetto: Remove workbook recipeBrad Bishop1-8/+0
This recipe is only required by the legacy inventory manager, which is no longer used on palmetto. (From meta-ibm rev: ba9dd68aa9d524585878eee61e5bfe1bbef0a5f9) Change-Id: Id2a4be5f97fd91c4aefeaa23f462c8b69cae5de0 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09meta-ibm: palmetto: remove virtual overridesBrad Bishop2-2/+0
Remove the palmetto override of PREFERRED_PROVIDER_virtual/obmc-inventory-data as nothing DEPENDS on it. (From meta-ibm rev: 05d52d6b248c7761e08c02d18cd89c6fd304e062) Change-Id: Ideabff50e2f492042fe4541a8641f536c14b75f8 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-09meta-ibm: 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: 32cabcf8a5f70946d80f51ac41917987f6118031) Change-Id: Iad810a7a9606a2aee1982337508d1be24cff79f8 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09meta-fsp2: layer.conf: change BBFILE_PATTERNBrad Bishop1-1/+1
Use the immmediate expansion operator when setting BBFILE_PATTERN. This makes meta-fsp2 consistent with all the layers in meta-openembedded. (From meta-ibm rev: a44ea07451e667912a6d99d56d4ae61df92b282d) Change-Id: Ib2d0daaca371b9c2a837b601a257e498d236688c Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09meta-palmetto: 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: 7d7f662db06cc9f8e4a5bd9d18c68c4bb05d274c) Change-Id: I0ba9d2a6161b0da271111c710dc3267d0374b2a8 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09meta-romulus: 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: 8b843642e36fc9d1ac8921a98dd2710dccf1e514) Change-Id: I5c6102045f5aaa6146dc1902b106063896d073b8 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09meta-z: 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: 1938f1af3bb02726f0046ed737c55a319469e21d) Change-Id: I6ba0de9fbd44df3da726adecc94d4036b4573bbf 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-romulus: add occ-control-config-nativeLei YU3-0/+25
openpower-occ-control requires a sensor header file generated from occ_sensor.yaml. By default it uses an example yaml, which does not fit for Romulus. Add romulus-occ-control-config-native.bb to use its own occ_sensor.yaml, so that the package uses the correct config. Tested: Verify the build uses the correct config generated from Romulus's occ_sensor.yaml. (From meta-ibm rev: 54abf3c0be5618333cb37faebc55af48aa2a872b) Change-Id: Iaa3adf0d20e5b6d080866dd1b19fa3ee7f4d7369 Signed-off-by: Lei YU <mine260309@gmail.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-29meta-ibm: spoon/palmetto: op-apps: remove fansBrad Bishop2-2/+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-26meta-palmetto: Update occ sensor object path in ipmidLei YU1-1/+1
As openpower-occ-control@1d69e19 introduce the ability to rename the occ object path, Palmeto could use "occ0" instead of "occ_3_0050" as a better name. Update ipmi sensor config to use the updated occ object path. Tested: Verify occ active sensor is set on host power on, and occ hwmon sensors are working OK. (From meta-ibm rev: 17c4a225e74f6b093cf01ca0ecc0c32ae19bc1f8) Signed-off-by: Lei YU <mine260309@gmail.com> Change-Id: Iafd029cc82047e047a0dea45ace1655a5bec776d Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-26meta-palmetto: add occ-control-config-nativeLei YU3-0/+22
openpower-occ-control requires a sensor header file generated from occ_sensor.yaml. By default it uses an example yaml, which does not fit for Palmetto. Add palmetto-occ-control-config-native.bb to use its own occ_sensor.yaml, so that the package uses the correct config. Tested: Verify the build uses the correct config generated from palmetto's occ_sensor.yaml. (From meta-ibm rev: 12a660de3fff453e2f24ee2cc98b387fa7b8c541) Signed-off-by: Lei YU <mine260309@gmail.com> Change-Id: Ifbf6ffb0c69e6d827410b8370c6481bb953d10d0 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>
2019-04-26Point to the real Swift MRWMatt Spinler1-3/+2
Tested: The image builds. The generated files look like a good start at least. (From meta-ibm rev: affeacabade12b73a4e009c7dd15d1f261db8528) Change-Id: Id80835c09cde4e6b61d40634406c3fa0e3752097 Signed-off-by: Matt Spinler <spinler@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-26wspoon: Add machine overrides to hwmon devicesMatthew Barth15-10/+13
In preparation for additional systems under hte witherspoon layer, add machine overrides to the hwmon devices and service configurations. This allows additional machines' phosphor-hwmon configurations to be placed in this layer. Tested: Witherspoon phosphor-hwmon image still contains all device configs & services to be installed. (From meta-ibm rev: 84b1f2e70034311853f4e417b9a29687a512cc97) Change-Id: I28685d71bb99cd23b8a0acc34bfd117dbdef8926 Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-26obmc-libobmc-intf: Add Swift gpio definitionsAdriana Kobylak3-1/+65
Add gpio definitions for the Swift machine under a swift subdir. Move the witherspoon gpio definitions under a witherspoon subdir. Tested: Built swift and witherspoon and checked that the file rootfs/etc/default/obmc/gpio/gpio_defs.json was correct for each machine. (From meta-ibm rev: dc61626406fc94962d31742832be83e574a28ee1) Change-Id: I812d1c0547744967d375984552f03f4702439de3 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-26avsbus-control: Add system-specific scriptsAdriana Kobylak7-6/+96
The avsbus-control scripts differ between different machine configurations. Rename the existing ones to witherspoon-* and add the swift-* ones. Install the appropriate script depending on the machine being built. Tested: Built swift and witherspoon and verified that the scripts rootfs/usr/bin/ were the ones for the machine being built. (From meta-ibm rev: d95d6afadd61c6ab8276736d719682775d7880d0) Change-Id: Ib2ee438a0375de0d69dec7ae005118c8fdb46845 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-26phosphor-ipmi-host: Create system-specific hardcoded.yaml fileAdriana Kobylak3-88/+96
Witherspoon has 2-rotor fans, while Swift has single-rotor fans. Move the sensors for the 2nd rotor to a witherspoon yaml file. In the future, any system-specific sensors can be added to the witherspoon/swift_hardcoded.yaml file Tested: Built swift and witherspoon and verified only witherspoon had the new witherspoon_hwmon_sensors.hardcoded.yaml in the build directory. (From meta-ibm rev: 160a82111e5ee12066204d71bdbcb6be580e897b) Change-Id: I31d71c59abfddbc00f97212abf3c126c4ce96a75 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-25meta-ibm: op-apps: remove obmc-button-resetBrad Bishop2-2/+0
There isn't an obmc-button-reset package in op-apps in the first place, so this line is a noop. Remove. (From meta-ibm rev: 748c1192bf2f2fa6be2cdf5e6f3b88829f28835b) Change-Id: If34a02d6603834919ab969579c0fca0e0ab28f1a Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-25Add witherspoon inventory associationsMatt Spinler2-0/+1406
Add the inventory association definitions for witherspoon. With these, phosphor-inventory will create the org.openbmc.Associations interface on the specified inventory paths such that the object mapper will create the association D-Bus objects. These associations are used to associate inventory paths to their fans, sensors, and LEDs. (From meta-ibm rev: 1b3a22abadee18beae8307d1b76e701733281717) Change-Id: I63d65ce81ee9d0dabe7c2f99d919bd7b115ded66 Signed-off-by: Matt Spinler <spinler@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-25meta-swift: Initial commitAdriana Kobylak2-0/+27
Create a new machine for Swift, a POWER9 system. It is initially based on Witherspoon but with 128MB NOR flash chips. - To build this machine: export MACHINE="swift"; \ export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE"; \ bitbake obmc-phosphor-image (From meta-ibm rev: 12b1187ecfcf7d6438cb026d09f2c1b7c6e06cbc) Change-Id: I304ae026e1b2e027776981865b3f483d0898000f Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-25witherspoon-128: Initial commitAdriana Kobylak3-0/+762
Create a machine/witherspoon-128.conf file to model a witherspoon system with 128MB flash chips. * New kernel device tree (witherspoon-128.dts). * Bigger read-write filesystem. Remove the default from the witherspoon layer (not needed as 6MB is the default) so that the size value can be overwritten by the witherspoon-128.conf. - To build this machine: export MACHINE="witherspoon-128"; \ export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE"; \ bitbake obmc-phosphor-image Witherspoon-128 is a system based on Witherspoon but with 128MB flash chips. Create a device tree for this configuration. Since this system is just a bringup vehicle, the device tree will be carried as a patch instead of merging it in upstream linux. (From meta-ibm rev: 903fd3532aaa967ddc7124095304f50cd4c9557c) Change-Id: If02e8ad32fc2bff336d16c18513f2c238b28c28a Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-24meta-ibm: Remove unnecessary setting BMC_RW_SIZEBrad Bishop1-1/+0
This variable is set to 0x600000 by default in the phosphor layer - no need to override it again in meta-ibm. (From meta-ibm rev: 8e50fea4af2e4b1d542cded32a427818e6fc881c) Change-Id: I64decb22dde26247cc2d1878ab88c3b37803bc3b Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-24phosphor-fan-presence: srcrev bump 59096e50db..71779ab4b3Andrew Geissler2-2/+2
Patrick Venture (1): build: install into bin instead of sbin meta-ibm: phosphor-fan: grab cooling-type from bindir The output binaries from phosphor-fan-presence are now installed into bin instead of sbin. Change-Id: I2d42f62b4535775ffd0d1b9473375dd8dc66bb61 Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com> Signed-off-by: Patrick Venture <venture@google.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-23witherspoon: Use first-boot-set-macBrad Bishop3-25/+2
Use the new first-boot-set-mac recipe from the openpower layer for setting the mac address on first boot. This replaces obmc-mgr-inventory's sync_inventory_items.py script that achieves the same - but is the last remaining requirement for python on Witherspoon systems and first-boot-set-mac is shell! (From meta-ibm rev: 1249fea4137fcf0107a0ad77d78039ddf87c55d4) Tested-By: Built a witherspoon image and manually verified the root filesystem included a symlink to first-boot-set-mac@.service in /etc. Change-Id: If26c6e2337ec182951a2484a09a4843418716980 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-22witherspoon: adjust occ hwmon labels for 5.0 kernelEddie James1-68/+68
The upstream 5.0 kernel changed the labels for power sensors. Adjust the hwmon configuration files to account for this. (From meta-ibm rev: 222fda96aacb1971094e742e71d6d597985fc927) Signed-off-by: Eddie James <eajames@linux.ibm.com> Change-Id: Ibc8921e14b3840959e0793934432ba5615d0b416 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>