diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-16 14:50:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-16 14:50:03 -0500 |
| commit | 35065cdd94a41dee4882b921f9763742e44d1c58 (patch) | |
| tree | aaa4a4ecdad344cb50427eb79f3a91c3311b2d3f /common | |
| parent | 52bc7c7e2b31d6ba8d394f3d22b551abfa365363 (diff) | |
| parent | 47b4c228b5ae72598dc38ca2764c11ea1c6693cc (diff) | |
| download | u-boot-35065cdd94a41dee4882b921f9763742e44d1c58.zip u-boot-35065cdd94a41dee4882b921f9763742e44d1c58.tar.gz u-boot-35065cdd94a41dee4882b921f9763742e44d1c58.tar.bz2 | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 7a393dc..6e6dee7 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -452,7 +452,7 @@ ulong spl_relocate_stack_gd(void) #ifdef CONFIG_SPL_SYS_MALLOC_SIMPLE if (CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN) { if (!(gd->flags & GD_FLG_SPL_INIT)) - panic("spl_init must be called before heap reloc"); + panic_str("spl_init must be called before heap reloc"); ptr -= CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN; gd->malloc_base = ptr; |