Merge branch 'intel' into intel2

13 files changed, 73 insertions, 26 deletions

diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf
index 56da4ba91..b855dbd29 100644
--- a/meta-inspur/meta-fp5280g2/conf/layer.conf
+++ b/meta-inspur/meta-fp5280g2/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "fp5280g2-layer"
 BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fp5280g2-layer = "thud warrior"
+LAYERSERIES_COMPAT_fp5280g2-layer = "warrior zeus"
diff --git a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf
index 233f6ab17..455e22a0a 100644
--- a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf
+++ b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf
@@ -8,6 +8,7 @@ OBMC_POWER_SUPPLY_INSTANCES = "0 1"
 PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''
 PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "fp5280g2-openpower-fru-vpd-layout-native"
 PREFERRED_PROVIDER_virtual/openpower-fru-inventory = "fp5280g2-openpower-fru-inventory-native"
+PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "fp5280g2-led-manager-config-native"
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend
new file mode 100644
index 000000000..934bb28dd
--- /dev/null
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend
@@ -0,0 +1,3 @@
+EXTRA_OECMAKE_append = " \
+    -DBMCWEB_INSECURE_ENABLE_REDFISH_FW_TFTP_UPDATE=ON \
+    "
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb
index 147f30988..c10330b9b 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb
@@ -1,7 +1,7 @@
 SUMMARY = "YAML configuration for FP5280G2"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit allarch
 
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml
index a4eab8a6d..c44450460 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml
@@ -17,124 +17,124 @@
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Cpu:
         Present: 'true'
 /system/chassis/motherboard/cpu1:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Cpu:
         Present: 'true'
 /system/chassis/motherboard/dimm0:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm1:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm10:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm11:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm12:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm13:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm14:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm15:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm2:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm3:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm4:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm5:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm6:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm7:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm8:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm9:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config-native.bb
new file mode 100644
index 000000000..22aadad8e
--- /dev/null
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config-native.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Phosphor LED Group Management for fp5280g2"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+inherit native
+
+PROVIDES += "virtual/phosphor-led-manager-config-native"
+
+SRC_URI += "file://led.yaml"
+S = "${WORKDIR}"
+
+# Overwrite the example led layout yaml file prior
+# to building the phosphor-led-manager package
+do_install() {
+    SRC=${S}
+    DEST=${D}${datadir}/phosphor-led-manager
+    install -D ${SRC}/led.yaml ${DEST}/led.yaml
+}
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config/led.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config/led.yaml
new file mode 100644
index 000000000..922d67bb7
--- /dev/null
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config/led.yaml
@@ -0,0 +1,20 @@
+bmc_booted:
+    power:
+        Action: 'Blink'
+        DutyOn: 50
+        Period: 1000
+        Priority: 'On'
+    init-ok:
+        Action: 'On'
+        DutyOn: 50
+        Period: 0
+        Priority: 'On'
+
+#fp5280g2 does not use "power" and "power_on". but the led.yaml needs it, otherwise the machine won't power on.
+power_on:
+    power:
+        Action: 'On'
+        DutyOn: 50
+        Period: 0
+        Priority: 'On'
+
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend
index 11c52952e..934b328c7 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend
@@ -1 +1 @@
-SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth1.service"
+SYSTEMD_SERVICE_${PN} += " first-boot-set-mac@eth0.service first-boot-set-mac@eth1.service"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb
index ba31df378..4cf267794 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Fp5280g2 OCC Control sensor IDs"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit native
 inherit openpower-occ-control
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb
index 915af76c7..f731bfe54 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Inspur FP5280G2 Inventory config for openpower-vpd-parser"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit native
 inherit openpower-fru-vpd
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory
index 2e6b39198..c4ba3ad2c 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory
@@ -1,3 +1,3 @@
-FRUS=BMC,ETHERNET
-PATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/ethernet
+FRUS=BMC,ETHERNET,ETHERNET1
+PATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0,/system/chassis/motherboard/bmc/eth1
 EEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a080.i2c-bus/i2c-1/1-0050/eeprom
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb
index 46611fa55..ba684fb88 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Inspur FP5280G2 VPD layout for openpower-fru-vpd"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit native
 inherit openpower-fru-vpd
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml
index aab99dbe2..c26af4fdc 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml
@@ -10,3 +10,7 @@ ETHERNET:
     xyz.openbmc_project.Inventory.Item.NetworkInterface:
         OPFR,B1: MACAddress
     xyz.openbmc_project.Inventory.Item.Ethernet:
+ETHERNET1:
+    xyz.openbmc_project.Inventory.Item.NetworkInterface:
+        VINI,B1: MACAddress
+    xyz.openbmc_project.Inventory.Item.Ethernet: