commit 8e1da4f139a409fad2086fb9456bfa836fba6c72
author Wedson Almeida Filho <wedsonaf@google.com> Sun Dec 16 16:34:48 2018 +0000
committer Wedson Almeida Filho <wedsonaf@google.com> Sun Dec 16 16:37:35 2018 +0000
tree 78ea87aa80becdaeb09ce55a62edbffbbde40676
parent f1aa19eba6b8160cac7b4c4f2368b2885df2621c

Use explicit page pool in page table manipulation.

Change-Id: Icb9eddf62011cf0e27a075c2eaf14d6718b068b6

aem_v8a_fvp/plat.c

diff --git a/aem_v8a_fvp/plat.c b/aem_v8a_fvp/plat.c
index 83615df..ad2cace 100644
--- a/aem_v8a_fvp/plat.c
+++ b/aem_v8a_fvp/plat.c
@@ -15,6 +15,7 @@
  */
 
 #include "hf/addr.h"
+#include "hf/mpool.h"
 
 paddr_t plat_get_fdt_addr(void)
 {
@@ -22,8 +23,10 @@
 	return pa_init(0x82000000);
 }
 
-void plat_get_initrd_range(paddr_t *begin, paddr_t *end)
+void plat_get_initrd_range(paddr_t *begin, paddr_t *end, struct mpool *ppool)
 {
+	(void)ppool;
+
 	/* initrd is loaded at a known address but...
 	 * TODO: the size is hardcoded */
 	*begin = pa_init(0x84000000);

qemu_aarch64/plat.c

diff --git a/qemu_aarch64/plat.c b/qemu_aarch64/plat.c
index 2ae2686..b9eb98f 100644
--- a/qemu_aarch64/plat.c
+++ b/qemu_aarch64/plat.c
@@ -26,13 +26,13 @@
 	return pa_init(plat_fdt_addr);
 }
 
-void plat_get_initrd_range(paddr_t *begin, paddr_t *end)
+void plat_get_initrd_range(paddr_t *begin, paddr_t *end, struct mpool *ppool)
 {
 	struct fdt_header *fdt;
 	struct fdt_node n;
 
 	/* Get the memory map from the FDT. */
-	fdt = fdt_map(plat_get_fdt_addr(), &n);
+	fdt = fdt_map(plat_get_fdt_addr(), &n, ppool);
 	if (!fdt) {
 		return;
 	}
@@ -45,7 +45,7 @@
 	fdt_find_initrd(&n, begin, end);
 
 out_unmap_fdt:
-	if (!fdt_unmap(fdt)) {
+	if (!fdt_unmap(fdt, ppool)) {
 		dlog("Unable to unmap fdt.");
 	}
 }