GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

roda/rk9: Add EARLY_CBMEM_INIT 

Change-Id: I450f78cce7172fd2dee66dc81b4f33e07c1aff09
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4664
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-by: Aaron Durbin <adurbin@google.com>
This commit is contained in:
Kyösti Mälkki 2013-10-13 20:41:57 +03:00
parent a7c9611712
commit 886a543d60
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/roda/rk9/Kconfig
View File

@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_MP_TABLE
select CARDBUS_PLUGIN_SUPPORT
select HAVE_ACPI_TABLES
#select HAVE_ACPI_RESUME
select EC_ACPI
select EARLY_CBMEM_INIT
select HAVE_OPTION_TABLE
config MAINBOARD_DIR

4
src/mainboard/roda/rk9/romstage.c
View File

@ -123,6 +123,7 @@ void main(unsigned long bist)
{
sysinfo_t sysinfo;
int s3resume = 0;
int cbmem_initted;
u16 reg16;
/* basic northbridge setup, including MMCONF BAR */
@ -183,11 +184,12 @@ void main(unsigned long bist)
init_iommu();
cbmem_initted = !cbmem_initialize();
#if CONFIG_HAVE_ACPI_RESUME
/* If there is no high memory area, we didn't boot before, so
* this is not a resume. In that case we just create the cbmem toc.
*/
if (s3resume && cbmem_reinit() {
if (s3resume && cbmem_initted) {
void *resume_backup_memory = cbmem_find(CBMEM_ID_RESUME);
/* copy 1MB - 64K to high tables ram_base to prevent memory corruption