From 9d1bf811fe110a520ceeb0a26e5aa749bf1c2b94 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Wed, 17 Feb 2021 19:07:18 -0800 Subject: sconfig: Use get_chip_instance() to set base_chip_instance Now that multiple device trees are supported (chipset, base, override), base_chip_instance parameter for override device needs to be set to the base chip instance of the corresponding device in base/primary tree. This can be achieved by using `get_chip_instance()` instead of using base_dev->chip_instance in `update_device()`. TEST=Verified that coreboot.rom generated using timeless shows no change for all boards. Change-Id: I42e3f4b83c55f3479b95dbbd7a3721558c32b1c8 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/50868 Tested-by: build bot (Jenkins) Reviewed-by: Duncan Laurie Reviewed-by: Tim Wawrzynczak Reviewed-by: Angel Pons --- util/sconfig/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/sconfig/main.c b/util/sconfig/main.c index ca5389e50a..91407bcd08 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -1674,7 +1674,7 @@ static void update_device(struct device *base_dev, struct device *override_dev) * Update base_chip_instance member in chip instance of override tree to forward it to * the chip instance in base tree. */ - override_dev->chip_instance->base_chip_instance = base_dev->chip_instance; + override_dev->chip_instance->base_chip_instance = get_chip_instance(base_dev); /* * Now that the device properties are all copied over, look at each bus -- cgit v1.2.3