summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2013-10-11 22:08:02 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2013-10-14 17:16:22 +0200
commitf8bf5a10c599ef071998bbc3f16e9e3d7fcdb6eb (patch)
tree3366c799fd1f4a3b68598357d5f6288a22d5b37f /src/arch/x86
parentcf18c856aafaaa2a7e5eaebf64a2d5c647e590e8 (diff)
Revert "CBMEM: Always have early initialisation"
This reverts commit de1fe7f655c549e8dce5b34218221890fa5ccc34. While things appeared to work, there were actually invalid references to CAR storage after CAR was torn down on boards without EARLY_CBMEM_INIT. It was discussed use of CAR_GLOBAL should be restricted to boards that handle CAR migration properly. Change-Id: I9969d2ea79c334a7f95a0dbb7c78065720e6ccae Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/3968 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/boot/Makefile.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/x86/boot/Makefile.inc b/src/arch/x86/boot/Makefile.inc
index d3a5f2163c..4b4a841b4e 100644
--- a/src/arch/x86/boot/Makefile.inc
+++ b/src/arch/x86/boot/Makefile.inc
@@ -1,4 +1,5 @@
-romstage-y += cbmem.c
+romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c
+romstage-$(CONFIG_HAVE_ACPI_RESUME) += cbmem.c
ramstage-y += boot.c
ramstage-$(CONFIG_MULTIBOOT) += multiboot.c