summaryrefslogtreecommitdiffstats
path: root/meta-rcs
diff options
context:
space:
mode:
Diffstat (limited to 'meta-rcs')
-rw-r--r--meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/favicon.icobin0 -> 1150 bytes
-rw-r--r--meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/login-logo-size.patch13
-rw-r--r--meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/logo.svg81
-rw-r--r--meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui_git.bbappend9
-rw-r--r--meta-rcs/meta-talos/conf/machine/talos.conf2
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml12
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch13
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend2
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json2
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml44
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/talos-ipmid-whitelist.conf48
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend6
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/network/network/ncsi-netlink.service13
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/network/phosphor-network_%.bbappend8
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend1
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf28
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf16
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf145
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf145
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/cpu-power-reporting.patch150
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/login-page-name.patch13
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch13
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend5
-rw-r--r--meta-rcs/recipes-phosphor/binary-block-editor/binary-block-editor.bb29
24 files changed, 792 insertions, 6 deletions
diff --git a/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/favicon.ico b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/favicon.ico
new file mode 100644
index 000000000..530ba868a
--- /dev/null
+++ b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/favicon.ico
Binary files differ
diff --git a/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/login-logo-size.patch b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/login-logo-size.patch
new file mode 100644
index 000000000..9d2623dfe
--- /dev/null
+++ b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/login-logo-size.patch
@@ -0,0 +1,13 @@
+diff --git a/app/login/styles/index.scss b/app/login/styles/index.scss
+index 07d45bf..86117e9 100644
+--- a/app/login/styles/index.scss
++++ b/app/login/styles/index.scss
+@@ -21,7 +21,7 @@
+ margin-left: 0;
+ }
+ .login__logo {
+- max-width: 200px;
++ max-width: 400px;
+ display: block;
+ margin: 0 auto 2em;
+ @include mediaQuery(small) {
diff --git a/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/logo.svg b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/logo.svg
new file mode 100644
index 000000000..f38286d87
--- /dev/null
+++ b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/logo.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="3423.7102"
+ height="1032"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="raptor_cs_logo_large.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.979899"
+ inkscape:cx="537.91596"
+ inkscape:cy="835.80387"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1920"
+ inkscape:window-height="1152"
+ inkscape:window-x="1917"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(1158.6609,-7.53327)">
+ <g
+ id="g3092"
+ transform="translate(-216.3077,-204.97177)">
+ <path
+ style="fill:#5bb5e2"
+ d="m -254.74951,1086.755 c -24.60951,-86.76246 -44.72983,-158.17534 -44.71182,-158.69524 0.018,-0.51991 1.10075,-2.09491 2.40609,-3.5 2.59576,-2.79413 101.02137,-131.05544 109.60541,-142.83004 2.91716,-4.00143 5.41082,-7.15143 5.54147,-7 0.13065,0.15143 -3.93233,74.75032 -9.02885,165.77532 -5.09652,91.02496 -10.99827,196.66246 -13.115,234.74996 -2.52013,45.346 -4.21176,69.25 -4.90067,69.25 -0.57863,0 -21.18712,-70.9875 -45.79663,-157.75 z M 1254.4438,910.75504 c -1.2438,-1.58606 -1.2085,-1.62143 0.3776,-0.37756 0.9625,0.75485 1.75,1.54235 1.75,1.75 0,0.82304 -0.8212,0.29331 -2.1276,-1.37244 z m -359.94809,-262 -2.4243,-2.75 2.75,2.42431 c 1.5125,1.33338 2.75,2.57088 2.75,2.75 0,0.78428 -0.8098,0.14598 -3.0757,-2.42431 z m 62.5757,0.75 c 0.9955,-1.1 2.035,-2 2.31,-2 0.275,0 -0.3145,0.9 -1.31,2 -0.9955,1.1 -2.035,2 -2.31,2 -0.275,0 0.3145,-0.9 1.31,-2 z m -1258,-44.96941 c -7.7,-1.49816 -29.075,-5.55176 -47.5,-9.00799 l -33.5,-6.28405 -263,-101.28234 c -144.65,-55.70529 -265.025,-102.14272 -267.5,-103.1943 -8.88266,-3.22028 -13.48008,-5.30177 -29.80358,-12.17126 -0.34599,-1.03898 0.0264,-1.20597 1.41713,-0.63543 105.40402,33.39034 170.14867,51.78106 239.88645,72.55701 33.55,9.99471 76.075,22.66755 94.5,28.16187 18.425,5.49431 41.6,12.39061 51.5,15.32511 9.9,2.9345 52.2,15.5381 94,28.00799 41.8,12.4699 99.175,29.57871 127.5,38.01959 28.325,8.44088 56,16.70099 61.5,18.35581 l 10,3.00875 2.13277,-2.69567 c 1.17303,-1.48263 32.00797,-38.02318 68.52209,-81.20124 36.51412,-43.17806 67.12463,-79.55537 68.02335,-80.83848 0.89872,-1.2831 27.74081,-21.9806 59.6491,-45.99444 31.90829,-24.01383 90.44859,-68.07402 130.08959,-97.91152 39.641,-29.8375 72.7844,-54.25 73.6521,-54.25 0.8677,0 1.4322,0.65899 1.2543,1.46442 -0.3114,1.41069 -252.11798,317.7854 -256.44848,322.20695 -1.16966,1.19426 -3.18163,3.66926 -4.47105,5.5 -1.28942,1.83075 -13.52662,17.39113 -27.19378,34.57863 l -24.84938,31.25 -57.6803,-0.12274 -57.68031,-0.12273 z m 1196,-59.03059 c 0.9955,-1.1 2.035,-2 2.31,-2 0.275,0 -0.3145,0.9 -1.31,2 -0.9955,1.1 -2.035,2 -2.31,2 -0.275,0 0.3145,-0.9 1.31,-2 z m 61.905,-0.25 -1.905,-2.25 2.25,1.90499 c 1.2375,1.04774 2.25,2.06024 2.25,2.25 0,0.80025 -0.8048,0.20945 -2.595,-1.90499 z"
+ id="path3100"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="scsssssssccscscsssssssssscsccccssssscsssssscssscccssssssscsss" />
+ <path
+ style="fill:#3e95c7"
+ d="m -298.95566,907.50504 c 0.34473,-10.725 1.95906,-74.625 3.58739,-142 l 2.96061,-122.5 3.14669,-17.75 3.1467,-18.28571 56.79325,0.35714 57.1504,0.17857 -0.62647,8.75 c -0.34456,4.8125 -2.488,42.27378 -4.76322,83.24729 l -4.49389,75.033 -6.48228,8.68421 c -14.35303,19.22853 -106.23609,138.90028 -108.58452,141.2855 l -2.46144,2.5 z"
+ id="path3098"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sscccccsscsscs" />
+ </g>
+ <path
+ style="fill:#000000"
+ d="m -109.2489,725.69824 c -17.1854,-2.4783 -30.6396,-9.0006 -42.1276,-20.4224 -6.4679,-6.4306 -8.9613,-9.8051 -12.2102,-16.5246 -6.0773,-12.5693 -7.5664,-19.8402 -7.5664,-36.9438 0,-17.1036 1.4891,-24.3745 7.5664,-36.9438 5.7217,-11.834 16.8841,-23.014 28.8502,-28.8959 23.8476,-11.7221 55.0804,-12.0827 81.2376,-0.9379 l 4.75,2.0239 0,14.9449 0,14.945 -2.75,-1.9415 c -9.4289,-6.6565 -21.9407,-10.9796 -34.25,-11.8341 -15.3092,-1.0627 -25.7599,2.3409 -34.797,11.3325 -8.5697,8.5267 -13.1683,21.5548 -13.1683,37.3069 0,15.7521 4.5986,28.7801 13.1683,37.3068 9.0371,8.9917 19.4878,12.3952 34.797,11.3325 12.3093,-0.8544 24.8211,-5.1775 34.25,-11.8341 l 2.75,-1.9414 0,14.9449 0,14.945 -4.75,2.0238 c -16.9106,7.2051 -37.1799,9.7913 -55.75,7.1133 z m 139.8602,-0.3671 c -9.6898,-1.7587 -13.5134,-3.0753 -22.7706,-7.8411 -15.2344,-7.8429 -26.693,-22.7692 -31.7787,-41.3959 -1.7675,-6.4736 -2.126,-10.5691 -2.126,-24.2867 0,-13.7176 0.3585,-17.8131 2.126,-24.2867 6.673,-24.4404 23.4726,-41.2389 47.9024,-47.8993 11.2479,-3.0665 36.3255,-3.0665 47.5734,0 24.4298,6.6604 41.2294,23.4589 47.9024,47.8993 1.7675,6.4736 2.126,10.5691 2.126,24.2867 0,13.7176 -0.3585,17.8131 -2.126,24.2867 -5.9054,21.6287 -20.2094,37.9174 -39.7598,45.2761 -13.6026,5.12 -33.7304,6.7447 -49.0691,3.9609 z m 27.6978,-26.1336 c 16.6298,-4.9385 25.9269,-21.932 25.9269,-47.3901 0,-30.527 -13.7548,-49 -36.4849,-49 -24.1876,0 -38.0024,20.6196 -36.1791,54 1.3138,24.0533 10.8164,39.1116 27.1791,43.0696 5.2876,1.279 13.98,0.977 19.558,-0.6795 z m 479.4728,26.5665 c -14.0601,-2.2129 -26.9486,-8.7484 -33.8417,-17.1605 -2.0193,-2.4643 -5.0189,-7.4522 -6.6657,-11.0843 -5.4378,-11.9927 -6.0234,-18.8802 -6.0234,-70.8428 l 0,-46.869 18.4488,0 18.4488,0 0.3012,50.25 c 0.3005,50.1265 0.3069,50.2626 2.6238,55.3824 2.8815,6.3676 6.4202,9.8363 12.0673,11.8287 8.88,3.1331 22.3735,1.0622 27.2863,-4.1876 7.3899,-7.8969 7.8238,-11.5749 7.8238,-66.3227 l 0,-46.9508 18.5657,0 18.5657,0 -0.4148,50.75 c -0.4489,54.9102 -0.5014,55.4853 -6.1819,67.75 -8.5506,18.4614 -24.8187,27.2203 -52.0347,28.0161 -7.15,0.209 -15.6861,-0.043 -18.9692,-0.5595 z m 543.9692,0.01 c -17.5934,-2.7475 -30.6828,-9.1152 -42.1276,-20.4941 -13.131,-13.0554 -18.8623,-27.0722 -20.0227,-48.9685 -2.2485,-42.4311 21.2829,-71.7436 62.6503,-78.0418 20.5287,-3.1255 45.6991,-0.48 64.7321,6.8035 l 5.2679,2.0159 0,14.8336 0,14.8336 -7.0836,-3.555 c -29.025,-14.5666 -60.0405,-13.657 -75.4645,2.2131 -8.9403,9.199 -13.0218,22.8113 -12.1125,40.3971 1.3033,25.2027 12.8752,40.103 34.2664,44.1221 6.6909,1.2571 22.2643,0.5955 27.1442,-1.1531 l 3.25,-1.1646 0,-14.4022 0,-14.4022 -11.5,0 -11.5,0 0,-12.5 0,-12.5 29,0 29,0 0,34.9866 0,34.9866 -3.75,1.6136 c -7.9654,3.4275 -18.1515,6.553 -27.75,8.5148 -11.436,2.3374 -34.6599,3.3197 -44,1.861 z m 212.1088,0.044 c -9.0218,-1.137 -20.2381,-3.6388 -29.8588,-6.6598 l -7.75,-2.4336 0,-15.4709 0,-15.4709 5.9548,3.006 c 16.0158,8.0847 29.5978,11.5185 45.5452,11.5148 13.0166,0 17.1731,-1.268 22.332,-6.7964 4.5697,-4.8971 3.727,-15.5375 -1.5598,-19.6961 -2.9193,-2.2964 -12.819,-5.3938 -31.6132,-9.8911 -15.5285,-3.7158 -24.4717,-7.8994 -31.2552,-14.6208 -11.3657,-11.2618 -13.6574,-32.2643 -5.3668,-49.185 4.8462,-9.8909 14.7708,-17.2655 28.094,-20.8757 14.6795,-3.9777 44.6426,-2.3568 68.119,3.6851 l 3.75,0.9651 0,14.8544 0,14.8545 -7.2978,-2.8337 c -14.6222,-5.6779 -23.1298,-7.3734 -37.2022,-7.4144 -11.3012,-0.033 -13.6172,0.2472 -17.7233,2.144 -6.3274,2.923 -9.0238,7.2414 -8.4782,13.5782 0.7652,8.8874 3.573,10.4546 29.0335,16.206 26.6571,6.0216 35.9806,10.0903 42.7722,18.6654 9.0123,11.379 10.2918,33.4108 2.8587,49.2241 -4.6431,9.8776 -15.0505,17.4478 -28.9629,21.0669 -7.6422,1.9881 -31.0714,2.8846 -41.3912,1.5839 z m 286.0001,0 c -9.0218,-1.137 -20.2381,-3.6388 -29.8588,-6.6598 l -7.75,-2.4336 0,-15.4709 0,-15.4709 5.9548,3.006 c 16.0158,8.0847 29.5978,11.5185 45.5452,11.5148 13.0166,0 17.1731,-1.268 22.332,-6.7964 4.5697,-4.8971 3.727,-15.5375 -1.5598,-19.6961 -2.9193,-2.2964 -12.819,-5.3938 -31.6132,-9.8911 -15.5285,-3.7158 -24.4717,-7.8994 -31.2552,-14.6208 -11.3657,-11.2618 -13.6574,-32.2643 -5.3668,-49.185 4.8462,-9.8909 14.7708,-17.2655 28.094,-20.8757 14.6795,-3.9777 44.6426,-2.3568 68.119,3.6851 l 3.75,0.9651 0,14.8544 0,14.8545 -7.2978,-2.8337 c -14.6222,-5.6779 -23.1298,-7.3734 -37.2022,-7.4144 -11.3012,-0.033 -13.6172,0.2472 -17.7233,2.144 -6.3274,2.923 -9.0238,7.2414 -8.4782,13.5782 0.7652,8.8874 3.573,10.4546 29.0335,16.206 26.6571,6.0216 35.9806,10.0903 42.7722,18.6654 9.0123,11.379 10.2918,33.4108 2.8587,49.2241 -4.6431,9.8776 -15.0505,17.4478 -28.9629,21.0669 -7.6422,1.9881 -31.0714,2.8846 -41.3912,1.5839 z m 610,0 c -9.0218,-1.137 -20.2381,-3.6388 -29.8588,-6.6598 l -7.75,-2.4336 0,-15.4709 0,-15.4709 5.9548,3.006 c 16.0158,8.0847 29.5978,11.5185 45.5452,11.5148 13.0166,0 17.1731,-1.268 22.332,-6.7964 4.5697,-4.8971 3.727,-15.5375 -1.5598,-19.6961 -2.9193,-2.2964 -12.819,-5.3938 -31.6132,-9.8911 -15.5285,-3.7158 -24.4717,-7.8994 -31.2552,-14.6208 -11.3657,-11.2618 -13.6574,-32.2643 -5.3668,-49.185 4.8462,-9.8909 14.7708,-17.2655 28.094,-20.8757 14.6795,-3.9777 44.6426,-2.3568 68.119,3.6851 l 3.75,0.9651 0,14.8544 0,14.8545 -7.2978,-2.8337 c -14.6222,-5.6779 -23.1298,-7.3734 -37.2022,-7.4144 -11.3012,-0.033 -13.6172,0.2472 -17.7233,2.144 -6.3274,2.923 -9.0238,7.2414 -8.4782,13.5782 0.7652,8.8874 3.573,10.4546 29.0335,16.206 26.6571,6.0216 35.9806,10.0903 42.7722,18.6654 9.0123,11.379 10.2918,33.4108 2.8587,49.2241 -4.6431,9.8776 -15.0505,17.4478 -28.9629,21.0669 -7.6422,1.9881 -31.0714,2.8846 -41.3912,1.5839 z m -2040.6089,-74.0246 0,-72.0181 23.6882,0.2681 23.6881,0.2681 14.2675,33 c 7.8471,18.15 15.1918,35.2081 16.3216,37.9069 1.1298,2.6988 2.3161,4.6449 2.6362,4.3248 0.3202,-0.3202 7.8867,-17.3783 16.8146,-37.9069 l 16.2324,-37.3248 23.6757,-0.2681 23.6757,-0.2681 0,72.0181 0,72.0181 -17.4911,0 -17.4911,0 -0.2589,-52.2063 -0.2589,-52.2063 -16.5,38.1847 -16.5,38.1846 -12,0 -12,0 -16.5,-38.1696 -16.5,-38.1697 -0.2589,52.1895 -0.2589,52.1894 -17.4911,0 -17.4911,0 0,-72.0181 z m 197,0.018 0,-72 34.869,0 c 39.7528,0 47.6076,0.8495 59.7569,6.4628 13.4982,6.2365 21.3622,17.0783 23.619,32.5626 3.1863,21.8612 -5.6221,40.0607 -23.4634,48.4789 -10.0261,4.7307 -21.2785,6.4957 -41.4125,6.4957 l -16.369,0 0,25 0,25 -18.5,0 -18.5,0 z m 66.6696,-5.147 c 5.8214,-1.4659 11.7333,-6.9925 13.2142,-12.353 3.5972,-13.0211 -1.8919,-24.2571 -13.3838,-27.3962 -2.2,-0.601 -9.7375,-1.0952 -16.75,-1.0982 l -12.75,-0.01 0,21 0,21 12.5572,0 c 6.9064,0 14.607,-0.5162 17.1124,-1.1471 z m 270.3304,19.147 0,-58 -24,0 -24,0 0,-14 0,-14 66.5,0 66.5,0 0,14 0,14 -24,0 -24,0 0,58 0,58 -18.5,0 -18.5,0 z m 104,-14 0,-72 18.5,0 18.5,0 0,72 0,72 -18.5,0 -18.5,0 z m 74,0 0,-72 20.75,0.034 20.75,0.035 26,48.9479 26,48.9479 0.2594,-48.9825 0.2594,-48.9824 17.4906,0 17.4906,0 0,72 0,72 -20.75,-0.034 -20.75,-0.035 -26,-48.9479 -26,-48.9479 -0.2594,48.9824 -0.2594,48.9825 -17.4906,0 -17.4906,0 z m 576,41.5689 0,-30.431 -10.1654,-15.319 c -5.591,-8.4254 -17.9473,-27.1314 -27.4585,-41.5689 l -17.293,-26.25 20.2758,0 20.2758,0 16.2678,25.5 c 8.9473,14.025 16.3897,25.5 16.5387,25.5 0.149,0 7.6004,-11.475 16.5588,-25.5 l 16.288,-25.5 20.3142,0 20.3142,0 -19.606,29.75 c -10.7835,16.3625 -23.1397,35.0242 -27.4583,41.4705 l -7.8521,11.7205 0,30.5295 0,30.5295 -18.5,0 -18.5,0 z m 282.0001,-27.5689 0,-58 -24,0 -24,0 0,-14 0,-14 66.5,0 66.5,0 0,14 0,14 -24,0 -24,0 0,58 0,58 -18.5,0 -18.5,0 z m 104,-14 0,-72 50.5,0 50.5,0 0,14 0,14 -32,0 -32,0 0,13.5 0,13.5 30,0 30,0 0,14 0,14 -30,0 -30,0 0,16.5 0,16.5 33,0 33,0 0,14 0,14 -51.5,0 -51.5,0 z m 135,-0.018 0,-72.0181 23.6882,0.2681 23.6881,0.2681 14.2675,33 c 7.8471,18.15 15.1918,35.2081 16.3216,37.9069 1.1298,2.6988 2.3161,4.6449 2.6362,4.3248 0.3202,-0.3202 7.8867,-17.3783 16.8146,-37.9069 l 16.2324,-37.3248 23.6757,-0.2681 23.6757,-0.2681 0,72.0181 0,72.0181 -17.4911,0 -17.4911,0 -0.2589,-52.2063 -0.2589,-52.2063 -16.5,38.1847 -16.5,38.1846 -12,0 -12,0 -16.5,-38.1696 -16.5,-38.1697 -0.2589,52.1895 -0.2589,52.1894 -17.4911,0 -17.4911,0 0,-72.0181 z m -3034.9521,-11.6249 c 0.026,-0.4714 4.1889,-2.8964 9.25,-5.3889 5.0611,-2.4926 88.852,-46.9893 186.202,-98.8816 97.35,-51.8923 200.625,-106.9413 229.5,-122.3311 28.875,-15.3898 51.91607,-27.65911 54.11901,-29.03107 3.3829,0.18286 93.2365,17.49214 95.09528,17.76423 -0.62615,4.08005 0.31101,-0.90286 -3.19939,18.51144 -1.6411,9.075 -2.9908,16.8375 -2.9993,17.25 -0.01,0.4125 -0.6595,0.75 -1.4466,0.75 -0.7871,0 -52.8746,18.4015 -115.75,40.8923 -62.8754,22.4908 -189.3511,67.7278 -281.0571,100.5268 -91.706,32.799 -167.4185,59.8956 -168.25,60.2147 -0.8315,0.3191 -1.4903,0.1945 -1.4639,-0.2768 z M 690.091,490.26464 c -15.9627,-2.4867 -28.9688,-7.3785 -40.4618,-15.2184 -6.6765,-4.5544 -17.4271,-15.4295 -22.2516,-22.5093 -17.1908,-25.2273 -21.1213,-70.0256 -9.0466,-103.1111 7.3665,-20.1846 22.5646,-37.334 41.6326,-46.9778 27.8681,-14.0946 73.357,-13.9585 101.0617,0.3023 16.902,8.7003 30.5426,22.738 38.2655,39.3794 13.1612,28.3604 13.1612,70.9949 0,99.3553 -9.8051,21.1283 -27.9401,37.0072 -51.0397,44.6898 -15.7631,5.2427 -39.8753,6.9382 -58.1601,4.0898 z m 32.4805,-35.9525 c 8.4064,-2.1895 13.4524,-5.0945 19.36,-11.1455 6.2104,-6.3611 11.384,-16.5962 13.8293,-27.3592 2.2984,-10.1163 3.0088,-27.5255 1.5656,-38.3645 -4.1111,-30.8765 -19.0226,-47.7689 -43.5753,-49.364 -25.3428,-1.6464 -42.8174,12.6534 -49.1599,40.2285 -2.5722,11.1827 -2.5722,35.8172 0,47 3.7041,16.1044 12.9265,30.0242 23.4485,35.3921 9.7999,4.9996 23.6458,6.4481 34.5318,3.6126 z m -880.3204,-62.5869 0,-96.0821 48.75,0.4637 c 31.5508,0.3001 50.6904,0.875 54.25,1.6297 30.7307,6.5151 44.076,20.4157 45.6704,47.5709 0.628,10.6965 -1.3082,21.279 -5.3576,29.2825 -4.7835,9.4544 -15.4305,18.3938 -26.5628,22.3026 -3.812,1.3384 -5.0073,2.9149 -2.2102,2.9149 2.7852,0 9.6595,4.1063 14.581,8.7097 6.8838,6.439 12.4847,15.7687 29.7409,49.5403 l 15.2012,29.75 -26.7814,0 -26.7815,0 -14.3515,-28.6386 c -20.1815,-40.2716 -23.4768,-43.3554 -46.33,-43.3554 l -9.8185,0 0,36 0,36 -25,0 -25,0 0,-96.0822 z m 87.1085,-12.582 c 7.9448,-3.6172 11.8745,-11.0244 11.8859,-22.4043 0.01,-7.4746 -2.3403,-14.9308 -5.7209,-18.1689 -5.3757,-5.149 -9.3941,-6.125 -27.0235,-6.5638 l -16.25,-0.4044 0,25.2056 0,25.2055 16.25,-0.3857 c 13.842,-0.3286 16.9329,-0.6967 20.8585,-2.484 z m 94.6941,103.9142 c 0.987,-2.6125 17.0531,-45.8125 35.7026,-96 l 33.9081,-91.25 29.5888,0 29.5888,0 35.5827,95.75 35.5827,95.75 -24.527,0.2678 c -13.4899,0.1473 -24.7276,0.067 -24.9727,-0.1779 -0.2451,-0.2451 -2.4337,-6.2156 -4.8634,-13.2678 -2.4297,-7.0522 -5.1244,-14.7346 -5.9882,-17.0721 l -1.5704,-4.25 -38.7947,0 -38.7946,0 -3.2838,9.25 c -1.806,5.0875 -4.6038,12.9625 -6.2172,17.5 l -2.9334,8.25 -24.9014,0 -24.9013,0 z m 125.1974,-66.8747 c 0,-1.3592 -25.5226,-74.3748 -25.9949,-74.3667 -0.4352,0.01 -24.9421,69.861 -25.8284,73.62 -0.2676,1.135 4.1704,1.3714 25.75,1.3714 14.3403,0 26.0733,-0.2811 26.0733,-0.6247 z m 100,-24.4481 0,-96.0728 50.75,0.3806 50.75,0.3807 9.7387,2.6317 c 30.48,8.2366 46.7613,29.0412 46.7613,59.7526 0,30.7299 -16.4144,51.6829 -46.7613,59.6907 -8.9101,2.3512 -11.9295,2.6114 -35.4887,3.0582 l -25.75,0.4883 0,32.8814 0,32.8814 -25,0 -25,0 z m 86.9671,-7.0136 c 7.3152,-1.5688 13.9245,-6.3871 16.991,-12.3869 2.1368,-4.1807 2.5419,-6.3365 2.5419,-13.5267 0,-10.8858 -2.7152,-16.9029 -9.7756,-21.6637 -6.4326,-4.3374 -12.1933,-5.3363 -30.7736,-5.3363 l -15.9508,0 0,27 0,27 15.9508,0 c 8.7729,0 18.2302,-0.4889 21.0163,-1.0864 z m 147.0329,26.0864 0,-77 -32,0 -32,0 0,-19 0,-19 89,0 89,0 0,19 0,19 -32,0 -32,0 0,77 0,77 -25,0 -25,0 z m 363,-19.0822 0,-96.0821 48.75,0.4637 c 31.5508,0.3001 50.6904,0.875 54.25,1.6297 30.7307,6.5151 44.076,20.4157 45.6704,47.5709 0.628,10.6965 -1.3082,21.279 -5.3576,29.2825 -4.7835,9.4544 -15.4305,18.3938 -26.5628,22.3026 -3.812,1.3384 -5.0073,2.9149 -2.2102,2.9149 2.7852,0 9.6595,4.1063 14.581,8.7097 6.8838,6.439 12.4847,15.7687 29.7409,49.5403 l 15.2012,29.75 -26.7814,0 -26.7815,0 -14.3515,-28.6386 c -20.1815,-40.2716 -23.4768,-43.3554 -46.33,-43.3554 l -9.8185,0 0,36 0,36 -25,0 -25,0 0,-96.0822 z m 87.1085,-12.582 c 7.9448,-3.6172 11.8745,-11.0244 11.8859,-22.4043 0.01,-7.4746 -2.3403,-14.9308 -5.7209,-18.1689 -5.3757,-5.149 -9.3941,-6.125 -27.0235,-6.5638 l -16.25,-0.4044 0,25.2056 0,25.2055 16.25,-0.3857 c 13.842,-0.3286 16.9329,-0.6967 20.8585,-2.484 z"
+ id="path3090"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssscccccsssssscccsscsssssssssscsssssscscscccssssscccssscssssscccssssscccccccccccssscscccscscssssscccssssssscccscccscscssssscccssssssscccscccscscssssscccsssssssccccccsssscccccccccccccccccccccccssssscccccccscccccscccccccccccccccccccccccccccccccccccccccccccccccccccsscccssscccssccccccccccccccccccccccccccccccccccccccccccccccccccccsssscccccccccccccccccccccccssccccsssscsssssssssscssssssscccscsscssscccsscccccccscsscccsscscccccscscccccsccccscsssccccssssccccccssssscccsscccccccccccccccccccscsscssscccsscccccccscsscccss" />
+ </g>
+</svg>
diff --git a/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui_git.bbappend b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui_git.bbappend
new file mode 100644
index 000000000..28f1c5a27
--- /dev/null
+++ b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui_git.bbappend
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/phosphor-webui:"
+SRC_URI += "file://logo.svg"
+SRC_URI += "file://favicon.ico"
+SRC_URI += "file://login-logo-size.patch"
+
+do_compile_prepend() {
+ cp -r ${WORKDIR}/logo.svg ${S}/app/assets/images/
+ cp -r ${WORKDIR}/favicon.ico ${S}/app/assets/images/
+}
diff --git a/meta-rcs/meta-talos/conf/machine/talos.conf b/meta-rcs/meta-talos/conf/machine/talos.conf
index 03713217f..709d9c0b8 100644
--- a/meta-rcs/meta-talos/conf/machine/talos.conf
+++ b/meta-rcs/meta-talos/conf/machine/talos.conf
@@ -38,6 +38,8 @@ MACHINE_EXTRA_RDEPENDS += "obmc-ipl-status-led-monitor obmc-hardbeep"
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "talos-ipmi-inventory-map-native"
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory_df-mrw = "talos-ipmi-inventory-map-native"
+PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties = "phosphor-ipmi-fru-properties-native"
+PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties_df-mrw = "phosphor-ipmi-fru-properties-native"
PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "talos-led-manager-config-native"
PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = "talos-led-manager-config-native"
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "talos-ipmi-fru-read-inventory-native"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
index 1778bf2a1..7d6d8b403 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
@@ -2,7 +2,7 @@ fans:
- inventory: /system/chassis/motherboard/fan0
functional_delay: 5
allowed_out_of_range_time: 30
- deviation: -500
+ deviation: -300
num_sensors_nonfunc_for_fan_nonfunc: 1
sensors:
- name: fan0
@@ -11,7 +11,7 @@ fans:
- inventory: /system/chassis/motherboard/fan1
functional_delay: 5
allowed_out_of_range_time: 30
- deviation: -500
+ deviation: -300
num_sensors_nonfunc_for_fan_nonfunc: 1
sensors:
- name: fan1
@@ -20,7 +20,7 @@ fans:
- inventory: /system/chassis/motherboard/fan2
functional_delay: 5
allowed_out_of_range_time: 30
- deviation: -500
+ deviation: -300
num_sensors_nonfunc_for_fan_nonfunc: 1
sensors:
- name: fan2
@@ -29,7 +29,7 @@ fans:
- inventory: /system/chassis/motherboard/fan3
functional_delay: 5
allowed_out_of_range_time: 30
- deviation: -500
+ deviation: -300
num_sensors_nonfunc_for_fan_nonfunc: 1
sensors:
- name: fan3
@@ -38,7 +38,7 @@ fans:
- inventory: /system/chassis/motherboard/fan4
functional_delay: 5
allowed_out_of_range_time: 30
- deviation: -500
+ deviation: -300
num_sensors_nonfunc_for_fan_nonfunc: 1
sensors:
- name: fan4
@@ -47,7 +47,7 @@ fans:
- inventory: /system/chassis/motherboard/fan5
functional_delay: 5
allowed_out_of_range_time: 30
- deviation: -500
+ deviation: -300
num_sensors_nonfunc_for_fan_nonfunc: 1
sensors:
- name: fan5
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch
new file mode 100644
index 000000000..383310246
--- /dev/null
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch
@@ -0,0 +1,13 @@
+diff --git a/monitor/tach_sensor.cpp b/monitor/tach_sensor.cpp
+index 5494450..6832ffe 100644
+--- a/monitor/tach_sensor.cpp
++++ b/monitor/tach_sensor.cpp
+@@ -81,7 +81,7 @@ TachSensor::TachSensor(Mode mode,
+ _bus(bus),
+ _fan(fan),
+ _name(FAN_SENSOR_PATH + id),
+- _invName(path(fan.getName()) / id),
++ _invName(path(fan.getName()) / (id + "tach")),
+ _hasTarget(hasTarget),
+ _funcDelay(funcDelay),
+ _interface(interface),
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 36751c29a..0035eee8d 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -5,6 +5,8 @@ FAN_PACKAGES += " \
phosphor-cooling-type \
"
+SRC_URI += "file://label-fan-tachs-in-inventory.patch"
+
PACKAGECONFIG += "cooling-type"
RDEPENDS_phosphor-cooling-type += "libevdev"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
index 56170bf48..ea20c7ccb 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
+++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
@@ -3,6 +3,8 @@
{"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/ambient", "record_id": 254}
],
"baseboard": [
+ {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_vdd_temp", "record_id": 250}
+ {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_vdd_temp", "record_id": 251}
{"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/pcie", "record_id": 253}
{"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/cpu_1_ambient", "record_id": 252}
],
diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml
index 2c897df8f..f6a6be20f 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml
+++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml
@@ -1405,6 +1405,50 @@
0xFF:
type: int64_t
+0xa1:
+ entityID: 0x03
+ entityInstance: 49
+ sensorType: 0x01
+ path: /xyz/openbmc_project/sensors/temperature/p0_vdd_temp
+ sensorReadingType: 0x01
+ multiplierM: 1
+ offsetB: -127
+ bExp: 0
+ rExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+ scale: -3
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ sensorNamePattern: nameLeaf
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0xFF:
+ type: int64_t
+
+0xa2:
+ entityID: 0x03
+ entityInstance: 50
+ sensorType: 0x01
+ path: /xyz/openbmc_project/sensors/temperature/p1_vdd_temp
+ sensorReadingType: 0x01
+ multiplierM: 1
+ offsetB: -127
+ bExp: 0
+ rExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+ scale: -3
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ sensorNamePattern: nameLeaf
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0xFF:
+ type: int64_t
+
0xe7:
entityID: 0x0A
entityInstance: 2
diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/talos-ipmid-whitelist.conf b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/talos-ipmid-whitelist.conf
new file mode 100644
index 000000000..961214df0
--- /dev/null
+++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/talos-ipmid-whitelist.conf
@@ -0,0 +1,48 @@
+#<NetFn>:<Command
+0x00:0x00 //<Chassis>:<Chassis Capabiliti>
+0x00:0x01 //<Chassis>:<Get Chassis Status>
+0x00:0x02 //<Chassis>:<Chassis Control>
+0x00:0x05 //<Chassis>:<Set Chassis Capabilities>
+0x00:0x06 //<Chassis>:<Set Power Restore Policy>
+0x00:0x08 //<Chassis>:<Set System Boot Options>
+0x00:0x09 //<Chassis>:<Get System Boot Options>
+0x00:0x0F //<Chassis>:<Get POH Counter Command>
+0x04:0x02 //<Sensor/Event>:<Platform event>
+0x04:0x2D //<Sensor/Event>:<Get Sensor Reading>
+0x04:0x2F //<Sensor/Event>:<Get Sensor Type>
+0x04:0x30 //<Sensor/Event>:<Set Sensor Reading and Event Status>
+0x06:0x01 //<App>:<Get Device ID>
+0x06:0x04 //<App>:<Get Self Test Results>
+0x06:0x06 //<App>:<Set ACPI Power State>
+0x06:0x07 //<App>:<Get ACPI Power State>
+0x06:0x08 //<App>:<Get Device GUID>
+0x06:0x22 //<App>:<Reset Watchdog Timer>
+0x06:0x24 //<App>:<Set Watchdog Timer>
+0x06:0x25 //<App>:<Get Watchdog Timer>
+0x06:0x2E //<App>:<Set BMC Global Enables>
+0x06:0x2F //<App>:<Get BMC Global Enables>
+0x06:0x31 //<App>:<Get Message Flags>
+0x06:0x35 //<App>:<Read Event Message Buffer>
+0x06:0x36 //<App>:<Get BT Interface Capabilities>
+0x06:0x37 //<App>:<Get System GUID>
+0x06:0x42 //<App>:<Get Channel Info Command>
+0x06:0x4E //<App>:<Get Channel Payload Support>
+0x06:0x54 //<App>:<Get Channel Cipher Suites>
+0x0A:0x10 //<Storage>:<Get FRU Inventory Area Info>
+0x0A:0x11 //<Storage>:<Read FRU Data>
+0x0A:0x20 //<Storage>:<Get SDR Repository Info>
+0x0A:0x22 //<Storage>:<Reserve SDR Repository>
+0x0A:0x23 //<Storage>:<Get SDR>
+0x0A:0x40 //<Storage>:<Get SEL Info>
+0x0A:0x42 //<Storage>:<Reserve SEL>
+0x0A:0x44 //<Storage>:<Add SEL Entry>
+0x0A:0x48 //<Storage>:<Get SEL Time>
+0x0A:0x49 //<Storage>:<Set SEL Time>
+0x0C:0x02 //<Transport>:<Get LAN Configuration Parameters>
+0x2C:0x00 //<Group Extension>:<Group Extension Command>
+0x2C:0x01 //<Group Extension>:<Get DCMI Capabilities>
+0x2C:0x02 //<Group Extension>:<Get Power Reading>
+0x2C:0x03 //<Group Extension>:<Get Power Limit>
+0x2C:0x06 //<Group Extension>:<Get Asset Tag>
+0x2C:0x07 //<Group Extension>:<Get Sensor Info>
+0x2C:0x10 //<Group Extension>:<Get Temperature Readings>
diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index e1798ad4b..788adb8a2 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -8,3 +8,9 @@ SRC_URI_append = " \
EXTRA_OECONF_append = " \
CHANNEL_YAML_GEN=${WORKDIR}/channel.yaml \
"
+
+# Replace the default whitelist on Talos II systems
+SRC_URI_append = " file://talos-ipmid-whitelist.conf"
+
+WHITELIST_CONF_remove = " ${S}/host-ipmid-whitelist.conf"
+WHITELIST_CONF_append = " ${WORKDIR}/talos-ipmid-whitelist.conf"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/network/network/ncsi-netlink.service b/meta-rcs/meta-talos/recipes-phosphor/network/network/ncsi-netlink.service
new file mode 100644
index 000000000..44b34195e
--- /dev/null
+++ b/meta-rcs/meta-talos/recipes-phosphor/network/network/ncsi-netlink.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Stop the ethernet link failover
+Wants=xyz.openbmc_project.Network.service
+After=xyz.openbmc_project.Network.service
+
+[Service]
+Restart=no
+ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0
+SyslogIdentifier=ncsi-netlink
+Type=oneshot
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-rcs/meta-talos/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/network/phosphor-network_%.bbappend
new file mode 100644
index 000000000..5137f4e00
--- /dev/null
+++ b/meta-rcs/meta-talos/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/network:"
+SRC_URI += "file://ncsi-netlink.service"
+SYSTEMD_SERVICE_${PN} += "ncsi-netlink.service"
+
+do_install_append() {
+ install -d ${D}${systemd_system_unitdir}
+ install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir}
+}
diff --git a/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 74866b373..154931330 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1 +1,2 @@
RDEPENDS_${PN}-inventory += " openpower-occ-control phosphor-cooling-type"
+RDEPENDS_${PN}-extras += " binary-block-editor procps obmc-ikvm bmcweb phosphor-webui"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf
index 204de8b8b..8b0f3cbc7 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf
@@ -12,5 +12,33 @@ ENABLE_fan4 = "1"
ENABLE_fan5 = "1"
ENABLE_fan6 = "1"
+WARNLO_fan1 = "500"
+WARNLO_fan2 = "500"
+WARNLO_fan3 = "500"
+WARNLO_fan4 = "500"
+WARNLO_fan5 = "500"
+WARNLO_fan6 = "500"
+
+CRITLO_fan1 = "300"
+CRITLO_fan2 = "300"
+CRITLO_fan3 = "300"
+CRITLO_fan4 = "300"
+CRITLO_fan5 = "300"
+CRITLO_fan6 = "300"
+
+WARNHI_fan1 = "20000"
+WARNHI_fan2 = "20000"
+WARNHI_fan3 = "20000"
+WARNHI_fan4 = "20000"
+WARNHI_fan5 = "20000"
+WARNHI_fan6 = "20000"
+
+CRITHI_fan1 = "30000"
+CRITHI_fan2 = "30000"
+CRITHI_fan3 = "30000"
+CRITHI_fan4 = "30000"
+CRITHI_fan5 = "30000"
+CRITHI_fan6 = "30000"
+
# Legacy mode
TARGET_MODE = "RPM"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf
index 506687fcd..0f2a4dc71 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf
@@ -1,3 +1,19 @@
LABEL_temp1 = "pcie"
LABEL_temp2 = "cpu_1_ambient"
LABEL_temp3 = "ambient"
+
+WARNLO_temp1 = "0"
+WARNLO_temp2 = "0"
+WARNLO_temp3 = "0"
+
+CRITLO_temp1 = "-40000"
+CRITLO_temp2 = "-40000"
+CRITLO_temp3 = "-40000"
+
+WARNHI_temp1 = "45000"
+WARNHI_temp2 = "65000"
+WARNHI_temp3 = "35000"
+
+CRITHI_temp1 = "65000"
+CRITHI_temp2 = "85000"
+CRITHI_temp3 = "55000" \ No newline at end of file
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
index 7752d2bbb..24c349c08 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
@@ -86,6 +86,7 @@ LABEL_temp111 = "p0_core20_temp"
LABEL_temp112 = "p0_core21_temp"
LABEL_temp113 = "p0_core22_temp"
LABEL_temp114 = "p0_core23_temp"
+LABEL_temp255 = "p0_vdd_temp"
LABEL_temp27 = "dimm0_temp"
LABEL_temp28 = "dimm1_temp"
LABEL_temp29 = "dimm2_temp"
@@ -121,3 +122,147 @@ LABEL_freq114 = "p0_core23_freq"
LABEL_power2 = "p0_power"
LABEL_power3 = "p0_vdd_power"
LABEL_power4 = "p0_vdn_power"
+WARNLO_temp27 = "0"
+WARNLO_temp28 = "0"
+WARNLO_temp29 = "0"
+WARNLO_temp30 = "0"
+WARNLO_temp31 = "0"
+WARNLO_temp32 = "0"
+WARNLO_temp33 = "0"
+WARNLO_temp34 = "0"
+WARNLO_temp91 = "0"
+WARNLO_temp92 = "0"
+WARNLO_temp93 = "0"
+WARNLO_temp94 = "0"
+WARNLO_temp95 = "0"
+WARNLO_temp96 = "0"
+WARNLO_temp97 = "0"
+WARNLO_temp98 = "0"
+WARNLO_temp99 = "0"
+WARNLO_temp100 = "0"
+WARNLO_temp101 = "0"
+WARNLO_temp102 = "0"
+WARNLO_temp103 = "0"
+WARNLO_temp104 = "0"
+WARNLO_temp105 = "0"
+WARNLO_temp106 = "0"
+WARNLO_temp107 = "0"
+WARNLO_temp108 = "0"
+WARNLO_temp109 = "0"
+WARNLO_temp110 = "0"
+WARNLO_temp111 = "0"
+WARNLO_temp112 = "0"
+WARNLO_temp113 = "0"
+WARNLO_temp114 = "0"
+WARNLO_temp255 = "0"
+WARNLO_power2 = "-1000000"
+WARNLO_power3 = "-1000000"
+WARNLO_power4 = "-1000000"
+CRITLO_temp27 = "-40000"
+CRITLO_temp28 = "-40000"
+CRITLO_temp29 = "-40000"
+CRITLO_temp30 = "-40000"
+CRITLO_temp31 = "-40000"
+CRITLO_temp32 = "-40000"
+CRITLO_temp33 = "-40000"
+CRITLO_temp34 = "-40000"
+CRITLO_temp91 = "-40000"
+CRITLO_temp92 = "-40000"
+CRITLO_temp93 = "-40000"
+CRITLO_temp94 = "-40000"
+CRITLO_temp95 = "-40000"
+CRITLO_temp96 = "-40000"
+CRITLO_temp97 = "-40000"
+CRITLO_temp98 = "-40000"
+CRITLO_temp99 = "-40000"
+CRITLO_temp100 = "-40000"
+CRITLO_temp101 = "-40000"
+CRITLO_temp102 = "-40000"
+CRITLO_temp103 = "-40000"
+CRITLO_temp104 = "-40000"
+CRITLO_temp105 = "-40000"
+CRITLO_temp106 = "-40000"
+CRITLO_temp107 = "-40000"
+CRITLO_temp108 = "-40000"
+CRITLO_temp109 = "-40000"
+CRITLO_temp110 = "-40000"
+CRITLO_temp111 = "-40000"
+CRITLO_temp112 = "-40000"
+CRITLO_temp113 = "-40000"
+CRITLO_temp114 = "-40000"
+CRITLO_temp255 = "-40000"
+CRITLO_power2 = "-1000000"
+CRITLO_power3 = "-1000000"
+CRITLO_power4 = "-1000000"
+WARNHI_temp27 = "60000"
+WARNHI_temp28 = "60000"
+WARNHI_temp29 = "60000"
+WARNHI_temp30 = "60000"
+WARNHI_temp31 = "60000"
+WARNHI_temp32 = "60000"
+WARNHI_temp33 = "60000"
+WARNHI_temp34 = "60000"
+WARNHI_temp91 = "78000"
+WARNHI_temp92 = "78000"
+WARNHI_temp93 = "78000"
+WARNHI_temp94 = "78000"
+WARNHI_temp95 = "78000"
+WARNHI_temp96 = "78000"
+WARNHI_temp97 = "78000"
+WARNHI_temp98 = "78000"
+WARNHI_temp99 = "78000"
+WARNHI_temp100 = "78000"
+WARNHI_temp101 = "78000"
+WARNHI_temp102 = "78000"
+WARNHI_temp103 = "78000"
+WARNHI_temp104 = "78000"
+WARNHI_temp105 = "78000"
+WARNHI_temp106 = "78000"
+WARNHI_temp107 = "78000"
+WARNHI_temp108 = "78000"
+WARNHI_temp109 = "78000"
+WARNHI_temp110 = "78000"
+WARNHI_temp111 = "78000"
+WARNHI_temp112 = "78000"
+WARNHI_temp113 = "78000"
+WARNHI_temp114 = "78000"
+WARNHI_temp255 = "80000"
+WARNHI_power2 = "190000000"
+WARNHI_power3 = "180000000"
+WARNHI_power4 = "40000000"
+CRITHI_temp27 = "85000"
+CRITHI_temp28 = "85000"
+CRITHI_temp29 = "85000"
+CRITHI_temp30 = "85000"
+CRITHI_temp31 = "85000"
+CRITHI_temp32 = "85000"
+CRITHI_temp33 = "85000"
+CRITHI_temp34 = "85000"
+CRITHI_temp91 = "90000"
+CRITHI_temp92 = "90000"
+CRITHI_temp93 = "90000"
+CRITHI_temp94 = "90000"
+CRITHI_temp95 = "90000"
+CRITHI_temp96 = "90000"
+CRITHI_temp97 = "90000"
+CRITHI_temp98 = "90000"
+CRITHI_temp99 = "90000"
+CRITHI_temp100 = "90000"
+CRITHI_temp101 = "90000"
+CRITHI_temp102 = "90000"
+CRITHI_temp103 = "90000"
+CRITHI_temp104 = "90000"
+CRITHI_temp105 = "90000"
+CRITHI_temp106 = "90000"
+CRITHI_temp107 = "90000"
+CRITHI_temp108 = "90000"
+CRITHI_temp109 = "90000"
+CRITHI_temp110 = "90000"
+CRITHI_temp111 = "90000"
+CRITHI_temp112 = "90000"
+CRITHI_temp113 = "90000"
+CRITHI_temp114 = "90000"
+CRITHI_temp255 = "92000"
+CRITHI_power2 = "250000000"
+CRITHI_power3 = "240000000"
+CRITHI_power4 = "60000000"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
index d90820d8c..d41f6e978 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
@@ -86,6 +86,7 @@ LABEL_temp135 = "p1_core20_temp"
LABEL_temp136 = "p1_core21_temp"
LABEL_temp137 = "p1_core22_temp"
LABEL_temp138 = "p1_core23_temp"
+LABEL_temp255 = "p1_vdd_temp"
LABEL_temp35 = "dimm8_temp"
LABEL_temp36 = "dimm9_temp"
LABEL_temp37 = "dimm10_temp"
@@ -121,3 +122,147 @@ LABEL_freq138 = "p1_core23_freq"
LABEL_power2 = "p1_power"
LABEL_power3 = "p1_vdd_power"
LABEL_power4 = "p1_vdn_power"
+WARNLO_temp35 = "0"
+WARNLO_temp36 = "0"
+WARNLO_temp37 = "0"
+WARNLO_temp38 = "0"
+WARNLO_temp39 = "0"
+WARNLO_temp40 = "0"
+WARNLO_temp41 = "0"
+WARNLO_temp42 = "0"
+WARNLO_temp115 = "0"
+WARNLO_temp116 = "0"
+WARNLO_temp117 = "0"
+WARNLO_temp118 = "0"
+WARNLO_temp119 = "0"
+WARNLO_temp120 = "0"
+WARNLO_temp121 = "0"
+WARNLO_temp122 = "0"
+WARNLO_temp123 = "0"
+WARNLO_temp124 = "0"
+WARNLO_temp125 = "0"
+WARNLO_temp126 = "0"
+WARNLO_temp127 = "0"
+WARNLO_temp128 = "0"
+WARNLO_temp129 = "0"
+WARNLO_temp130 = "0"
+WARNLO_temp131 = "0"
+WARNLO_temp132 = "0"
+WARNLO_temp133 = "0"
+WARNLO_temp134 = "0"
+WARNLO_temp135 = "0"
+WARNLO_temp136 = "0"
+WARNLO_temp137 = "0"
+WARNLO_temp138 = "0"
+WARNLO_temp255 = "0"
+WARNLO_power2 = "-1000000"
+WARNLO_power3 = "-1000000"
+WARNLO_power4 = "-1000000"
+CRITLO_temp35 = "-40000"
+CRITLO_temp36 = "-40000"
+CRITLO_temp37 = "-40000"
+CRITLO_temp38 = "-40000"
+CRITLO_temp39 = "-40000"
+CRITLO_temp40 = "-40000"
+CRITLO_temp41 = "-40000"
+CRITLO_temp42 = "-40000"
+CRITLO_temp115 = "-40000"
+CRITLO_temp116 = "-40000"
+CRITLO_temp117 = "-40000"
+CRITLO_temp118 = "-40000"
+CRITLO_temp119 = "-40000"
+CRITLO_temp120 = "-40000"
+CRITLO_temp121 = "-40000"
+CRITLO_temp122 = "-40000"
+CRITLO_temp123 = "-40000"
+CRITLO_temp124 = "-40000"
+CRITLO_temp125 = "-40000"
+CRITLO_temp126 = "-40000"
+CRITLO_temp127 = "-40000"
+CRITLO_temp128 = "-40000"
+CRITLO_temp129 = "-40000"
+CRITLO_temp130 = "-40000"
+CRITLO_temp131 = "-40000"
+CRITLO_temp132 = "-40000"
+CRITLO_temp133 = "-40000"
+CRITLO_temp134 = "-40000"
+CRITLO_temp135 = "-40000"
+CRITLO_temp136 = "-40000"
+CRITLO_temp137 = "-40000"
+CRITLO_temp138 = "-40000"
+CRITLO_temp255 = "-40000"
+CRITLO_power2 = "-1000000"
+CRITLO_power3 = "-1000000"
+CRITLO_power4 = "-1000000"
+WARNHI_temp35 = "60000"
+WARNHI_temp36 = "60000"
+WARNHI_temp37 = "60000"
+WARNHI_temp38 = "60000"
+WARNHI_temp39 = "60000"
+WARNHI_temp40 = "60000"
+WARNHI_temp41 = "60000"
+WARNHI_temp42 = "60000"
+WARNHI_temp115 = "78000"
+WARNHI_temp116 = "78000"
+WARNHI_temp117 = "78000"
+WARNHI_temp118 = "78000"
+WARNHI_temp119 = "78000"
+WARNHI_temp120 = "78000"
+WARNHI_temp121 = "78000"
+WARNHI_temp122 = "78000"
+WARNHI_temp123 = "78000"
+WARNHI_temp124 = "78000"
+WARNHI_temp125 = "78000"
+WARNHI_temp126 = "78000"
+WARNHI_temp127 = "78000"
+WARNHI_temp128 = "78000"
+WARNHI_temp129 = "78000"
+WARNHI_temp130 = "78000"
+WARNHI_temp131 = "78000"
+WARNHI_temp132 = "78000"
+WARNHI_temp133 = "78000"
+WARNHI_temp134 = "78000"
+WARNHI_temp135 = "78000"
+WARNHI_temp136 = "78000"
+WARNHI_temp137 = "78000"
+WARNHI_temp138 = "78000"
+WARNHI_temp255 = "80000"
+WARNHI_power2 = "190000000"
+WARNHI_power3 = "180000000"
+WARNHI_power4 = "40000000"
+CRITHI_temp35 = "85000"
+CRITHI_temp36 = "85000"
+CRITHI_temp37 = "85000"
+CRITHI_temp38 = "85000"
+CRITHI_temp39 = "85000"
+CRITHI_temp40 = "85000"
+CRITHI_temp41 = "85000"
+CRITHI_temp42 = "85000"
+CRITHI_temp115 = "90000"
+CRITHI_temp116 = "90000"
+CRITHI_temp117 = "90000"
+CRITHI_temp118 = "90000"
+CRITHI_temp119 = "90000"
+CRITHI_temp120 = "90000"
+CRITHI_temp121 = "90000"
+CRITHI_temp122 = "90000"
+CRITHI_temp123 = "90000"
+CRITHI_temp124 = "90000"
+CRITHI_temp125 = "90000"
+CRITHI_temp126 = "90000"
+CRITHI_temp127 = "90000"
+CRITHI_temp128 = "90000"
+CRITHI_temp129 = "90000"
+CRITHI_temp130 = "90000"
+CRITHI_temp131 = "90000"
+CRITHI_temp132 = "90000"
+CRITHI_temp133 = "90000"
+CRITHI_temp134 = "90000"
+CRITHI_temp135 = "90000"
+CRITHI_temp136 = "90000"
+CRITHI_temp137 = "90000"
+CRITHI_temp138 = "90000"
+CRITHI_temp255 = "92000"
+CRITHI_power2 = "250000000"
+CRITHI_power3 = "240000000"
+CRITHI_power4 = "60000000"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/cpu-power-reporting.patch b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/cpu-power-reporting.patch
new file mode 100644
index 000000000..7a45a46cb
--- /dev/null
+++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/cpu-power-reporting.patch
@@ -0,0 +1,150 @@
+diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
+index 7643a4e..df0e7cf 100644
+--- a/app/common/services/api-utils.js
++++ b/app/common/services/api-utils.js
+@@ -1488,22 +1488,42 @@ window.angular && (function(angular) {
+ });
+ return $q.all(promises);
+ },
+- getPowerConsumption: function() {
++ getCPUPowerConsumption: function() {
+ return $http({
+ method: 'GET',
+ url: DataService.getHost() +
+- '/xyz/openbmc_project/sensors/power/total_power',
++ '/xyz/openbmc_project/sensors/power/p0_power',
+ withCredentials: true
+ })
+ .then(
+ function(response) {
+ var json = JSON.stringify(response.data);
+ var content = JSON.parse(json);
++ var first_cpu_data = content.data;
+
+- return getScaledValue(
+- content.data.Value, content.data.Scale) +
+- ' ' +
+- Constants.POWER_CONSUMPTION_TEXT[content.data.Unit];
++ return $http({
++ method: 'GET',
++ url: DataService.getHost() +
++ '/xyz/openbmc_project/sensors/power/p1_power',
++ withCredentials: true
++ })
++ .then(
++ function(response) {
++ var json = JSON.stringify(response.data);
++ var content = JSON.parse(json);
++ var second_cpu_value = content.data.Value;
++
++ return getScaledValue(
++ first_cpu_data.Value + second_cpu_value, first_cpu_data.Scale) +
++ ' ' +
++ Constants.POWER_CONSUMPTION_TEXT[first_cpu_data.Unit];
++ },
++ function(error) {
++ return getScaledValue(
++ first_cpu_data.Value, first_cpu_data.Scale) +
++ ' ' +
++ Constants.POWER_CONSUMPTION_TEXT[first_cpu_data.Unit];
++ });
+ },
+ function(error) {
+ if ('Not Found' == error.statusText) {
+diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html
+index 629e0ab..03644c6 100644
+--- a/app/overview/controllers/system-overview-controller.html
++++ b/app/overview/controllers/system-overview-controller.html
+@@ -83,8 +83,8 @@
+ <ul class="overview__metadata-wrapper">
+ <li class="overview__metadata-block">
+ <dl>
+- <dt class="content-label">Power Consumption</dt>
+- <dd class="courier-bold">{{power_consumption}}</dd>
++ <dt class="content-label">CPU Power Consumption</dt>
++ <dd class="courier-bold">{{cpu_power_consumption}}</dd>
+ </dl>
+ </li>
+ <li class="overview__metadata-block">
+diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js
+index 0b7d2f0..b466b6a 100644
+--- a/app/overview/controllers/system-overview-controller.js
++++ b/app/overview/controllers/system-overview-controller.js
+@@ -19,7 +19,7 @@ window.angular && (function(angular) {
+ $scope.bmc_firmware = '';
+ $scope.bmc_time = '';
+ $scope.server_firmware = '';
+- $scope.power_consumption = '';
++ $scope.cpu_power_consumption = '';
+ $scope.power_cap = '';
+ $scope.bmc_ip_addresses = [];
+ $scope.loading = false;
+@@ -77,9 +77,9 @@ window.angular && (function(angular) {
+ console.log(JSON.stringify(error));
+ });
+
+- var getPowerConsumptionPromise = APIUtils.getPowerConsumption().then(
++ var getCPUPowerConsumptionPromise = APIUtils.getCPUPowerConsumption().then(
+ function(data) {
+- $scope.power_consumption = data;
++ $scope.cpu_power_consumption = data;
+ },
+ function(error) {
+ console.log(JSON.stringify(error));
+@@ -114,7 +114,7 @@ window.angular && (function(angular) {
+ getLEDStatePromise,
+ getBMCTimePromise,
+ getServerInfoPromise,
+- getPowerConsumptionPromise,
++ getCPUPowerConsumptionPromise,
+ getPowerCapPromise,
+ getNetworkInfoPromise,
+ ];
+diff --git a/app/server-control/controllers/power-usage-controller.html b/app/server-control/controllers/power-usage-controller.html
+index 62ca3da..273cf9b 100644
+--- a/app/server-control/controllers/power-usage-controller.html
++++ b/app/server-control/controllers/power-usage-controller.html
+@@ -11,8 +11,8 @@
+ <fieldset>
+ <ul class="power-usage__metadata-wrapper">
+ <li class="power-usage__metadata-block">
+- <p class="content-label">Power Consumption</p>
+- <p class="courier-bold">{{power_consumption}}</p>
++ <p class="content-label">CPU Power Consumption</p>
++ <p class="courier-bold">{{cpu_power_consumption}}</p>
+ </li>
+ <li class="power-usage__metadata-block">
+ <div class="toggle inline">
+diff --git a/app/server-control/controllers/power-usage-controller.js b/app/server-control/controllers/power-usage-controller.js
+index 9398259..bb2bf0d 100644
+--- a/app/server-control/controllers/power-usage-controller.js
++++ b/app/server-control/controllers/power-usage-controller.js
+@@ -12,7 +12,7 @@ window.angular && (function(angular) {
+ angular.module('app.serverControl').controller('powerUsageController', [
+ '$scope', '$window', 'APIUtils', '$route', '$q', 'toastService',
+ function($scope, $window, APIUtils, $route, $q, toastService) {
+- $scope.power_consumption = '';
++ $scope.cpu_power_consumption = '';
+ $scope.power_cap = {};
+ $scope.loading = false;
+ loadPowerData();
+@@ -28,16 +28,16 @@ window.angular && (function(angular) {
+ console.log(JSON.stringify(error));
+ });
+
+- var getPowerConsumptionPromise = APIUtils.getPowerConsumption().then(
++ var getCPUPowerConsumptionPromise = APIUtils.getCPUPowerConsumption().then(
+ function(data) {
+- $scope.power_consumption = data;
++ $scope.cpu_power_consumption = data;
+ },
+ function(error) {
+ console.log(JSON.stringify(error));
+ });
+
+ var promises = [
+- getPowerConsumptionPromise,
++ getCPUPowerConsumptionPromise,
+ getPowerCapPromise,
+ ];
+
diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/login-page-name.patch b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/login-page-name.patch
new file mode 100644
index 000000000..79ef25255
--- /dev/null
+++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/login-page-name.patch
@@ -0,0 +1,13 @@
+diff --git a/app/login/controllers/login-controller.html b/app/login/controllers/login-controller.html
+index b89c2c4..fd03283 100644
+--- a/app/login/controllers/login-controller.html
++++ b/app/login/controllers/login-controller.html
+@@ -2,7 +2,7 @@
+ <div class="row">
+ <div class="columns large-6">
+ <img src="../../assets/images/logo.svg" class="login__logo" alt="OpenBMC logo"/>
+- <h1 class="login__desc">OpenBMC</h1>
++ <h3 class="login__desc">Talos™ II</h3>
+ </div>
+ <div class="columns large-6">
+ <form id="login__form" name="login__form" action="" ng-class="{'submitted' : submitted}">
diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch
new file mode 100644
index 000000000..f25c799b7
--- /dev/null
+++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch
@@ -0,0 +1,13 @@
+diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
+index 4298884..e1881ff 100644
+--- a/app/common/services/api-utils.js
++++ b/app/common/services/api-utils.js
+@@ -1472,7 +1472,7 @@ window.angular && (function(angular) {
+ }
+
+ function titlelize(title) {
+- title = title.replace(/([A-Z0-9]+)/g, ' $1').replace(/^\s+/, '');
++ title = title.replace(/tach/g, ' Tachometer').replace(/([A-Z0-9]+)/g, ' $1').replace(/^\s+/, '');
+ for (var i = 0; i < Constants.HARDWARE.uppercase_titles.length;
+ i++) {
+ if (title.toLowerCase().indexOf(
diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend
new file mode 100644
index 000000000..5fac6e13c
--- /dev/null
+++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/phosphor-webui:"
+SRC_URI += "file://login-page-name.patch \
+ file://cpu-power-reporting.patch \
+ file://tachometer-display.patch \
+ "
diff --git a/meta-rcs/recipes-phosphor/binary-block-editor/binary-block-editor.bb b/meta-rcs/recipes-phosphor/binary-block-editor/binary-block-editor.bb
new file mode 100644
index 000000000..42570a218
--- /dev/null
+++ b/meta-rcs/recipes-phosphor/binary-block-editor/binary-block-editor.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Simple binary block editor"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
+
+PE = "0"
+PV = "0.2.2+git${SRCPV}"
+SRCREV = "6c76ee16e1d4f1057ce37166001e95a87c5acb39"
+
+SRC_URI = "git://scm.raptorcs.com/scm/git/binary-block-editor;branch=master;protocol=https"
+S = "${WORKDIR}/git"
+
+inherit autotools-brokensep
+
+do_configure_prepend () {
+ cd ${S}
+ aclocal
+ autoconf --force
+ libtoolize --automake -c --force
+ automake -ac
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 755 ${S}/src/bbe ${D}${bindir}/bbe
+
+ install -d ${STAGING_DIR}/bin
+ install -m 755 ${S}/src/bbe ${STAGING_DIR}/bin/bbe
+}
OpenPOWER on IntegriCloud