Age | Commit message (Collapse) | Author | Files | Lines |
|
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>
|
|
The ipmi configs were using .bbappends to override the default ones.
There was a change in OpenBMC about overriding variable assignments,
that causes the .bbappends not working anymore due to they are native.
This commit fixes the issue, by adding romulus specific configs to
replace the default ones.
Tested: Verify the ipmi sensor, fru are correct on Romulus.
(From meta-ibm rev: e020d0d8973cb4fa36d382bc9af5c056e8d8e913)
Change-Id: If804ced6d53c8c4433351b982ebcf079cd014f56
Signed-off-by: Lei YU <mine260309@gmail.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
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>
|
|
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>
|
|
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: a7ed71c672baa533eddcc8cc713b03d2ee07c4e4)
Change-Id: Id057b3520db5952310b31f188e53263653606d54
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
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>
|
|
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: 0bc0301510b3371510a86fa684b72ea4d4100cf1)
Change-Id: I6b59b1429ead70c1e4ac85a1c9d66b3e04197dd5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
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: 589ee00a5ec7bc97c7d5c079cf66b3dbd3ac2b4f)
Change-Id: I1a593373f1b4bc82c554a9330cdd75f04f21d1d8
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|