From 44443696afed62f074dab1468c270ab207f5bb69 Mon Sep 17 00:00:00 2001 From: Asami Doi Date: Fri, 12 Jul 2019 12:46:02 +0900 Subject: lib: Remove the BOOTBLOCK_CUSTOM compile guard This CL allows that everyone can use main() in lib/bootblock.c even if you select CONFIG_BOOTBLOCK_CUSTOM. I also rename main functions used in some soc/ to avoid the collision with the main function defined at lib/bootblock.c. Change-Id: I0575c9d1ce9dea9facfcc86760dff4deee9c1e29 Signed-off-by: Asami Doi Reviewed-on: https://review.coreboot.org/c/coreboot/+/34250 Reviewed-by: Julius Werner Tested-by: build bot (Jenkins) --- src/lib/Makefile.inc | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index f0738eef4e..3fad0b8fb6 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -32,10 +32,7 @@ decompressor-y += memcmp.c decompressor-y += prog_ops.c decompressor-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c -ifneq ($(CONFIG_BOOTBLOCK_CUSTOM),y) bootblock-y += bootblock.c -endif - bootblock-y += prog_loaders.c bootblock-y += prog_ops.c bootblock-y += cbfs.c -- cgit v1.2.3