summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-08-27 14:58:28 -0700
committerTom Rini <trini@ti.com>2012-09-27 11:20:28 -0700
commit4212098181ac91e14374c1207b1e98595f1cc717 (patch)
tree0e16048409b7e9b15a287994a665253555d1bdf9
parent1292eaf3530257e24c77979295892718662eda4b (diff)
downloadu-boot-imx-4212098181ac91e14374c1207b1e98595f1cc717.zip
u-boot-imx-4212098181ac91e14374c1207b1e98595f1cc717.tar.gz
u-boot-imx-4212098181ac91e14374c1207b1e98595f1cc717.tar.bz2
SPL: Rework how we inform about un-headered images
First, remove the puts from the case where we don't have an mkimage header as this is somewhat common and intentional for no-arg target images. Second, rework the final switch statement in board_init_r to, in the case of !CONFIG_SPL_OS_BOOT be only about doing debug prints about if we know what the magic is or not (the CONFIG_SPL_OS_BOOT case is unchanged). Then we call jump_to_image_no_args(). This gives us the same behavior as before but with slightly smaller code. Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--common/spl/spl.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 3aa0703..f2f6de7 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -102,7 +102,6 @@ void spl_parse_image_header(const struct image_header *header)
spl_image.name, spl_image.load_addr, spl_image.size);
} else {
/* Signature not found - assume u-boot.bin */
- puts("mkimage signature not found, assuming u-boot.bin ..\n");
debug("mkimage signature not found - ih_magic = %x\n",
header->ih_magic);
/* Let's assume U-Boot will not be more than 200 KB */
@@ -181,19 +180,17 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
switch (spl_image.os) {
case IH_OS_U_BOOT:
debug("Jumping to U-Boot\n");
- jump_to_image_no_args();
break;
#ifdef CONFIG_SPL_OS_BOOT
case IH_OS_LINUX:
debug("Jumping to Linux\n");
spl_board_prepare_for_linux();
jump_to_image_linux((void *)CONFIG_SYS_SPL_ARGS_ADDR);
- break;
#endif
default:
- puts("Unsupported OS image.. Jumping nevertheless..\n");
- jump_to_image_no_args();
+ debug("Unsupported OS image.. Jumping nevertheless..\n");
}
+ jump_to_image_no_args();
}
/*