From f206cda84daef3bcc696c4593f8815a92a7319d1 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 17 May 2021 12:12:39 +0200 Subject: option: Introduce `CMOS_LAYOUT_FILE` Kconfig symbol Mainboards with variants may not always use the same cmos.layout file. Turn the hardcoded path into a Kconfig symbol to allow changing it. Tested with BUILD_TIMELESS=1: Without including the config file in the coreboot.rom and with `USE_OPTION_TABLE` selected, building for the Asus P8H61-M PRO produces an identical coreboot image. Change-Id: I4cc622dcb70855c06cb8a816c34406f8421180df Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/54366 Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) --- Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.inc') diff --git a/Makefile.inc b/Makefile.inc index da54e3b46e..eb505e553d 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -302,9 +302,9 @@ endef # arg1: source file # arg2: binary file name cbfs-files-processor-nvramtool= \ - $(eval $(2): $(1) $(src)/mainboard/$(MAINBOARDDIR)/cmos.layout | $(objutil)/nvramtool/nvramtool ; \ + $(eval $(2): $(1) $(top)/$(call strip_quotes,$(CONFIG_CMOS_LAYOUT_FILE)) | $(objutil)/nvramtool/nvramtool ; \ printf " CREATE $(2) (from $(1))\n"; \ - $(objutil)/nvramtool/nvramtool -y $(src)/mainboard/$(MAINBOARDDIR)/cmos.layout -D $(2).tmp -p $(1) && \ + $(objutil)/nvramtool/nvramtool -y $(top)/$(call strip_quotes,$(CONFIG_CMOS_LAYOUT_FILE)) -D $(2).tmp -p $(1) && \ mv $(2).tmp $(2)) ####################################################################### -- cgit v1.2.3