From 7c5f8839ec3d71a2170b8f3514a16a67c69d1c7c Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Wed, 27 Jan 2021 11:47:14 -0800 Subject: Update to internal 0.29 Signed-off-by: Jason M. Bills --- meta-openbmc-mods/meta-ast2500/conf/layer.conf | 2 +- .../meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc | 4 +++- .../recipes-phosphor/configuration/entity-manager/WC-Baseboard.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'meta-openbmc-mods/meta-ast2500') diff --git a/meta-openbmc-mods/meta-ast2500/conf/layer.conf b/meta-openbmc-mods/meta-ast2500/conf/layer.conf index 5a5051d2e..544cacc05 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 = "zeus dunfell" +LAYERSERIES_COMPAT_ast2500 = "dunfell gatesgarth" INHERIT += "extrausers" #INHERIT += " cve-check" diff --git a/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc b/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc index 3ad449118..0690d6b56 100644 --- a/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc +++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc @@ -38,6 +38,8 @@ QB_SYSTEM_NAME = "qemu-system-arm" QB_DEFAULT_FSTYPE = "mtd" QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,if=mtd" QB_MACHINE = "-M intel-ast2500" -QB_OPT_APPEND += " -nographic" +QB_OPT_APPEND += " -nographic -serial mon:stdio -serial none" QB_NETWORK_DEVICE = "-net nic,macaddr=C0:FF:EE:00:00:02,model=ftgmac100" QB_DEFAULT_KERNEL = "none" +QB_RNG = "" +QB_MEM = "512" 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 909c47621..3b7c531ff 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 @@ -813,7 +813,7 @@ "Type": "IpmbSensor" }, { - "Address": "0xDC", + "Address": "0xE0", "Class": "PxeBridgeTemp", "Name": "CPU1 VR Mem ABCD Temp", "Thresholds": [ -- cgit v1.2.3