meta-facebook: yosemite4: Add network config
Add network config and move 00-bmc-eth.network into meta-facebook common layer.
Test on yv4:
After do sled cycle can get ip success.
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
Change-Id: I7b6452d5f4a25fa898ae512bcc745b8ae9ed640e
diff --git a/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
index e89fbe2..253b76e 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,15 +1,12 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI:append:harma = " \
- file://00-bmc-eth0.network \
file://00-bmc-usb0.network \
"
-FILES:${PN}:append:harma = " ${systemd_unitdir}/network/00-bmc-eth0.network"
FILES:${PN}:append:harma = " ${systemd_unitdir}/network/00-bmc-usb0.network"
do_install:append() {
install -d ${D}${systemd_unitdir}/network/
- install -m 0644 ${WORKDIR}/00-bmc-eth0.network ${D}${systemd_unitdir}/network/00-bmc-eth0.network
install -m 0644 ${WORKDIR}/00-bmc-usb0.network ${D}${systemd_unitdir}/network/00-bmc-usb0.network
}
diff --git a/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf b/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf
index 2fa1921..690e113 100644
--- a/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf
+++ b/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf
@@ -12,6 +12,7 @@
require conf/machine/include/ast2600.inc
require conf/machine/include/obmc-bsp-common.inc
require conf/machine/include/facebook-tpm2.inc
+require conf/machine/include/facebook-ncsi-nic.inc
FLASH_SIZE = "131072"
@@ -19,5 +20,7 @@
# Primary chassis as Sled plus secondary chassis in N slots.
OBMC_CHASSIS_INSTANCES = "0 ${OBMC_HOST_INSTANCES}"
+NCSI_ETH_INTF = "eth0 eth1"
+
VIRTUAL-RUNTIME_obmc-host-state-manager = "phosphor-state-manager-host"
VIRTUAL-RUNTIME_obmc-chassis-state-manager = "phosphor-state-manager-chassis"
diff --git a/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network/00-bmc-eth0.network b/meta-facebook/recipes-phosphor/network/phosphor-network/00-bmc-eth.network
similarity index 95%
rename from meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network/00-bmc-eth0.network
rename to meta-facebook/recipes-phosphor/network/phosphor-network/00-bmc-eth.network
index 90bbe67..5ccb0ea 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network/00-bmc-eth0.network
+++ b/meta-facebook/recipes-phosphor/network/phosphor-network/00-bmc-eth.network
@@ -1,5 +1,5 @@
[Match]
-Name=eth0
+Type=ether
[Network]
DHCP=true
LinkLocalAddressing=1
diff --git a/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend
new file mode 100644
index 0000000..b030ca6
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append = " \
+ file://00-bmc-eth.network \
+ "
+
+FILES:${PN}:append = " ${systemd_unitdir}/network/00-bmc-eth.network"
+
+do_install:append() {
+ install -d ${D}${systemd_unitdir}/network/
+ install -m 0644 ${WORKDIR}/00-bmc-eth.network ${D}${systemd_unitdir}/network/00-bmc-eth.network
+}
\ No newline at end of file