From 9828882b43e83f1764e4324e1c4355141ef1a90e Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Tue, 2 Aug 2016 12:26:44 -0700 Subject: [PATCH] UPSTREAM: util/checklist: Concatinate optional list to complete list Don't require that the routines in the .optional file be listed in the .complete data file. Concatinate the two files when building the complete symbol list. TEST=Build and run on Galileo Gen2 BUG=None BRANCH=None Signed-off-by: Lee Leahy Reviewed-on: https://review.coreboot.org/16037 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth Change-Id: I596134e1a19311d357aa0d93cfb33c7ca9801e2e Reviewed-on: https://chromium-review.googlesource.com/368023 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- util/checklist/Makefile.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/checklist/Makefile.inc b/util/checklist/Makefile.inc index a96f252ae6..c1fd89cd34 100644 --- a/util/checklist/Makefile.inc +++ b/util/checklist/Makefile.inc @@ -98,11 +98,13 @@ ifeq ($(CONFIG_CREATE_BOARD_CHECKLIST),y) # %.expected: %.symbol_table cp $(CONFIG_CHECKLIST_DATA_FILE_LOCATION)/$(basename $(*F))_complete.dat $@.tmp + cat $(CONFIG_CHECKLIST_DATA_FILE_LOCATION)/$(basename $(*F))_optional.dat >> $@.tmp # If no separate verstage, combine verstage and romstage routines into a single list if [ "$(*F)" = "romstage" ]; then \ if [ ! -e $(*D)/verstage.elf ]; then \ if [ ! -e $(*D)/postcar.elf ]; then \ cat $(CONFIG_CHECKLIST_DATA_FILE_LOCATION)/verstage_complete.dat >> $@.tmp; \ + cat $(CONFIG_CHECKLIST_DATA_FILE_LOCATION)/verstage_optional.dat >> $@.tmp; \ fi; \ fi; \ fi