Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel

14 files changed, 47 insertions, 111 deletions

diff --git a/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf b/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf
new file mode 100644
index 000000000..854e0fb7b
--- /dev/null
+++ b/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf
@@ -0,0 +1,2 @@
+require conf/distro/openbmc-openpower.conf
+require conf/distro/include/phosphor-aspeednic-use-mac2.inc
diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/local.conf.sample
index c7ccc92b3..d09389ea7 100644
--- a/meta-ingrasys/meta-zaius/conf/local.conf.sample
+++ b/meta-ingrasys/meta-zaius/conf/local.conf.sample
@@ -1,5 +1,5 @@
 MACHINE ??= "zaius"
-DISTRO ?= "openbmc-openpower"
+DISTRO ?= "openbmc-zaius"
 PACKAGE_CLASSES ?= "package_rpm"
 SANITY_TESTED_DISTROS_append ?= " *"
 EXTRA_IMAGE_FEATURES = "debug-tweaks"
diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
index 8dfb1d8d4..38713cdf8 100644
--- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
+++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
@@ -6,9 +6,6 @@ UBOOT_MACHINE = "ast_g5_ncsi_config"
 FLASH_SIZE = "65536"
 
 PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-control'
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "zaius-ipmi-inventory-map-native"
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties = "zaius-ipmi-fru-properties-native"
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "zaius-ipmi-sensor-inventory-native"
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch
deleted file mode 100644
index 2de2d8234..000000000
--- a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cbb09e400a5283e5b543e2b01b8c0038890a5260 Mon Sep 17 00:00:00 2001
-From: Xo Wang <xow@google.com>
-Date: Thu, 20 Oct 2016 17:42:13 -0700
-Subject: [PATCH 2/2] board/aspeed, aspeednic: Use MAC2 for networking
-
-Enable and select MAC2 for aspeednic.
-
-Signed-off-by: Xo Wang <xow@google.com>
----
- drivers/net/aspeednic.c       | 4 ++--
- include/configs/ast-g5-ncsi.h | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/aspeednic.c b/drivers/net/aspeednic.c
-index 8b85893..cff8370 100644
---- a/drivers/net/aspeednic.c
-+++ b/drivers/net/aspeednic.c
-@@ -18,8 +18,8 @@
- /* From the board config file */
- #define CONFIG_MAC1_PHY_SETTING         2
- #define CONFIG_MAC2_PHY_SETTING         0
--#define CONFIG_ASPEED_MAC_NUMBER  1
--#define CONFIG_ASPEED_MAC_CONFIG  1 // config MAC1
-+#define CONFIG_ASPEED_MAC_NUMBER  2
-+#define CONFIG_ASPEED_MAC_CONFIG  2 // config MAC2
- #define _PHY_SETTING_CONCAT(mac) CONFIG_MAC##mac##_PHY_SETTING
- #define _GET_MAC_PHY_SETTING(mac) _PHY_SETTING_CONCAT(mac)
- #define CONFIG_ASPEED_MAC_PHY_SETTING \
-diff --git a/include/configs/ast-g5-ncsi.h b/include/configs/ast-g5-ncsi.h
-index f73a8f1..1408618 100644
---- a/include/configs/ast-g5-ncsi.h
-+++ b/include/configs/ast-g5-ncsi.h
-@@ -22,6 +22,7 @@
- /* Ethernet */
- #define CONFIG_LIB_RAND
- #define CONFIG_ASPEEDNIC
-+#define CONFIG_MAC2_ENABLE
- 
- /* platform.S settings */
- #define	CONFIG_DRAM_ECC_SIZE		0x10000000
--- 
-2.8.0.rc3.226.g39d4020
-
diff --git a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
index 1686be066..ddd2ff8d2 100644
--- a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
@@ -1,3 +1,2 @@
 FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
-SRC_URI_append_zaius = " file://0001-board-aspeed-Add-reset_phy-for-Zaius.patch \
-                         file://0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch"
+SRC_URI_append_zaius = " file://0001-board-aspeed-Add-reset_phy-for-Zaius.patch"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb
new file mode 100644
index 000000000..98dbc15b2
--- /dev/null
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb
@@ -0,0 +1,31 @@
+SUMMARY = "YAML configuration for Zaius"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+inherit allarch
+
+SRC_URI = " \
+    file://zaius-ipmi-fru.yaml \
+    file://zaius-ipmi-fru-properties.yaml \
+    file://zaius-ipmi-sensors.yaml \
+    "
+
+S = "${WORKDIR}"
+
+do_install() {
+    install -m 0644 -D zaius-ipmi-fru-properties.yaml \
+        ${D}${datadir}/${BPN}/ipmi-extra-properties.yaml
+    install -m 0644 -D zaius-ipmi-fru.yaml \
+        ${D}${datadir}/${BPN}/ipmi-fru-read.yaml
+    install -m 0644 -D zaius-ipmi-sensors.yaml \
+        ${D}${datadir}/${BPN}/ipmi-sensors.yaml
+}
+
+FILES_${PN}-dev = " \
+    ${datadir}/${BPN}/ipmi-extra-properties.yaml \
+    ${datadir}/${BPN}/ipmi-fru-read.yaml \
+    ${datadir}/${BPN}/ipmi-sensors.yaml \
+    "
+
+ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties/extra-properties.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-fru-properties.yaml
index bfe8e7e30..bfe8e7e30 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties/extra-properties.yaml
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-fru-properties.yaml
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-fru.yaml
index 8b32bd02e..8b32bd02e 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-fru.yaml
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-sensors.yaml
index a7f1a7324..a7f1a7324 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-sensors.yaml
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
new file mode 100644
index 000000000..fce21406e
--- /dev/null
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -0,0 +1,6 @@
+DEPENDS_append_zaius = " zaius-yaml-config"
+
+EXTRA_OECONF_zaius = " \
+    YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-fru-read.yaml \
+    PROP_YAML=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-extra-properties.yaml \
+    "
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
new file mode 100644
index 000000000..468e2e175
--- /dev/null
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -0,0 +1,6 @@
+DEPENDS_append_zaius = " zaius-yaml-config"
+
+EXTRA_OECONF_zaius = " \
+    SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-sensors.yaml \
+    FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-fru-read.yaml \
+    "
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties-native.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties-native.bb
deleted file mode 100644
index 28dc6218e..000000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties-native.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "FRU properties config for ipmi-fru-parser"
-PR = "r1"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-
-inherit native
-inherit phosphor-ipmi-fru
-
-SRC_URI += "file://extra-properties.yaml"
-
-PROVIDES += "virtual/phosphor-ipmi-fru-properties"
-
-S = "${WORKDIR}"
-
-do_install() {
-        DEST=${D}${properties_datadir}
-        install -d ${DEST}
-        install extra-properties.yaml ${DEST}
-}
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb
deleted file mode 100644
index e0ccc28b2..000000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Zaius IPMI to DBus Inventory mapping."
-PR = "r1"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-
-inherit native
-inherit phosphor-ipmi-fru
-
-SRC_URI += "file://config.yaml"
-
-PROVIDES += "virtual/phosphor-ipmi-fru-inventory"
-
-S = "${WORKDIR}"
-
-do_install() {
-        # TODO: install this to inventory_datadir
-        # after ipmi-fru-parser untangles the host
-        # firmware config from the machine inventory.
-        DEST=${D}${config_datadir}
-
-        install -d ${DEST}
-        install config.yaml ${DEST}
-}
-
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory-native.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory-native.bb
deleted file mode 100644
index 438249f82..000000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory-native.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Sensor config for phosphor-host-ipmi"
-PR = "r1"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-
-inherit native
-inherit phosphor-ipmi-host
-
-PROVIDES += "virtual/phosphor-ipmi-sensor-inventory"
-
-SRC_URI += "file://config.yaml"
-
-S = "${WORKDIR}"
-
-do_install() {
-        DEST=${D}${sensor_datadir}
-        install -d ${DEST}
-        install config.yaml ${DEST}/sensor.yaml
-}