From 8a0a8488fec6ee3b94e9f1416cc839a20e47573e Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Thu, 20 Jun 2013 16:24:14 +0200 Subject: Dynamic cbmem: don't compile src/lib/cbmem.c when dynamic cbmem is selected. src/lib/cbmem.c is for the static cbmem. Thanks to adurbin for the Makefile.inc pointer and code on #coreboot IRC channel on freenode: no. if you have CONFIG_DYNAMIC_CBMEM then cbmem.c shouldn't be compiled [...] +ifeq ($(CONFIG_EARLY_CBMEM_INIT),y) +ifneq ($(CONFIG_DYNAMIC_CBMEM),y) romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c +endif +endif Without that fix we have: src/lib/cbmem.c:58:43: error: no previous prototype for 'get_cbmem_toc' [-Werror=missing-prototypes] src/lib/cbmem.c:76:6: error: no previous prototype for 'cbmem_init' [-Werror=missing-prototypes] src/lib/cbmem.c:107:5: error: no previous prototype for 'cbmem_reinit' [-Werror=missing-prototypes] This commit was tested on qemu-i440fx with the following commit: qemu-i440fx: Make it compile with CONFIG_DYNAMIC_CBMEM ( http://review.coreboot.org/#/c/3504/ ). Change-Id: I98636aad4bb4b954f3ed3957df67c77f3615964a Signed-off-by: Denis 'GNUtoo' Carikli Reviewed-on: http://review.coreboot.org/3503 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/lib/Makefile.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/lib/Makefile.inc') diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 2600aa50f9..d44f4a73e0 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -50,7 +50,11 @@ romstage-$(CONFIG_USBDEBUG) += usbdebug.c romstage-$(CONFIG_SPKMODEM) += spkmodem.c romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c + +ifneq ($(CONFIG_DYNAMIC_CBMEM),y) romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c +endif + romstage-y += compute_ip_checksum.c romstage-y += memmove.c romstage-$(CONFIG_ARCH_X86) += gcc.c -- cgit v1.2.3