Ting Shen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31123
Change subject: bootmem: add new memory type for BL31 ......................................................................
bootmem: add new memory type for BL31
Change-Id: Idbd9a7fe4b12af23de1519892936d8d88a000e2c Signed-off-by: Ting Shen phoenixshen@google.com --- M src/arch/arm64/arm_tf.c M src/include/bootmem.h M src/lib/bootmem.c 3 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/31123/1
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c index b74f7be..3f1aa2a 100644 --- a/src/arch/arm64/arm_tf.c +++ b/src/arch/arm64/arm_tf.c @@ -50,7 +50,7 @@ if (prog_locate(&bl31)) die("BL31 not found");
- if (!selfload_check(&bl31, BM_MEM_RESERVED)) + if (!selfload_check(&bl31, BM_MEM_BL31)) die("BL31 load failed"); bl31_entry = prog_entry(&bl31);
diff --git a/src/include/bootmem.h b/src/include/bootmem.h index fb67b13..0e6ba50 100644 --- a/src/include/bootmem.h +++ b/src/include/bootmem.h @@ -37,6 +37,7 @@ BM_MEM_NVS, /* ACPI NVS Memory */ BM_MEM_UNUSABLE, /* Unusable address space */ BM_MEM_VENDOR_RSVD, /* Vendor Reserved */ + BM_MEM_BL31, /* BL31 exectuable */ BM_MEM_TABLE, /* Ram configuration tables are kept in */ /* Tags below this point are ignored for the OS table. */ BM_MEM_OS_CUTOFF = BM_MEM_TABLE, @@ -53,6 +54,7 @@ * Bootmem types match to LB_MEM tags, except for the following: * BM_MEM_RAMSTAGE : Translates to LB_MEM_RAM. * BM_MEM_PAYLOAD : Translates to LB_MEM_RAM. + * BM_MEM_BL31 : Translates to LB_MEM_RESERVED. */ void bootmem_write_memory_table(struct lb_memory *mem);
diff --git a/src/lib/bootmem.c b/src/lib/bootmem.c index a7b7dd9..7fa6855 100644 --- a/src/lib/bootmem.c +++ b/src/lib/bootmem.c @@ -59,6 +59,8 @@ return LB_MEM_UNUSABLE; case BM_MEM_VENDOR_RSVD: return LB_MEM_VENDOR_RSVD; + case BM_MEM_BL31: + return LB_MEM_RESERVED; case BM_MEM_TABLE: return LB_MEM_TABLE; default: