diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-02-28 01:18:29 +0100 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-02-28 18:02:29 +0100 |
| commit | 1bc9efaf6500f2341ec83011e550a42ea68c3901 (patch) | |
| tree | 837b03c0c42a1ac0f9228ad5879ddb62d2f7942a /src/mainboard/google/parrot | |
| parent | f2e1f6a8628d4c13640688790be9550aa9839b34 (diff) | |
| download | coreboot-1bc9efaf6500f2341ec83011e550a42ea68c3901.tar.xz | |
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 <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2551
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/mainboard/google/parrot')
| -rw-r--r-- | src/mainboard/google/parrot/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/parrot/romstage.c | 5 |
2 files changed, 1 insertions, 5 deletions
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 |