summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm64/arm_tf.c4
-rw-r--r--src/arch/arm64/boot.c2
-rw-r--r--src/arch/riscv/boot.c2
-rw-r--r--src/arch/x86/boot.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c
index 6435fc74d5..1cb35ba3b5 100644
--- a/src/arch/arm64/arm_tf.c
+++ b/src/arch/arm64/arm_tf.c
@@ -44,7 +44,7 @@ void __attribute__((weak)) *soc_get_bl31_plat_params(bl31_params_t *params)
void arm_tf_run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr)
{
- struct prog bl31 = PROG_INIT(ASSET_BL31, CONFIG_CBFS_PREFIX"/bl31");
+ struct prog bl31 = PROG_INIT(PROG_BL31, CONFIG_CBFS_PREFIX"/bl31");
void (*bl31_entry)(bl31_params_t *params, void *plat_params) = NULL;
if (prog_locate(&bl31))
@@ -58,7 +58,7 @@ void arm_tf_run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr)
SET_PARAM_HEAD(&bl31_params, PARAM_BL31, VERSION_1, 0);
if (IS_ENABLED(CONFIG_ARM64_USE_SECURE_OS)) {
- struct prog bl32 = PROG_INIT(ASSET_BL32, CONFIG_CBFS_PREFIX"/secure_os");
+ struct prog bl32 = PROG_INIT(PROG_BL32, CONFIG_CBFS_PREFIX"/secure_os");
if (prog_locate(&bl32))
die("BL31 not found");
diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c
index c996d503f5..eea758c8e1 100644
--- a/src/arch/arm64/boot.c
+++ b/src/arch/arm64/boot.c
@@ -61,7 +61,7 @@ void arch_prog_run(struct prog *prog)
void (*doit)(void *);
void *arg;
- if (ENV_RAMSTAGE && prog_type(prog) == ASSET_PAYLOAD) {
+ if (ENV_RAMSTAGE && prog_type(prog) == PROG_PAYLOAD) {
run_payload(prog);
return;
}
diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c
index 39008e7b4d..552b3f4cd6 100644
--- a/src/arch/riscv/boot.c
+++ b/src/arch/riscv/boot.c
@@ -22,7 +22,7 @@ void arch_prog_run(struct prog *prog)
{
void (*doit)(void *) = prog_entry(prog);
- if (ENV_RAMSTAGE && prog_type(prog) == ASSET_PAYLOAD) {
+ if (ENV_RAMSTAGE && prog_type(prog) == PROG_PAYLOAD) {
initVirtualMemory();
write_csr(mepc, doit);
asm volatile("eret");
diff --git a/src/arch/x86/boot.c b/src/arch/x86/boot.c
index 7eb87fbef6..bf9a02bcc0 100644
--- a/src/arch/x86/boot.c
+++ b/src/arch/x86/boot.c
@@ -184,7 +184,7 @@ static void jmp_payload(void *entry, unsigned long buffer, unsigned long size)
static void try_payload(struct prog *prog)
{
- if (prog_type(prog) == ASSET_PAYLOAD) {
+ if (prog_type(prog) == PROG_PAYLOAD) {
if (IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE))
jmp_payload_no_bounce_buffer(prog_entry(prog));
else