diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-16 09:21:48 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-16 09:21:48 +0200 |
| commit | f31b0aecb5435143ac1cd5cf2abab1f9ef6ba8ea (patch) | |
| tree | e41e5d1b64c49fae1de0b6bba62febaba05748cc /common | |
| parent | 0e19209767194a97cec6d93dba9e64d1da8d548e (diff) | |
| parent | ed4058afc85dc6341fea38cb240beb76296b0d24 (diff) | |
| download | u-boot-imx-f31b0aecb5435143ac1cd5cf2abab1f9ef6ba8ea.zip u-boot-imx-f31b0aecb5435143ac1cd5cf2abab1f9ef6ba8ea.tar.gz u-boot-imx-f31b0aecb5435143ac1cd5cf2abab1f9ef6ba8ea.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 8249dce..df1d038 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -924,16 +924,17 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, initrd_end = 0; } +#if defined(CONFIG_OF_LIBFDT) + #ifdef CFG_BOOTMAPSZ /* * The blob must be within CFG_BOOTMAPSZ, - * so we flag it to be copied if it is + * so we flag it to be copied if it is not. */ if (of_flat_tree >= (char *)CFG_BOOTMAPSZ) of_data = of_flat_tree; #endif -#if defined(CONFIG_OF_LIBFDT) /* move of_flat_tree if needed */ if (of_data) { int err; |