Move boot params update to the boot_flow module.
Not all boot flows want to be doing updates so leave that decision to
the module responsible for coordinating the boot details.
Change-Id: Ia769f99e2221f12c79a364c3ad323c31d39c98f3
diff --git a/inc/hf/boot_flow.h b/inc/hf/boot_flow.h
index e96ad1b..2517fdf 100644
--- a/inc/hf/boot_flow.h
+++ b/inc/hf/boot_flow.h
@@ -23,3 +23,6 @@
bool boot_flow_init(struct mm_stage1_locked stage1_locked,
struct manifest *manifest, struct boot_params *boot_params,
struct mpool *ppool);
+
+bool boot_flow_update(struct mm_stage1_locked stage1_locked,
+ struct boot_params_update *p, struct mpool *ppool);
diff --git a/inc/hf/boot_params.h b/inc/hf/boot_params.h
index 59b62d5..a55ee73 100644
--- a/inc/hf/boot_params.h
+++ b/inc/hf/boot_params.h
@@ -47,7 +47,3 @@
paddr_t initrd_begin;
paddr_t initrd_end;
};
-
-bool boot_params_init(struct boot_params *p, const struct fdt_node *fdt_root);
-bool boot_params_patch_fdt(struct mm_stage1_locked stage1_locked,
- struct boot_params_update *p, struct mpool *ppool);
diff --git a/inc/hf/plat/boot_flow.h b/inc/hf/plat/boot_flow.h
index daaf5a6..b404394 100644
--- a/inc/hf/plat/boot_flow.h
+++ b/inc/hf/plat/boot_flow.h
@@ -17,9 +17,13 @@
#pragma once
#include "hf/addr.h"
+#include "hf/boot_params.h"
#include "hf/fdt.h"
+#include "hf/mm.h"
-paddr_t plat_get_fdt_addr(void);
-uintreg_t plat_get_kernel_arg(void);
-bool plat_get_initrd_range(const struct fdt_node *fdt_root, paddr_t *begin,
- paddr_t *end);
+paddr_t plat_boot_flow_get_fdt_addr(void);
+uintreg_t plat_boot_flow_get_kernel_arg(void);
+bool plat_boot_flow_get_initrd_range(const struct fdt_node *fdt_root,
+ paddr_t *begin, paddr_t *end);
+bool plat_boot_flow_update(struct mm_stage1_locked stage1_locked,
+ struct boot_params_update *p, struct mpool *ppool);