Move manifest to initrd
Supporting the manifest as part of FDT is problematic for testing
under the Android boot flow because it requires compiling and flashing
a different Hafnium image per test suite. Moving it back to the initrd
allows us to run different test suites against the same Hafnium image,
only by swapping the RAM disks.
Hafnium's one_time_init() routine will now expect to find the manifest
under "manifest.dtb".
Change-Id: Ifabffb50b06ffaba786046733d575adc9d43f4ad
diff --git a/src/boot_flow/common.c b/src/boot_flow/common.c
index 834f746..c256eac 100644
--- a/src/boot_flow/common.c
+++ b/src/boot_flow/common.c
@@ -22,8 +22,8 @@
/**
* Extract the boot parameters from the FDT and the boot-flow driver.
*/
-static bool boot_params_init(struct boot_params *p,
- const struct fdt_node *fdt_root)
+bool boot_flow_get_params(struct boot_params *p,
+ const struct fdt_node *fdt_root)
{
p->mem_ranges_count = 0;
p->kernel_arg = plat_boot_flow_get_kernel_arg();
@@ -35,32 +35,6 @@
}
/**
- * Parses information from FDT needed to initialize Hafnium.
- * FDT is mapped at the beginning and unmapped before exiting the function.
- */
-bool boot_flow_init(const struct fdt_node *fdt_root, struct manifest *manifest,
- struct boot_params *boot_params)
-{
- enum manifest_return_code manifest_ret;
-
- /* Get the memory map from the FDT. */
-
- manifest_ret = manifest_init(manifest, fdt_root);
- if (manifest_ret != MANIFEST_SUCCESS) {
- dlog("Could not parse manifest: %s.\n",
- manifest_strerror(manifest_ret));
- return false;
- }
-
- if (!boot_params_init(boot_params, fdt_root)) {
- dlog("Could not parse boot params.\n");
- return false;
- }
-
- return true;
-}
-
-/**
* Takes action on any updates that were generated.
*/
bool boot_flow_update(struct mm_stage1_locked stage1_locked,