diff options
author | Tom Rini <trini@konsulko.com> | 2019-11-01 09:34:35 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-11-01 09:34:35 -0400 |
commit | bb1bb4bb5df9df4d3f07e39a632daaff79e4b77e (patch) | |
tree | 1ed8d0b3622961997a32cd648d5d1bd3de7a855a /common/board_r.c | |
parent | 82679624f9aa6d1be733c46f3555d5166b6f5b72 (diff) | |
parent | d60ae4c59df55c08dc96202ff58fed21ab3afb7d (diff) | |
download | u-boot-bb1bb4bb5df9df4d3f07e39a632daaff79e4b77e.tar.gz |
Merge tag 'dm-pull-29oct19' of git://git.denx.de/u-boot-dm
- Fix for patman with email addresses containing commas
- Bootstage improvements for TPL, SPL
- Various sandbox and dm improvements and fixes
Diffstat (limited to 'common/board_r.c')
-rw-r--r-- | common/board_r.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c index d6fb5047a2..c1ecb06b74 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -670,7 +670,6 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_SYS_NONCACHED_MEMORY initr_noncached, #endif - bootstage_relocate, #ifdef CONFIG_OF_LIVE initr_of_live, #endif |