From 1bc9efaf6500f2341ec83011e550a42ea68c3901 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 28 Feb 2013 01:18:29 +0100 Subject: CBMEM: always initialize early if the board supports it This allows to drop some special cases in romstage.c Change-Id: I53fdfcd1bb6ec21a5280afa07a40e3f0cba11c5d Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/2551 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel --- src/mainboard/google/parrot/Kconfig | 1 + src/mainboard/google/parrot/romstage.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/mainboard/google/parrot') diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index e1410335f8..96f1b4f4aa 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select GFXUMA select CHROMEOS select EXTERNAL_MRC_BLOB + select EARLY_CBMEM_INIT # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c index 58c3881f40..110c398857 100644 --- a/src/mainboard/google/parrot/romstage.c +++ b/src/mainboard/google/parrot/romstage.c @@ -258,12 +258,7 @@ void main(unsigned long bist) post_code(0x3e); MCHBAR16(SSKPD) = 0xCAFE; -#if CONFIG_EARLY_CBMEM_INIT cbmem_was_initted = !cbmem_initialize(); -#else - cbmem_was_initted = cbmem_reinit((uint64_t) (get_top_of_ram() - - HIGH_MEMORY_SIZE)); -#endif #if CONFIG_HAVE_ACPI_RESUME /* If there is no high memory area, we didn't boot before, so -- cgit v1.2.3