diff options
| author | Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com> | 2024-01-16 09:31:37 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2024-01-19 00:16:25 +0300 |
| commit | 3489f56cd549120b1508d0105629890463e18318 (patch) | |
| tree | 6f6c59b550c755098fa309846941831a06517f26 | |
| parent | aaa738530c395bb050994301074d591c6eb97f4a (diff) | |
| download | openbmc-3489f56cd549120b1508d0105629890463e18318.tar.xz | |
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
| -rw-r--r-- | meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend | 3 | ||||
| -rw-r--r-- | meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf | 3 | ||||
| -rw-r--r-- | meta-facebook/recipes-phosphor/network/phosphor-network/00-bmc-eth.network (renamed from meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network/00-bmc-eth0.network) | 2 | ||||
| -rw-r--r-- | meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend | 12 |
4 files changed, 16 insertions, 4 deletions
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 e89fbe21e1..253b76eb9f 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 2fa1921aee..690e113079 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/facebook-compute-multihost.inc 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 @@ OBMC_HOST_INSTANCES = "1 2 3 4 5 6 7 8" # 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 index 90bbe67694..5ccb0ead19 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 0000000000..b030ca6deb --- /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 |