summaryrefslogtreecommitdiff
path: root/bl2/bl2_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'bl2/bl2_main.c')
-rw-r--r--bl2/bl2_main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c
index 73781dd0..c8fd683c 100644
--- a/bl2/bl2_main.c
+++ b/bl2/bl2_main.c
@@ -169,7 +169,7 @@ static int load_bl32(bl31_params_t *bl2_to_bl31_params)
return e;
}
-#ifndef BL33_BASE
+#ifndef PRELOADED_BL33_BASE
/*******************************************************************************
* Load the BL33 image.
* The bl2_to_bl31_params param will be updated with the relevant BL33
@@ -200,7 +200,7 @@ static int load_bl33(bl31_params_t *bl2_to_bl31_params)
return e;
}
-#endif /* BL33_BASE */
+#endif /* PRELOADED_BL33_BASE */
#endif /* EL3_PAYLOAD_BASE */
@@ -277,13 +277,13 @@ void bl2_main(void)
}
}
-#ifdef BL33_BASE
+#ifdef PRELOADED_BL33_BASE
/*
* In this case, don't load the BL33 image as it's already loaded in
* memory. Update BL33 entrypoint information.
*/
INFO("BL2: Populating the entrypoint info for the preloaded BL33\n");
- bl2_to_bl31_params->bl33_ep_info->pc = BL33_BASE;
+ bl2_to_bl31_params->bl33_ep_info->pc = PRELOADED_BL33_BASE;
bl2_plat_set_bl33_ep_info(NULL, bl2_to_bl31_params->bl33_ep_info);
#else
e = load_bl33(bl2_to_bl31_params);
@@ -291,7 +291,7 @@ void bl2_main(void)
ERROR("Failed to load BL33 (%i)\n", e);
plat_error_handler(e);
}
-#endif /* BL33_BASE */
+#endif /* PRELOADED_BL33_BASE */
#endif /* EL3_PAYLOAD_BASE */