diff options
author | Tom Rini <trini@konsulko.com> | 2019-03-22 19:09:58 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-03-22 19:09:58 -0400 |
commit | cfb3e102c4bdf96a41cbd3eeb1d3a9a56c69c46c (patch) | |
tree | 5951f299b8b05cb6011deb8522a8b883a5d260e2 /board/ti/am57xx/board.c | |
parent | 7b80644e271544848db90fb0407d67b3e3749a8e (diff) | |
parent | 2e7365518acdb8fb6e9be332c8a6c57b457188d9 (diff) | |
download | u-boot-cfb3e102c4bdf96a41cbd3eeb1d3a9a56c69c46c.tar.gz |
Merge branch '2019-03-22-master-imports'
- Don't attempt to write to ext4 volumes with the metadata_csum feature
we don't support
- Correct how we build dtb files.
- Fix regression on SPL_FIT with FIT_IMAGE_TINY
- Minor TI platform fixes
Diffstat (limited to 'board/ti/am57xx/board.c')
-rw-r--r-- | board/ti/am57xx/board.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 7063345dcc..1a903f13a6 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -1096,6 +1096,16 @@ int board_fit_config_name_match(const char *name) } #endif +#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) +int fastboot_set_reboot_flag(void) +{ + printf("Setting reboot to fastboot flag ...\n"); + env_set("dofastboot", "1"); + env_save(); + return 0; +} +#endif + #ifdef CONFIG_TI_SECURE_DEVICE void board_fit_image_post_process(void **p_image, size_t *p_size) { @@ -1107,15 +1117,5 @@ void board_tee_image_process(ulong tee_image, size_t tee_size) secure_tee_install((u32)tee_image); } -#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) -int fastboot_set_reboot_flag(void) -{ - printf("Setting reboot to fastboot flag ...\n"); - env_set("dofastboot", "1"); - env_save(); - return 0; -} -#endif - U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_TEE, board_tee_image_process); #endif |