diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-07-10 01:11:22 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-07-10 20:11:31 +0300 |
| commit | d071adf43ac87f21dde2f84287120960c723962c (patch) | |
| tree | 05a1d365e0faa6ce8570b2d0c2d0f100dc8df1d4 /meta-openbmc-mods/meta-ast2500 | |
| parent | f24c1e9afc47a421831278b57377951e71494d92 (diff) | |
| download | openbmc-d071adf43ac87f21dde2f84287120960c723962c.tar.xz | |
Update to internal 0.66
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500')
4 files changed, 46 insertions, 5 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/conf/layer.conf b/meta-openbmc-mods/meta-ast2500/conf/layer.conf index 85a83d411..5a5051d2e 100644 --- a/meta-openbmc-mods/meta-ast2500/conf/layer.conf +++ b/meta-openbmc-mods/meta-ast2500/conf/layer.conf @@ -9,7 +9,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ast2500" BBFILE_PATTERN_ast2500 = "" BBFILE_PRIORITY_ast2500 = "4" -LAYERSERIES_COMPAT_ast2500 = "warrior zeus" +LAYERSERIES_COMPAT_ast2500 = "zeus dunfell" INHERIT += "extrausers" #INHERIT += " cve-check" diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0044-net-phy-realtek-Change-LED-configuration.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0044-net-phy-realtek-Change-LED-configuration.patch new file mode 100644 index 000000000..b70d3be50 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0044-net-phy-realtek-Change-LED-configuration.patch @@ -0,0 +1,40 @@ +From 06039a941d59f265385c5b4a19231fbd55a05b26 Mon Sep 17 00:00:00 2001 +From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> +Date: Fri, 5 Jun 2020 15:14:50 -0700 +Subject: [PATCH] net: phy: realtek: Change LED configuration + +This commit changes Realtek NIC port LED configuration like below: +LED0 (Right Green): Link 10/100/1000 +LED1 (Left Orange): Link 10/100 + Blink on Tx/Rx +LED2 (Left Green): Link 1000 + Blink on Tx/Rx + +Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> +--- + drivers/net/phy/realtek.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c +index 7a99cb023401..c15280259c35 100644 +--- a/drivers/net/phy/realtek.c ++++ b/drivers/net/phy/realtek.c +@@ -92,10 +92,15 @@ static int rtl8211f_config(struct phy_device *phydev) + MIIM_RTL8211F_PAGE_SELECT, 0x0); + } + +- /* Set green LED for Link, yellow LED for Active */ ++ /* ++ * Set LED configuration ++ * LED0 (Right Grean): Link 10/100/1000 ++ * LED1 (Left Orange): Link 10/100 + Active ++ * LED2 (Left Green): Link 1000 + Active ++ */ + phy_write(phydev, MDIO_DEVAD_NONE, + MIIM_RTL8211F_PAGE_SELECT, 0xd04); +- phy_write(phydev, MDIO_DEVAD_NONE, 0x10, 0x617f); ++ phy_write(phydev, MDIO_DEVAD_NONE, 0x10, 0x626b); + phy_write(phydev, MDIO_DEVAD_NONE, + MIIM_RTL8211F_PAGE_SELECT, 0x0); + +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index 4183df7ef..5be160cb1 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -40,6 +40,7 @@ SRC_URI_append_intel-ast2500 = " \ file://0037-aspeed-ast-scu.c-fix-MAC1LINK-and-MAC2LINK-pin-pads-.patch \ file://0038-Increase-default-fan-speed-for-cooper-city.patch \ file://0040-Initialize-the-BMC-host-mailbox-at-reset-time.patch \ + file://0044-net-phy-realtek-Change-LED-configuration.patch \ " PFR_SRC_URI = " \ file://0022-u-boot-env-change-for-PFR-image.patch \ diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json index bfcec8c9f..041787147 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json @@ -2072,9 +2072,9 @@ "ILimitMax": 100, "ILimitMin": 30, "Inputs": [ - "Left Rear Temp" + "Left Rear Board Temp" ], - "Name": "Left Rear Temp", + "Name": "Left Rear Board Temp", "NegativeHysteresis": 5.0, "OutLimitMax": 100, "OutLimitMin": 30, @@ -2098,9 +2098,9 @@ "ILimitMax": 100, "ILimitMin": 30, "Inputs": [ - "Right Rear Board" + "Right Rear Board Temp" ], - "Name": "Right Rear Board", + "Name": "Right Rear Board Temp", "NegativeHysteresis": 5.0, "OutLimitMax": 100, "OutLimitMin": 30, |