commit 8d3b84c0c4a0afa9d971111e4ff886d75f11efbf
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 07 19:03:16 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 07 19:03:16 2024 +0000
tree cd348c37adb74ed208767a939e31451886a27c0b
parent 30ce1a3095126b481a65618431ba4cc63b75ea6f
parent 0b7e03e424b6f0f30941b54282574205981eca8c

Merge "rialto: Remove early ID-mapping for DTB" into main am: 0b7e03e424

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3208356

Change-Id: I62063e1a6719e2cf3daf36ca869bd6d9ccd805d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

guest/rialto/idmap.S

diff --git a/guest/rialto/idmap.S b/guest/rialto/idmap.S
index 7281d9b..9b5375a 100644
--- a/guest/rialto/idmap.S
+++ b/guest/rialto/idmap.S
@@ -28,7 +28,6 @@
 .set .PAGE_SIZE, .SZ_4K
 
 .set .ORIGIN_ADDR, 2 * .SZ_1G
-.set .DTB_ADDR, .ORIGIN_ADDR + (0 * .SZ_2M)
 .set .TEXT_ADDR, .ORIGIN_ADDR + (1 * .SZ_2M)
 .set .DATA_ADDR, .ORIGIN_ADDR + (2 * .SZ_2M)
 
@@ -60,7 +59,7 @@
 	.balign .PAGE_SIZE, 0				// unmapped
 
 	/* level 2 */
-0:	.quad		.L_BLOCK_RO  | .DTB_ADDR	// DT provided by VMM
+0:	.quad		0x0				// 2 MiB unmapped
 	.quad		.L_BLOCK_MEM_XIP | .TEXT_ADDR	// 2 MiB of DRAM containing image
 	.quad		.L_BLOCK_MEM | .DATA_ADDR	// 2 MiB of writable DRAM
 	.balign .PAGE_SIZE, 0				// unmapped