summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-12-31 19:29:02 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-01-27 22:42:23 +0100
commit0a11a61395a71219c569367ff4a66a1d3605e60d (patch)
tree880a55c68b5800e3c77a2cd76b1a24461b8d8b99 /src/mainboard
parente45542580c1765720dbfbd8b4076296e442a211b (diff)
downloadcoreboot-0a11a61395a71219c569367ff4a66a1d3605e60d.tar.xz
CBMEM: Move cbmemc_reinit()
This replaces need for separate cbmemc_reinit() calls made via CAR_MIGRATE() and in ramstage. Change-Id: If7b4d855c75df58b173f26ef3c90a4a7563166d3 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/7859 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@google.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/nyan/romstage.c5
-rw-r--r--src/mainboard/google/nyan_big/romstage.c5
-rw-r--r--src/mainboard/google/nyan_blaze/romstage.c5
-rw-r--r--src/mainboard/via/epia-m850/romstage.c1
4 files changed, 0 insertions, 16 deletions
diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c
index 4e023654e7..749b87d0fd 100644
--- a/src/mainboard/google/nyan/romstage.c
+++ b/src/mainboard/google/nyan/romstage.c
@@ -25,7 +25,6 @@
#include <device/device.h>
#include <cbfs.h>
#include <cbmem.h>
-#include <console/cbmem_console.h>
#include <console/console.h>
#include <mainboard/google/nyan/reset.h>
#include <romstage_handoff.h>
@@ -224,10 +223,6 @@ static void __attribute__((noinline)) romstage(void)
configure_ec_spi_bus();
configure_tpm_i2c_bus();
-#if CONFIG_CONSOLE_CBMEM
- cbmemc_reinit();
-#endif
-
vboot_verify_firmware(romstage_handoff_find_or_add());
timestamp_add(TS_START_COPYRAM, timestamp_get());
diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c
index 4e023654e7..749b87d0fd 100644
--- a/src/mainboard/google/nyan_big/romstage.c
+++ b/src/mainboard/google/nyan_big/romstage.c
@@ -25,7 +25,6 @@
#include <device/device.h>
#include <cbfs.h>
#include <cbmem.h>
-#include <console/cbmem_console.h>
#include <console/console.h>
#include <mainboard/google/nyan/reset.h>
#include <romstage_handoff.h>
@@ -224,10 +223,6 @@ static void __attribute__((noinline)) romstage(void)
configure_ec_spi_bus();
configure_tpm_i2c_bus();
-#if CONFIG_CONSOLE_CBMEM
- cbmemc_reinit();
-#endif
-
vboot_verify_firmware(romstage_handoff_find_or_add());
timestamp_add(TS_START_COPYRAM, timestamp_get());
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index 480abd640d..a23937efac 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -25,7 +25,6 @@
#include <device/device.h>
#include <cbfs.h>
#include <cbmem.h>
-#include <console/cbmem_console.h>
#include <console/console.h>
#include <mainboard/google/nyan/reset.h>
#include <romstage_handoff.h>
@@ -224,10 +223,6 @@ static void __attribute__((noinline)) romstage(void)
configure_ec_spi_bus();
configure_tpm_i2c_bus();
-#if CONFIG_CONSOLE_CBMEM
- cbmemc_reinit();
-#endif
-
#if CONFIG_VBOOT2_VERIFY_FIRMWARE
// vboot_create_handoff((void *)CONFIG_VBOOT_WORK_BUFFER_ADDRESS);
#else
diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c
index b6e36354c6..8912d13429 100644
--- a/src/mainboard/via/epia-m850/romstage.c
+++ b/src/mainboard/via/epia-m850/romstage.c
@@ -31,7 +31,6 @@
#include <cpu/x86/bist.h>
#include <string.h>
#include <timestamp.h>
-#include <console/cbmem_console.h>
#include <northbridge/via/vx900/early_vx900.h>
#include <northbridge/via/vx900/raminit.h>