projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spl: Set up the bloblist in board_init_r()
[oweals/u-boot.git]
/
common
/
spl
/
spl_onenand.c
diff --git
a/common/spl/spl_onenand.c
b/common/spl/spl_onenand.c
index 1a28a84e4407a252706a2a3eb4870dd72b39503f..ee30f328e6027e92a22f0b387b7aa326c467dbae 100644
(file)
--- a/
common/spl/spl_onenand.c
+++ b/
common/spl/spl_onenand.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2013
* ISEE 2007 SL - Enric Balletbo i Serra <eballetbo@iseebcn.com>
/*
* Copyright (C) 2013
* ISEE 2007 SL - Enric Balletbo i Serra <eballetbo@iseebcn.com>
@@
-5,8
+6,6
@@
* Based on common/spl/spl_nand.c
* Copyright (C) 2011
* Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
* Based on common/spl/spl_nand.c
* Copyright (C) 2011
* Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <config.h>
*/
#include <common.h>
#include <config.h>
@@
-14,23
+13,26
@@
#include <asm/io.h>
#include <onenand_uboot.h>
#include <asm/io.h>
#include <onenand_uboot.h>
-int spl_onenand_load_image(void)
+static int spl_onenand_load_image(struct spl_image_info *spl_image,
+ struct spl_boot_device *bootdev)
{
struct image_header *header;
int ret;
debug("spl: onenand\n");
{
struct image_header *header;
int ret;
debug("spl: onenand\n");
- /*use CONFIG_SYS_TEXT_BASE as temporary storage area */
- header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
+ header = spl_get_load_buffer(0, CONFIG_SYS_ONENAND_PAGE_SIZE);
/* Load u-boot */
onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
CONFIG_SYS_ONENAND_PAGE_SIZE, (void *)header);
/* Load u-boot */
onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
CONFIG_SYS_ONENAND_PAGE_SIZE, (void *)header);
- ret = spl_parse_image_header(header);
+ ret = spl_parse_image_header(
spl_image,
header);
if (ret)
return ret;
onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
if (ret)
return ret;
onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
- spl_image
.size, (void *)spl_image.
load_addr);
+ spl_image
->size, (void *)spl_image->
load_addr);
return 0;
}
return 0;
}
+/* Use priorty 1 so that Ubi can override this */
+SPL_LOAD_IMAGE_METHOD("OneNAND", 1, BOOT_DEVICE_ONENAND,
+ spl_onenand_load_image);