|
@@ -144,7 +144,7 @@ static int init_baud_rate(void)
|
|
|
|
|
|
static int display_text_info(void)
|
|
|
{
|
|
|
-#ifndef CONFIG_SANDBOX
|
|
|
+#if !defined(CONFIG_SANDBOX) && !defined(CONFIG_EFI_APP)
|
|
|
ulong bss_start, bss_end, text_base;
|
|
|
|
|
|
bss_start = (ulong)&__bss_start;
|
|
@@ -267,7 +267,7 @@ static int setup_mon_len(void)
|
|
|
{
|
|
|
#if defined(__ARM__) || defined(__MICROBLAZE__)
|
|
|
gd->mon_len = (ulong)&__bss_end - (ulong)_start;
|
|
|
-#elif defined(CONFIG_SANDBOX)
|
|
|
+#elif defined(CONFIG_SANDBOX) || defined(CONFIG_EFI_APP)
|
|
|
gd->mon_len = (ulong)&_end - (ulong)_init;
|
|
|
#elif defined(CONFIG_BLACKFIN) || defined(CONFIG_NIOS2)
|
|
|
gd->mon_len = CONFIG_SYS_MONITOR_LEN;
|
|
@@ -968,7 +968,8 @@ void board_init_f(ulong boot_flags)
|
|
|
if (initcall_run_list(init_sequence_f))
|
|
|
hang();
|
|
|
|
|
|
-#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX)
|
|
|
+#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \
|
|
|
+ !defined(CONFIG_EFI_APP)
|
|
|
/* NOTREACHED - jump_to_copy() does not return */
|
|
|
hang();
|
|
|
#endif
|