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/emulation/qemu-x86/Kconfig | 1 + src/mainboard/emulation/qemu-x86/romstage.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/mainboard/emulation/qemu-x86') diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig index c171309799..bf21acd5c2 100644 --- a/src/mainboard/emulation/qemu-x86/Kconfig +++ b/src/mainboard/emulation/qemu-x86/Kconfig @@ -10,6 +10,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES select HAVE_ACPI_RESUME select BOARD_ROMSIZE_KB_256 + select EARLY_CBMEM_INIT config MAINBOARD_DIR string diff --git a/src/mainboard/emulation/qemu-x86/romstage.c b/src/mainboard/emulation/qemu-x86/romstage.c index be14db9c17..5e6f4e5e87 100644 --- a/src/mainboard/emulation/qemu-x86/romstage.c +++ b/src/mainboard/emulation/qemu-x86/romstage.c @@ -49,12 +49,7 @@ void main(unsigned long bist) //print_pci_devices(); //dump_pci_devices(); -#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_COLLECT_TIMESTAMPS timestamp_init(rdtsc()); timestamp_add_now(TS_START_ROMSTAGE); -- cgit v1.2.3