[coreboot-gerrit] Patch merged into coreboot/master: 8a0a848 Dynamic cbmem: don't compile src/lib/cbmem.c when dynamic cbmem is selected.

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 8a0a8488fec6ee3b94e9f1416cc839a20e47573e
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Thu Jun 20 16:24:14 2013 +0200

    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:
      <adurbin> no. if you have CONFIG_DYNAMIC_CBMEM then cbmem.c shouldn't be compiled
      [...]
      <adurbin> +ifeq ($(CONFIG_EARLY_CBMEM_INIT),y)
      <adurbin> +ifneq ($(CONFIG_DYNAMIC_CBMEM),y) romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c
      <adurbin> +endif
      <adurbin> +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 <GNUtoo at no-log.org>
    Reviewed-on: http://review.coreboot.org/3503
    Reviewed-by: Aaron Durbin <adurbin at google.com>
    Tested-by: build bot (Jenkins)


See http://review.coreboot.org/3503 for details.

-gerrit