coreboot: dynamic cbmem requirement
Dynamic cbmem is now a requirement for relocatable ramstage. This patch replaces the reserve_* fields in the romstage_handoff structure by using the dynamic cbmem library. The haswell code is not moved over in this commit, but it should be safe because there is a hard requirement for DYNAMIC_CBMEM when using a reloctable ramstage. Change-Id: I59ab4552c3ae8c2c3982df458cd81a4a9b712cc2 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/2849 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
committed by
Stefan Reinauer
parent
24d1d4b472
commit
dd4a6d2357
@@ -31,7 +31,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <cbfs.h>
|
||||
#include <cbmem.h>
|
||||
#include <romstage_handoff.h>
|
||||
#if CONFIG_USE_OPTION_TABLE
|
||||
#include <option_table.h>
|
||||
#endif
|
||||
@@ -596,23 +595,6 @@ static void add_lb_reserved(struct lb_memory *mem)
|
||||
lb_add_rsvd_range, mem);
|
||||
}
|
||||
|
||||
static void add_romstage_resources(struct lb_memory *mem)
|
||||
{
|
||||
struct romstage_handoff *handoff;
|
||||
|
||||
/* Reserve memory requested to be reserved from romstage. */
|
||||
handoff = cbmem_find(CBMEM_ID_ROMSTAGE_INFO);
|
||||
|
||||
if (handoff == NULL)
|
||||
return;
|
||||
|
||||
if (handoff->reserve_size == 0)
|
||||
return;
|
||||
|
||||
lb_add_memory_range(mem, LB_MEM_RESERVED, handoff->reserve_base,
|
||||
handoff->reserve_size);
|
||||
}
|
||||
|
||||
unsigned long write_coreboot_table(
|
||||
unsigned long low_table_start, unsigned long low_table_end,
|
||||
unsigned long rom_table_start, unsigned long rom_table_end)
|
||||
@@ -686,8 +668,6 @@ unsigned long write_coreboot_table(
|
||||
/* Add reserved regions */
|
||||
add_lb_reserved(mem);
|
||||
|
||||
add_romstage_resources(mem);
|
||||
|
||||
lb_dump_memory_ranges(mem);
|
||||
|
||||
/* Note:
|
||||
|
Reference in New Issue
Block a user