diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-amd | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-amd')
23 files changed, 2106 insertions, 43 deletions
diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf index 8caa32493..db636c17a 100644 --- a/meta-amd/conf/layer.conf +++ b/meta-amd/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "amd-layer" BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_amd-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_amd-layer = "hardknott honister" diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf index 818ab7df1..37f32bcb3 100644 --- a/meta-amd/meta-ethanolx/conf/layer.conf +++ b/meta-amd/meta-ethanolx/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "ethanolx-layer" BBFILE_PATTERN_ethanolx-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_ethanolx-layer = "6" -LAYERSERIES_COMPAT_ethanolx-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_ethanolx-layer = "hardknott honister" diff --git a/meta-amd/meta-ethanolx/conf/local.conf.sample b/meta-amd/meta-ethanolx/conf/local.conf.sample index 34a13a566..27e36f84d 100644 --- a/meta-amd/meta-ethanolx/conf/local.conf.sample +++ b/meta-amd/meta-ethanolx/conf/local.conf.sample @@ -115,7 +115,7 @@ PACKAGE_CLASSES ?= "package_rpm" # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" +SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" # # Extra image configuration defaults @@ -226,12 +226,12 @@ BB_DISKMON_DIRS = "\ # By default qemu will build with a builtin VNC server where graphical output can be # seen. The two lines below enable the SDL backend too. This assumes there is a # libsdl library available on your build system. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +PACKAGECONFIG:append:pn-qemu-native = " sdl" +PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl-native" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. -CONF_VERSION = "1" +CONF_VERSION = "2" diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 7fb6e7ec1..2ac82cade 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -2,7 +2,7 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-amd-${MACHINE}.dtb" -UBOOT_MACHINE_ethanolx = "ast_g5_phy_config" +UBOOT_MACHINE:ethanolx = "ast_g5_phy_config" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc diff --git a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/ethanolx.cfg b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/ethanolx.cfg index e20cd22d6..00454a400 100644 --- a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/ethanolx.cfg +++ b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/ethanolx.cfg @@ -1,3 +1,5 @@ CONFIG_SENSORS_LM75=y CONFIG_SENSORS_SBTSI=y CONFIG_I2C_ASPEED=y +CONFIG_SENSORS_ISL68137=y +CONFIG_EEPROM_AT24=y diff --git a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend index 9f7f1b99d..ec2f52726 100644 --- a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:" SRC_URI += "file://ethanolx.cfg" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/blocklist.json b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/blocklist.json new file mode 100644 index 000000000..abe49d376 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/blocklist.json @@ -0,0 +1,3 @@ +{ + "buses": [0, 1, 2, 4, 5, 6, 7, 8] +} diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-baseboard.json b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-baseboard.json index cea3d0602..08d66c022 100644 --- a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-baseboard.json +++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-baseboard.json @@ -41,6 +41,793 @@ "Type": "FanConnector" }, { + "Index": 0, + "Name": "5_DUAL", + "ScaleFactor": 0.272, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 5.5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 4.5 + } + ], + "Type": "ADC" + }, + { + "Index": 1, + "Name": "33_DUAL", + "ScaleFactor": 0.411, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.63 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.97 + } + ], + "Type": "ADC" + }, + { + "Index": 2, + "Name": "12_RUN", + "PowerState": "On", + "ScaleFactor": 0.113, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.2 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.8 + } + ], + "Type": "ADC" + }, + { + "Index": 3, + "Name": "5_RUN", + "PowerState": "On", + "ScaleFactor": 0.272, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 5.5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 4.5 + } + ], + "Type": "ADC" + }, + { + "Index": 4, + "Name": "33_RUN", + "PowerState": "On", + "ScaleFactor": 0.411, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.63 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.97 + } + ], + "Type": "ADC" + }, + { + "Address": "0x61", + "Bus": 4, + "Labels": [ + "iin", + "iout1", + "vin", + "vout1", + "temp1" + ], + "PowerState": "On", + "Name": "P0_VDD_CORE", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "iin", + "Name": "upper critical", + "Severity": 1, + "Value": 50 + }, + { + "Direction": "greater than", + "Label": "iout1", + "Name": "upper critical", + "Severity": 1, + "Value": 216 + }, + { + "Direction": "less than", + "Label": "vin", + "Name": "lower critical", + "Severity": 1, + "Value": 8.0 + }, + { + "Direction": "greater than", + "Label": "vin", + "Name": "upper critical", + "Severity": 1, + "Value": 14.0 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 2.875 + }, + { + "Direction": "less than", + "Label": "temp1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 125 + } + ], + "Type": "ISL68137" + }, + { + "Address": "0x63", + "Bus": 4, + "Labels": [ + "iin", + "iout1", + "vin", + "vout1", + "temp1" + ], + "PowerState": "On", + "Name": "P0_VDD_SOC", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "iin", + "Name": "upper critical", + "Severity": 1, + "Value": 50 + }, + { + "Direction": "greater than", + "Label": "iout1", + "Name": "upper critical", + "Severity": 1, + "Value": 85 + }, + { + "Direction": "less than", + "Label": "vin", + "Name": "lower critical", + "Severity": 1, + "Value": 8.0 + }, + { + "Direction": "greater than", + "Label": "vin", + "Name": "upper critical", + "Severity": 1, + "Value": 14.0 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 2.875 + }, + { + "Direction": "less than", + "Label": "temp1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 125 + } + ], + "Type": "ISL68137" + }, + { + "Address": "0x64", + "Bus": 4, + "Labels": [ + "iin", + "iout1", + "iout2", + "vin", + "vout1", + "vout2", + "temp1" + ], + "PowerState": "On", + "Name": "P0_VDD_MEM_ABCD", + "Name1": "P0_VDD_VPP_ABCD", + "iin_Name" : "P0_VDD_MEM_VPP_ABCD_Input_Current", + "vin_Name" : "P0_VDD_MEM_VPP_ABCD_Input_Voltage", + "temp1_Name" : "P0_VDD_MEM_VPP_ABCD_Temperature", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "iin", + "Name": "upper critical", + "Severity": 1, + "Value": 50 + }, + { + "Direction": "greater than", + "Label": "iout1", + "Name": "upper critical", + "Severity": 1, + "Value": 120 + }, + { + "Direction": "greater than", + "Label": "iout2", + "Name": "upper critical", + "Severity": 1, + "Value": 40 + }, + { + "Direction": "less than", + "Label": "vin", + "Name": "lower critical", + "Severity": 1, + "Value": 4.5 + }, + { + "Direction": "greater than", + "Label": "vin", + "Name": "upper critical", + "Severity": 1, + "Value": 14.0 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 1.9 + }, + { + "Direction": "less than", + "Label": "vout2", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout2", + "Name": "upper critical", + "Severity": 1, + "Value": 2.8 + }, + { + "Direction": "less than", + "Label": "temp1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 125 + } + ], + "Type": "ISL68137" + }, + { + "Address": "0x65", + "Bus": 4, + "Labels": [ + "iin", + "iout1", + "iout2", + "vin", + "vout1", + "vout2", + "temp1" + ], + "PowerState": "On", + "Name": "P0_VDD_MEM_EFGH", + "Name1": "P0_VDD_VPP_EFGH", + "iin_Name" : "P0_VDD_MEM_VPP_EFGH_Input_Current", + "vin_Name" : "P0_VDD_MEM_VPP_EFGH_Input_Voltage", + "temp1_Name" : "P0_VDD_MEM_VPP_EFGH_Temperature", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "iin", + "Name": "upper critical", + "Severity": 1, + "Value": 50 + }, + { + "Direction": "greater than", + "Label": "iout1", + "Name": "upper critical", + "Severity": 1, + "Value": 120 + }, + { + "Direction": "greater than", + "Label": "iout2", + "Name": "upper critical", + "Severity": 1, + "Value": 40 + }, + { + "Direction": "less than", + "Label": "vin", + "Name": "lower critical", + "Severity": 1, + "Value": 4.5 + }, + { + "Direction": "greater than", + "Label": "vin", + "Name": "upper critical", + "Severity": 1, + "Value": 14.0 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 1.9 + }, + { + "Direction": "less than", + "Label": "vout2", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout2", + "Name": "upper critical", + "Severity": 1, + "Value": 2.8 + }, + { + "Direction": "less than", + "Label": "temp1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 125 + } + ], + "Type": "ISL68137" + }, + { + "Address": "0x61", + "Bus": 5, + "Labels": [ + "iin", + "iout1", + "vin", + "vout1", + "temp1" + ], + "PowerState": "On", + "Name": "P1_VDD_CORE", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "iin", + "Name": "upper critical", + "Severity": 1, + "Value": 50 + }, + { + "Direction": "greater than", + "Label": "iout1", + "Name": "upper critical", + "Severity": 1, + "Value": 216 + }, + { + "Direction": "less than", + "Label": "vin", + "Name": "lower critical", + "Severity": 1, + "Value": 8.0 + }, + { + "Direction": "greater than", + "Label": "vin", + "Name": "upper critical", + "Severity": 1, + "Value": 14.0 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 2.875 + }, + { + "Direction": "less than", + "Label": "temp1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 125 + } + ], + "Type": "ISL68137" + }, + { + "Address": "0x63", + "Bus": 5, + "Labels": [ + "iin", + "iout1", + "vin", + "vout1", + "temp1" + ], + "PowerState": "On", + "Name": "P1_VDD_SOC", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "iin", + "Name": "upper critical", + "Severity": 1, + "Value": 50 + }, + { + "Direction": "greater than", + "Label": "iout1", + "Name": "upper critical", + "Severity": 1, + "Value": 85 + }, + { + "Direction": "less than", + "Label": "vin", + "Name": "lower critical", + "Severity": 1, + "Value": 8.0 + }, + { + "Direction": "greater than", + "Label": "vin", + "Name": "upper critical", + "Severity": 1, + "Value": 14.0 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 2.875 + }, + { + "Direction": "less than", + "Label": "temp1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 125 + } + ], + "Type": "ISL68137" + }, + { + "Address": "0x64", + "Bus": 5, + "Labels": [ + "iin", + "iout1", + "iout2", + "vin", + "vout1", + "vout2", + "temp1" + ], + "PowerState": "On", + "Name": "P1_VDD_MEM_ABCD", + "Name1": "P1_VDD_VPP_ABCD", + "iin_Name" : "P1_VDD_MEM_VPP_ABCD_Input_Current", + "vin_Name" : "P1_VDD_MEM_VPP_ABCD_Input_Voltage", + "temp1_Name" : "P1_VDD_MEM_VPP_ABCD_Temperature", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "iin", + "Name": "upper critical", + "Severity": 1, + "Value": 50 + }, + { + "Direction": "greater than", + "Label": "iout1", + "Name": "upper critical", + "Severity": 1, + "Value": 120 + }, + { + "Direction": "greater than", + "Label": "iout2", + "Name": "upper critical", + "Severity": 1, + "Value": 40 + }, + { + "Direction": "less than", + "Label": "vin", + "Name": "lower critical", + "Severity": 1, + "Value": 4.5 + }, + { + "Direction": "greater than", + "Label": "vin", + "Name": "upper critical", + "Severity": 1, + "Value": 14.0 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 1.9 + }, + { + "Direction": "less than", + "Label": "vout2", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout2", + "Name": "upper critical", + "Severity": 1, + "Value": 2.8 + }, + { + "Direction": "less than", + "Label": "temp1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 125 + } + ], + "Type": "ISL68137" + }, + { + "Address": "0x65", + "Bus": 5, + "Labels": [ + "iin", + "iout1", + "iout2", + "vin", + "vout1", + "vout2", + "temp1" + ], + "PowerState": "On", + "Name": "P1_VDD_MEM_EFGH", + "Name1": "P1_VDD_VPP_EFGH", + "iin_Name" : "P1_VDD_MEM_VPP_EFGH_Input_Current", + "vin_Name" : "P1_VDD_MEM_VPP_EFGH_Input_Voltage", + "temp1_Name" : "P1_VDD_MEM_VPP_EFGH_Temperature", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "iin", + "Name": "upper critical", + "Severity": 1, + "Value": 50 + }, + { + "Direction": "greater than", + "Label": "iout1", + "Name": "upper critical", + "Severity": 1, + "Value": 120 + }, + { + "Direction": "greater than", + "Label": "iout2", + "Name": "upper critical", + "Severity": 1, + "Value": 40 + }, + { + "Direction": "less than", + "Label": "vin", + "Name": "lower critical", + "Severity": 1, + "Value": 4.5 + }, + { + "Direction": "greater than", + "Label": "vin", + "Name": "upper critical", + "Severity": 1, + "Value": 14.0 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 1.9 + }, + { + "Direction": "less than", + "Label": "vout2", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "vout2", + "Name": "upper critical", + "Severity": 1, + "Value": 2.8 + }, + { + "Direction": "less than", + "Label": "temp1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + }, + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 125 + } + ], + "Type": "ISL68137" + }, + { "Address": "0x48", "Bus": 7, "Name": "BMC", @@ -295,6 +1082,72 @@ } ], "Type": "LM75A" + }, + { + "Address": "0x4C", + "Bus": 0, + "Name": "CPU0", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 75 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 70 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "SBTSI" + }, + { + "Address": "0x48", + "Bus": 1, + "Name": "CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 75 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 70 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "SBTSI" } ], "Name": "AMD EthanolX Baseboard", diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend index 5a287694d..f55bf2390 100644 --- a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI_append = " file://ethanolx-baseboard.json \ +FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" +SRC_URI:append = " file://ethanolx-baseboard.json \ file://ethanolx-chassis.json" -do_install_append() { +do_install:append() { rm -f ${D}/usr/share/entity-manager/configurations/*.json install -d ${D}/usr/share/entity-manager/configurations install -m 0444 ${WORKDIR}/ethanolx-baseboard.json ${D}/usr/share/entity-manager/configurations diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb index efa208374..c7226ae1f 100644 --- a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb +++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb @@ -24,10 +24,10 @@ do_install() { ${D}${datadir}/${BPN}/ipmi-sensors.yaml } -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${datadir}/${BPN}/ipmi-extra-properties.yaml \ ${datadir}/${BPN}/ipmi-fru-read.yaml \ ${datadir}/${BPN}/ipmi-sensors.yaml \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml index e9a25ccce..3eb17bec9 100644 --- a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml +++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml @@ -161,7 +161,7 @@ 9: entityID: 0x1D sensorType: 0x04 - path: /xyz/openbmc_project/sensors/fan_tach/P0_Fan_Speed + path: /xyz/openbmc_project/sensors/fan_tach/P0_Fan sensorReadingType: 0x01 multiplierM: 40 offsetB: 0 @@ -183,7 +183,7 @@ 10: entityID: 0x1D sensorType: 0x04 - path: /xyz/openbmc_project/sensors/fan_tach/P1_Fan_Speed + path: /xyz/openbmc_project/sensors/fan_tach/P1_Fan sensorReadingType: 0x01 multiplierM: 40 offsetB: 0 @@ -326,3 +326,1201 @@ Offsets: 0x0: type: double + +17: + sensorType: 0x01 + entityID: 0x03 + path: /xyz/openbmc_project/sensors/temperature/CPU0 + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: 0 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +18: + sensorType: 0x01 + entityID: 0x03 + path: /xyz/openbmc_project/sensors/temperature/CPU1 + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: 0 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +19: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P0_VDD_CORE_Input_Voltage + sensorName: P0_VDD_CORE_Vin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 60 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +20: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P0_VDD_CORE_Output_Voltage + sensorName: P0_VDD_CORE_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 15 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +21: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P0_VDD_CORE_Input_Current + sensorName: P0_VDD_CORE_Iin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 200 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +22: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P0_VDD_CORE_Output_Current + sensorName: P0_VDD_CORE_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 90 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -2 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +23: + sensorType: 0x01 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/temperature/P0_VDD_CORE_Temperature + sensorName: P0_VDD_CORE_temp + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: 0 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +24: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P0_VDD_SOC_Input_Voltage + sensorName: P0_VDD_SOC_Vin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 60 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +25: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P0_VDD_SOC_Output_Voltage + sensorName: P0_VDD_SOC_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 15 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +26: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P0_VDD_SOC_Input_Current + sensorName: P0_VDD_SOC_Iin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 200 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +27: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P0_VDD_SOC_Output_Current + sensorName: P0_VDD_SOC_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 35 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -2 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +28: + sensorType: 0x01 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/temperature/P0_VDD_SOC_Temperature + sensorName: P0_VDD_SOC_temp + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: 0 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +29: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P0_VDD_MEM_VPP_ABCD_Input_Voltage + sensorName: P0_VDD_ABCD_Vin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 60 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +30: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P0_VDD_MEM_ABCD_Output_Voltage + sensorName: P0_MEM_ABCD_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 10 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +31: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P0_VDD_VPP_ABCD_Output_Voltage + sensorName: P0_VPP_ABCD_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 15 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +32: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P0_VDD_MEM_VPP_ABCD_Input_Current + sensorName: P0_VDD_ABCD_Iin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 200 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +33: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P0_VDD_MEM_ABCD_Output_Current + sensorName: P0_MEM_ABCD_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 50 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -2 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +34: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P0_VDD_VPP_ABCD_Output_Current + sensorName: P0_VPP_ABCD_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 160 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +35: + sensorType: 0x01 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/temperature/P0_VDD_MEM_VPP_ABCD_Temperature + sensorName: P0_VDD_ABCD_temp + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: 0 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +36: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P0_VDD_MEM_VPP_EFGH_Input_Voltage + sensorName: P0_VDD_EFGH_Vin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 60 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +37: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P0_VDD_MEM_EFGH_Output_Voltage + sensorName: P0_MEM_EFGH_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 10 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +38: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P0_VDD_VPP_EFGH_Output_Voltage + sensorName: P0_VPP_EFGH_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 15 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +39: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P0_VDD_MEM_VPP_EFGH_Input_Current + sensorName: P0_VDD_EFGH_Iin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 200 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +40: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P0_VDD_MEM_EFGH_Output_Current + sensorName: P0_MEM_EFGH_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 50 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -2 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +41: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P0_VDD_VPP_EFGH_Output_Current + sensorName: P0_VPP_EFGH_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 160 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +42: + sensorType: 0x01 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/temperature/P0_VDD_MEM_VPP_EFGH_Temperature + sensorName: P0_VDD_EFGH_temp + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: 0 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +43: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P1_VDD_CORE_Input_Voltage + sensorName: P1_VDD_CORE_Vin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 60 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +44: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P1_VDD_CORE_Output_Voltage + sensorName: P1_VDD_CORE_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 15 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +45: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P1_VDD_CORE_Input_Current + sensorName: P1_VDD_CORE_Iin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 200 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +46: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P1_VDD_CORE_Output_Current + sensorName: P1_VDD_CORE_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 90 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -2 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +47: + sensorType: 0x01 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/temperature/P1_VDD_CORE_Temperature + sensorName: P1_VDD_CORE_temp + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: 0 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +48: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P1_VDD_SOC_Input_Voltage + sensorName: P1_VDD_SOC_Vin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 60 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +49: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P1_VDD_SOC_Output_Voltage + sensorName: P1_VDD_SOC_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 15 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +50: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P1_VDD_SOC_Input_Current + sensorName: P1_VDD_SOC_Iin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 200 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +51: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P1_VDD_SOC_Output_Current + sensorName: P1_VDD_SOC_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 35 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -2 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +52: + sensorType: 0x01 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/temperature/P1_VDD_SOC_Temperature + sensorName: P1_VDD_SOC_temp + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: 0 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +53: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P1_VDD_MEM_VPP_ABCD_Input_Voltage + sensorName: P1_VDD_ABCD_Vin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 60 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +54: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P1_VDD_MEM_ABCD_Output_Voltage + sensorName: P1_MEM_ABCD_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 10 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +55: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P1_VDD_VPP_ABCD_Output_Voltage + sensorName: P1_VPP_ABCD_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 15 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +56: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P1_VDD_MEM_VPP_ABCD_Input_Current + sensorName: P1_VDD_ABCD_Iin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 200 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +57: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P1_VDD_MEM_ABCD_Output_Current + sensorName: P1_MEM_ABCD_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 50 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -2 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +58: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P1_VDD_VPP_ABCD_Output_Current + sensorName: P1_VPP_ABCD_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 160 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +59: + sensorType: 0x01 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/temperature/P1_VDD_MEM_VPP_ABCD_Temperature + sensorName: P1_VDD_ABCD_temp + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: 0 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +60: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P1_VDD_MEM_VPP_EFGH_Input_Voltage + sensorName: P1_VDD_EFGH_Vin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 60 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +61: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P1_VDD_MEM_EFGH_Output_Voltage + sensorName: P1_MEM_EFGH_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 10 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +62: + sensorType: 0x02 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/voltage/P1_VDD_VPP_EFGH_Output_Voltage + sensorName: P1_VPP_EFGH_Vout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 15 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +63: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P1_VDD_MEM_VPP_EFGH_Input_Current + sensorName: P1_VDD_EFGH_Iin + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 200 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +64: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P1_VDD_MEM_EFGH_Output_Current + sensorName: P1_MEM_EFGH_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 50 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -2 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +65: + sensorType: 0x03 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/current/P1_VDD_VPP_EFGH_Output_Current + sensorName: P1_VPP_EFGH_Iout + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + multiplierM: 160 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +66: + sensorType: 0x01 + entityID: 0x0A + path: /xyz/openbmc_project/sensors/temperature/P1_VDD_MEM_VPP_EFGH_Temperature + sensorName: P1_VDD_EFGH_temp + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: 0 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +67: + sensorType: 0x02 + entityID: 0x07 + path: /xyz/openbmc_project/sensors/voltage/5_DUAL + sensorName: 5_DUAL + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 30 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +68: + sensorType: 0x02 + entityID: 0x07 + path: /xyz/openbmc_project/sensors/voltage/33_DUAL + sensorName: 33_DUAL + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 15 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +69: + sensorType: 0x02 + entityID: 0x07 + path: /xyz/openbmc_project/sensors/voltage/12_RUN + sensorName: 12_RUN + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 60 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +70: + sensorType: 0x02 + entityID: 0x07 + path: /xyz/openbmc_project/sensors/voltage/5_RUN + sensorName: 5_RUN + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 30 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +71: + sensorType: 0x02 + entityID: 0x07 + path: /xyz/openbmc_project/sensors/voltage/33_RUN + sensorName: 33_RUN + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + multiplierM: 15 + scale: 0 + offsetB: 0 + bExp: 0 + rExp: -3 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 66444b9ce..557d268f5 100644 --- a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_ethanolx := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:ethanolx := "${THISDIR}/${PN}:" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 706e192d2..d92ca4c05 100644 --- a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_ethanolx = " ethanolx-yaml-config" +DEPENDS:append:ethanolx = " ethanolx-yaml-config" -EXTRA_OECONF_ethanolx = " \ +EXTRA_OECONF:ethanolx = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-fru-read.yaml \ PROP_YAML=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-extra-properties.yaml \ " diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 8e60f458e..7d52980c4 100644 --- a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_ethanolx = " ethanolx-yaml-config" +DEPENDS:append:ethanolx = " ethanolx-yaml-config" -EXTRA_OECONF_ethanolx = " \ +EXTRA_OECONF:ethanolx = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/dbus-sensors_%.bbappend new file mode 100644 index 000000000..5d88d073e --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -0,0 +1,6 @@ +PACKAGECONFIG:ethanolx = "\ + hwmontempsensor \ + fansensor \ + psusensor \ + adcsensor \ + " diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend new file mode 100644 index 000000000..f1c5acabc --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append:ethanolx = " boot_type" diff --git a/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control_%.bbappend index 1cf276dce..662090ea0 100644 --- a/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-Amd-power-control-modifications-for-EthanolX.patch" SRCREV = "01a77864f49088bac80474587a123d1f152f2b26" diff --git a/meta-amd/recipes-amd/amd-fpga/amd-fpga.bb b/meta-amd/recipes-amd/amd-fpga/amd-fpga.bb index 32efddea2..79c80b012 100644 --- a/meta-amd/recipes-amd/amd-fpga/amd-fpga.bb +++ b/meta-amd/recipes-amd/amd-fpga/amd-fpga.bb @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" SUMMARY = "AMD Ethanolx FPGA Register Dump Utility" DESCRIPTION = "AMD Ethanolx FPGA Register Dump Utility" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=5e24678b8d0883d9dfa9e9473069ddd2" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" SRCREV = "${AUTOREV}" SRC_URI = "file://fpgardu.sh" SRC_URI += "file://LICENSE" diff --git a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb index 33e66f568..06938055c 100644 --- a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb +++ b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb @@ -16,27 +16,27 @@ PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" -SUMMARY_${PN}-chassis = "AMD Chassis" -RDEPENDS_${PN}-chassis = " \ +SUMMARY:${PN}-chassis = "AMD Chassis" +RDEPENDS:${PN}-chassis = " \ x86-power-control \ obmc-host-failure-reboots \ " -SUMMARY_${PN}-fans = "AMD Fans" -RDEPENDS_${PN}-fans = "" +SUMMARY:${PN}-fans = "AMD Fans" +RDEPENDS:${PN}-fans = "" -SUMMARY_${PN}-flash = "AMD Flash" -RDEPENDS_${PN}-flash = " \ +SUMMARY:${PN}-flash = "AMD Flash" +RDEPENDS:${PN}-flash = " \ phosphor-software-manager \ " -SUMMARY_${PN}-system = "AMD System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "AMD System" +RDEPENDS:${PN}-system = " \ amd-fpga \ bmcweb \ dbus-sensors \ diff --git a/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend b/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend index 7f9c460e2..a53372431 100644 --- a/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" OBMC_CONSOLE_HOST_TTY = "ttyS0" -SRC_URI_remove = "file://${BPN}.conf" +SRC_URI:remove = "file://${BPN}.conf" SRC_URI += "file://server.ttyS0.conf" -do_install_append() { +do_install:append() { # Remove upstream-provided configuration rm -rf ${D}${sysconfdir}/${BPN} diff --git a/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 83567e906..4cdfe5a9e 100644 --- a/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OECONF_append = " --enable-configure-dbus=yes" +EXTRA_OECONF:append = " --enable-configure-dbus=yes" diff --git a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend index 9ae1d42c6..1f2e6c038 100644 --- a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend +++ b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" # Default service instance to install (single-host mode) DEFAULT_INSTANCE = "ttyS0" -SRC_URI_remove = "file://${BPN}.conf" +SRC_URI:remove = "file://${BPN}.conf" SRC_URI += "file://ttyS0.conf" diff --git a/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index ac98c7ce7..ca35bcb6a 100644 --- a/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " log-threshold log-pulse" +PACKAGECONFIG:append = " log-threshold log-pulse" |