Conditionally perform common relocation fixups
Add #ifdefs where necessary to not perform relocation fixups. This allows boards/architectures which support relocation to trim a decent chunk of code. Note that this patch doesn't add #ifdefs to architecture-specific code which does not support relocation. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
committed by
Wolfgang Denk
parent
3cbcfa70b1
commit
521af04d85
@@ -561,7 +561,6 @@ int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
/*******************************************************************/
|
||||
/* bootm - boot application image from image in memory */
|
||||
/*******************************************************************/
|
||||
static int relocated = 0;
|
||||
|
||||
int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
@@ -569,6 +568,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
ulong load_end = 0;
|
||||
int ret;
|
||||
boot_os_fn *boot_fn;
|
||||
#ifndef CONFIG_RELOC_FIXUP_WORKS
|
||||
static int relocated = 0;
|
||||
|
||||
/* relocate boot function table */
|
||||
if (!relocated) {
|
||||
@@ -578,6 +579,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
boot_os[i] += gd->reloc_off;
|
||||
relocated = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* determine if we have a sub command */
|
||||
if (argc > 1) {
|
||||
|
||||
Reference in New Issue
Block a user