commit 0b7e03e424b6f0f30941b54282574205981eca8c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 07 18:26:03 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 07 18:26:03 2024 +0000
tree cd348c37adb74ed208767a939e31451886a27c0b
parent dcbac1e541b7b0441e9895f85675e8c254392c3e
parent 374cd8dc0c7b23d01faef15788acf756b3cb1916

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

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