diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | common/init/board_init.c | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index 302d8beaf35..029cc0f2ce6 100644 --- a/common/Makefile +++ b/common/Makefile @@ -117,7 +117,7 @@ obj-$(CONFIG_IO_TRACE) += iotrace.o obj-y += memsize.o obj-y += stdio.o -obj-$(CONFIG_CMD_DTIMG) += image-android-dt.o +obj-$(CONFIG_CMD_ADTIMG) += image-android-dt.o ifdef CONFIG_CMD_EEPROM_LAYOUT obj-y += eeprom/eeprom_field.o eeprom/eeprom_layout.o diff --git a/common/init/board_init.c b/common/init/board_init.c index e52106966d4..3bc7994586c 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -19,6 +19,19 @@ __weak void arch_setup_gd(struct global_data *gd_ptr) #endif /* !CONFIG_X86 && !CONFIG_ARM */ /** + * This function is called from board_init_f_init_reserve to set up + * gd->start_addr_sp for stack protection if not already set otherwise + */ +__weak void board_init_f_init_stack_protection_addr(ulong base) +{ +#if CONFIG_IS_ENABLED(SYS_REPORT_STACK_F_USAGE) + /* set up stack pointer for stack usage if not set yet */ + if (!gd->start_addr_sp) + gd->start_addr_sp = base; +#endif +} + +/** * This function is called after the position of the initial stack is * determined in gd->start_addr_sp. Boards can override it to set up * stack-checking markers. @@ -129,6 +142,10 @@ void board_init_f_init_reserve(ulong base) #if !defined(CONFIG_ARM) arch_setup_gd(gd_ptr); #endif + + if (CONFIG_IS_ENABLED(SYS_REPORT_STACK_F_USAGE)) + board_init_f_init_stack_protection_addr(base); + /* next alloc will be higher by one GD plus 16-byte alignment */ base += roundup(sizeof(struct global_data), 16); |