qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spl: Add a parameter to spl_set_header_raw_uboot() 

Rather than act on the global variable, pass the required struct in as a
parameter.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2016-09-24 18:19:52 -06:00 committed by Tom Rini
parent e50d76cc3c
commit d95ceb97c0
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/spl/spl.c
View File

@ -82,13 +82,13 @@ __weak void spl_board_prepare_for_boot(void)
/* Nothing to do! */ /* Nothing to do! */
} }
void spl_set_header_raw_uboot(void) void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
{ {
spl_image.size = CONFIG_SYS_MONITOR_LEN; spl_image->size = CONFIG_SYS_MONITOR_LEN;
spl_image.entry_point = CONFIG_SYS_UBOOT_START; spl_image->entry_point = CONFIG_SYS_UBOOT_START;
spl_image.load_addr = CONFIG_SYS_TEXT_BASE; spl_image->load_addr = CONFIG_SYS_TEXT_BASE;
spl_image.os = IH_OS_U_BOOT; spl_image->os = IH_OS_U_BOOT;
spl_image.name = "U-Boot"; spl_image->name = "U-Boot";
} }
int spl_parse_image_header(const struct image_header *header) int spl_parse_image_header(const struct image_header *header)
@ -153,7 +153,7 @@ int spl_parse_image_header(const struct image_header *header)
/* Signature not found - assume u-boot.bin */ /* Signature not found - assume u-boot.bin */
debug("mkimage signature not found - ih_magic = %x\n", debug("mkimage signature not found - ih_magic = %x\n",
header->ih_magic); header->ih_magic);
spl_set_header_raw_uboot(); spl_set_header_raw_uboot(&spl_image);
#endif #endif
} }
return 0; return 0;

2
common/spl/spl_nand.c
View File

@ -20,7 +20,7 @@ int spl_nand_load_image(void)
nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS, nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
CONFIG_SYS_NAND_U_BOOT_SIZE, CONFIG_SYS_NAND_U_BOOT_SIZE,
(void *)CONFIG_SYS_NAND_U_BOOT_DST); (void *)CONFIG_SYS_NAND_U_BOOT_DST);
spl_set_header_raw_uboot(); spl_set_header_raw_uboot(&spl_image);
nand_deselect(); nand_deselect();
return 0; return 0;

13
include/spl.h
View File

@ -67,7 +67,18 @@ extern struct spl_image_info spl_image;
void preloader_console_init(void); void preloader_console_init(void);
u32 spl_boot_device(void); u32 spl_boot_device(void);
u32 spl_boot_mode(const u32 boot_device); u32 spl_boot_mode(const u32 boot_device);
void spl_set_header_raw_uboot(void);
/**
* spl_set_header_raw_uboot() - Set up a standard SPL image structure
*
* This sets up the given spl_image which the standard values obtained from
* config options: CONFIG_SYS_MONITOR_LEN, CONFIG_SYS_UBOOT_START,
* CONFIG_SYS_TEXT_BASE.
*
* @spl_image: Image to set up
*/
void spl_set_header_raw_uboot(struct spl_image_info *spl_image);
int spl_parse_image_header(const struct image_header *header); int spl_parse_image_header(const struct image_header *header);
void spl_board_prepare_for_linux(void); void spl_board_prepare_for_linux(void);
void spl_board_prepare_for_boot(void); void spl_board_prepare_for_boot(void);