summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorAsami Doi <d0iasm.pub@gmail.com>2019-07-12 12:46:02 +0900
committerJulius Werner <jwerner@chromium.org>2019-07-17 23:15:08 +0000
commit44443696afed62f074dab1468c270ab207f5bb69 (patch)
tree4770d5702134f49ae075ef1407b86812dbeb6bbd /src/lib
parent4593d66a20d6acc78ae81db384f7df5212766985 (diff)
downloadcoreboot-44443696afed62f074dab1468c270ab207f5bb69.tar.xz
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 <d0iasm.pub@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34250 Reviewed-by: Julius Werner <jwerner@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Makefile.inc3
1 files changed, 0 insertions, 3 deletions
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