Load pvmfw as pVM firmware rather than bootloader.
Using the old memory layout for now.
Bug: 223166344
Test: Ran --unprotected-vm-with-firmware with patched crosvm.
Change-Id: I91d289828800e5e7eefffc00c964713153cc9ad5
diff --git a/pvmfw/idmap.S b/pvmfw/idmap.S
index f1df6cc..62555f9 100644
--- a/pvmfw/idmap.S
+++ b/pvmfw/idmap.S
@@ -39,12 +39,14 @@
idmap:
/* level 1 */
.quad .L_BLOCK_DEV | 0x0 // 1 GB of device mappings
- .quad .L_BLOCK_DEV | 0x40000000 // Another 1 GB of device mapppings
- .quad .L_TT_TYPE_TABLE + 0f // up to 1 GB of DRAM
+ .quad .L_TT_TYPE_TABLE + 0f // Unmapped device memory, and pVM firmware
+ .quad .L_TT_TYPE_TABLE + 1f // up to 1 GB of DRAM
.fill 509, 8, 0x0 // 509 GB of remaining VA space
/* level 2 */
-0: .quad .L_BLOCK_RO | 0x80000000 // DT provided by VMM
- .quad .L_BLOCK_MEM_XIP | 0x80200000 // 2 MB of DRAM containing image
- .quad .L_BLOCK_MEM | 0x80400000 // 2 MB of writable DRAM
+0: .fill 511, 8, 0x0
+ .quad .L_BLOCK_MEM_XIP | 0x7fe00000 // pVM firmware image
+1: .quad .L_BLOCK_RO | 0x80000000 // DT provided by VMM
+ .quad .L_BLOCK_RO | 0x80200000 // 2 MB of DRAM containing payload image
+ .quad .L_BLOCK_MEM | 0x80400000 // Writable memory for stack, heap &c.
.fill 509, 8, 0x0
diff --git a/pvmfw/image.ld b/pvmfw/image.ld
index 4655f68..e122c72 100644
--- a/pvmfw/image.ld
+++ b/pvmfw/image.ld
@@ -16,8 +16,8 @@
MEMORY
{
+ image : ORIGIN = 0x7fe00000, LENGTH = 2M
dtb_region : ORIGIN = 0x80000000, LENGTH = 2M
- image : ORIGIN = 0x80200000, LENGTH = 2M
writable_data : ORIGIN = 0x80400000, LENGTH = 2M
}