2018-05-06 21:58:06 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
2011-07-21 13:10:21 +00:00
|
|
|
/*
|
|
|
|
* (C) Copyright 2010
|
|
|
|
* Texas Instruments, <www.ti.com>
|
|
|
|
*
|
|
|
|
* Aneesh V <aneesh@ti.com>
|
|
|
|
*/
|
2017-06-30 17:02:53 +00:00
|
|
|
|
2011-07-21 13:10:21 +00:00
|
|
|
#include <common.h>
|
2018-11-16 01:43:51 +00:00
|
|
|
#include <bloblist.h>
|
2017-11-14 01:55:03 +00:00
|
|
|
#include <binman_sym.h>
|
2014-11-11 00:16:46 +00:00
|
|
|
#include <dm.h>
|
2018-11-16 01:44:09 +00:00
|
|
|
#include <handoff.h>
|
2012-08-13 19:03:19 +00:00
|
|
|
#include <spl.h>
|
2011-07-21 13:10:21 +00:00
|
|
|
#include <asm/u-boot.h>
|
2011-09-14 19:29:26 +00:00
|
|
|
#include <nand.h>
|
2011-07-21 13:10:27 +00:00
|
|
|
#include <fat.h>
|
Move timestamp and version files into 'generated' subdir
There is a rather subtle build problem where the build time stamp is not
updated for out-of-tree builds if there exists an in-tree build which
has a valid timestamp file. So if you do an in-tree build, then an
out-of-tree build your timestamp will not change.
The correct timestamp_autogenerated.h lives in the object tree, but it
is not always found there. The source still lives in the source tree and
when compiling version.h, it includes timestamp_autogenerated.h. Since
the current directory is always searched first, this will come from the
source tree rather than the object tree if it exists there. This affects
dependency generation also, which means that common/cmd_version.o will not
even be rebuilt if you have ever done an in-tree build.
A similar problem exists with the version file.
This change moves both files into the 'generated' subdir, which is already
used for asm-offsets.h. Then timestamp.h and version.h are updated to
include the files from there.
There are other places where these generated files are included, but I
cannot see why these don't just use the timestamp.h and version.h headers.
So this change also tidies that up.
I have tested this with in- and out-of-tree builds, but not SPL. I have
looked at various other options for fixing this, including sed on the dep
files, -I- and -include flags to gcc, but I don't think they can be made
to work. Comments welcome.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
2011-10-10 08:55:19 +00:00
|
|
|
#include <version.h>
|
2011-07-21 13:10:27 +00:00
|
|
|
#include <image.h>
|
2011-10-21 16:29:34 +00:00
|
|
|
#include <malloc.h>
|
2014-11-11 00:16:46 +00:00
|
|
|
#include <dm/root.h>
|
2012-01-04 15:26:24 +00:00
|
|
|
#include <linux/compiler.h>
|
2017-04-18 11:57:27 +00:00
|
|
|
#include <fdt_support.h>
|
2018-05-02 14:10:54 +00:00
|
|
|
#include <bootcount.h>
|
2011-07-21 13:10:21 +00:00
|
|
|
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
2012-08-28 08:50:59 +00:00
|
|
|
#ifndef CONFIG_SYS_UBOOT_START
|
|
|
|
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
|
|
|
|
#endif
|
2012-08-23 10:46:16 +00:00
|
|
|
#ifndef CONFIG_SYS_MONITOR_LEN
|
2014-10-25 00:54:55 +00:00
|
|
|
/* Unknown U-Boot size, let's assume it will not be more than 200 KB */
|
2012-08-23 10:46:16 +00:00
|
|
|
#define CONFIG_SYS_MONITOR_LEN (200 * 1024)
|
|
|
|
#endif
|
|
|
|
|
2012-08-13 19:03:19 +00:00
|
|
|
u32 *boot_params_ptr = NULL;
|
2011-09-14 19:33:34 +00:00
|
|
|
|
2017-11-14 01:55:03 +00:00
|
|
|
/* See spl.h for information about this */
|
2018-08-01 21:22:42 +00:00
|
|
|
binman_sym_declare(ulong, u_boot_any, image_pos);
|
2017-11-14 01:55:03 +00:00
|
|
|
|
2012-08-22 22:31:05 +00:00
|
|
|
/* Define board data structure */
|
2011-07-21 13:10:21 +00:00
|
|
|
static bd_t bdata __attribute__ ((section(".data")));
|
|
|
|
|
2016-06-07 06:31:20 +00:00
|
|
|
/*
|
|
|
|
* Board-specific Platform code can reimplement show_boot_progress () if needed
|
|
|
|
*/
|
|
|
|
__weak void show_boot_progress(int val) {}
|
|
|
|
|
2018-11-16 01:44:09 +00:00
|
|
|
#if defined(CONFIG_SPL_OS_BOOT) || CONFIG_IS_ENABLED(HANDOFF)
|
|
|
|
/* weak, default platform-specific function to initialize dram banks */
|
|
|
|
__weak int dram_init_banksize(void)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-03-15 04:01:38 +00:00
|
|
|
/*
|
|
|
|
* Default function to determine if u-boot or the OS should
|
|
|
|
* be started. This implementation always returns 1.
|
|
|
|
*
|
|
|
|
* Please implement your own board specific funcion to do this.
|
|
|
|
*
|
|
|
|
* RETURN
|
|
|
|
* 0 to not start u-boot
|
|
|
|
* positive if u-boot should start
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_SPL_OS_BOOT
|
|
|
|
__weak int spl_start_uboot(void)
|
|
|
|
{
|
2018-11-16 01:43:56 +00:00
|
|
|
puts(SPL_TPL_PROMPT
|
|
|
|
"Please implement spl_start_uboot() for your board\n");
|
|
|
|
puts(SPL_TPL_PROMPT "Direct Linux boot not active!\n");
|
2012-03-15 04:01:38 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2016-07-12 18:28:14 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Weak default function for arch specific zImage check. Return zero
|
|
|
|
* and fill start and end address if image is recognized.
|
|
|
|
*/
|
|
|
|
int __weak bootz_setup(ulong image, ulong *start, ulong *end)
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
2012-03-15 04:01:38 +00:00
|
|
|
#endif
|
|
|
|
|
2018-05-24 15:15:50 +00:00
|
|
|
/* Weak default function for arch/board-specific fixups to the spl_image_info */
|
|
|
|
void __weak spl_perform_fixups(struct spl_image_info *spl_image)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2017-04-18 11:57:27 +00:00
|
|
|
void spl_fixup_fdt(void)
|
|
|
|
{
|
|
|
|
#if defined(CONFIG_SPL_OF_LIBFDT) && defined(CONFIG_SYS_SPL_ARGS_ADDR)
|
|
|
|
void *fdt_blob = (void *)CONFIG_SYS_SPL_ARGS_ADDR;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = fdt_check_header(fdt_blob);
|
|
|
|
if (err < 0) {
|
|
|
|
printf("fdt_root: %s\n", fdt_strerror(err));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* fixup the memory dt node */
|
|
|
|
err = fdt_shrink_to_minimum(fdt_blob, 0);
|
|
|
|
if (err == 0) {
|
2018-11-16 01:43:56 +00:00
|
|
|
printf(SPL_TPL_PROMPT "fdt_shrink_to_minimum err - %d\n", err);
|
2017-04-18 11:57:27 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = arch_fixup_fdt(fdt_blob);
|
|
|
|
if (err) {
|
2018-11-16 01:43:56 +00:00
|
|
|
printf(SPL_TPL_PROMPT "arch_fixup_fdt err - %d\n", err);
|
2017-04-18 11:57:27 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2012-08-23 06:34:21 +00:00
|
|
|
/*
|
|
|
|
* Weak default function for board specific cleanup/preparation before
|
|
|
|
* Linux boot. Some boards/platforms might not need it, so just provide
|
|
|
|
* an empty stub here.
|
|
|
|
*/
|
|
|
|
__weak void spl_board_prepare_for_linux(void)
|
|
|
|
{
|
|
|
|
/* Nothing to do! */
|
|
|
|
}
|
|
|
|
|
2016-05-10 05:54:20 +00:00
|
|
|
__weak void spl_board_prepare_for_boot(void)
|
|
|
|
{
|
|
|
|
/* Nothing to do! */
|
|
|
|
}
|
|
|
|
|
2018-08-14 09:27:02 +00:00
|
|
|
__weak struct image_header *spl_get_load_buffer(ssize_t offset, size_t size)
|
|
|
|
{
|
|
|
|
return (struct image_header *)(CONFIG_SYS_TEXT_BASE + offset);
|
|
|
|
}
|
|
|
|
|
2016-09-25 00:19:52 +00:00
|
|
|
void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
|
2014-10-31 07:31:00 +00:00
|
|
|
{
|
2018-08-01 21:22:42 +00:00
|
|
|
ulong u_boot_pos = binman_sym(ulong, u_boot_any, image_pos);
|
2017-11-14 01:55:03 +00:00
|
|
|
|
2016-09-25 00:19:52 +00:00
|
|
|
spl_image->size = CONFIG_SYS_MONITOR_LEN;
|
2018-02-28 19:51:43 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Binman error cases: address of the end of the previous region or the
|
|
|
|
* start of the image's entry area (usually 0) if there is no previous
|
|
|
|
* region.
|
|
|
|
*/
|
|
|
|
if (u_boot_pos && u_boot_pos != BINMAN_SYM_MISSING) {
|
|
|
|
/* Binman does not support separated entry addresses */
|
2017-11-14 01:55:03 +00:00
|
|
|
spl_image->entry_point = u_boot_pos;
|
|
|
|
spl_image->load_addr = u_boot_pos;
|
|
|
|
} else {
|
|
|
|
spl_image->entry_point = CONFIG_SYS_UBOOT_START;
|
|
|
|
spl_image->load_addr = CONFIG_SYS_TEXT_BASE;
|
|
|
|
}
|
2016-09-25 00:19:52 +00:00
|
|
|
spl_image->os = IH_OS_U_BOOT;
|
|
|
|
spl_image->name = "U-Boot";
|
2014-10-31 07:31:00 +00:00
|
|
|
}
|
|
|
|
|
2018-05-12 22:23:17 +00:00
|
|
|
#ifdef CONFIG_SPL_LOAD_FIT_FULL
|
|
|
|
/* Parse and load full fitImage in SPL */
|
|
|
|
static int spl_load_fit_image(struct spl_image_info *spl_image,
|
|
|
|
const struct image_header *header)
|
|
|
|
{
|
|
|
|
bootm_headers_t images;
|
|
|
|
const char *fit_uname_config = NULL;
|
|
|
|
const char *fit_uname_fdt = FIT_FDT_PROP;
|
|
|
|
const char *uname;
|
|
|
|
ulong fw_data = 0, dt_data = 0, img_data = 0;
|
|
|
|
ulong fw_len = 0, dt_len = 0, img_len = 0;
|
|
|
|
int idx, conf_noffset;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
#ifdef CONFIG_SPL_FIT_SIGNATURE
|
|
|
|
images.verify = 1;
|
|
|
|
#endif
|
|
|
|
ret = fit_image_load(&images, (ulong)header,
|
|
|
|
NULL, &fit_uname_config,
|
|
|
|
IH_ARCH_DEFAULT, IH_TYPE_STANDALONE, -1,
|
|
|
|
FIT_LOAD_REQUIRED, &fw_data, &fw_len);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
spl_image->size = fw_len;
|
|
|
|
spl_image->entry_point = fw_data;
|
|
|
|
spl_image->load_addr = fw_data;
|
|
|
|
spl_image->os = IH_OS_U_BOOT;
|
|
|
|
spl_image->name = "U-Boot";
|
|
|
|
|
2018-11-16 01:43:56 +00:00
|
|
|
debug(SPL_TPL_PROMPT "payload image: %32s load addr: 0x%lx size: %d\n",
|
2018-11-02 20:49:52 +00:00
|
|
|
spl_image->name, spl_image->load_addr, spl_image->size);
|
2018-05-12 22:23:17 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_SPL_FIT_SIGNATURE
|
|
|
|
images.verify = 1;
|
|
|
|
#endif
|
|
|
|
fit_image_load(&images, (ulong)header,
|
|
|
|
&fit_uname_fdt, &fit_uname_config,
|
|
|
|
IH_ARCH_DEFAULT, IH_TYPE_FLATDT, -1,
|
|
|
|
FIT_LOAD_OPTIONAL, &dt_data, &dt_len);
|
|
|
|
|
|
|
|
conf_noffset = fit_conf_get_node((const void *)header,
|
|
|
|
fit_uname_config);
|
|
|
|
if (conf_noffset <= 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
for (idx = 0;
|
|
|
|
uname = fdt_stringlist_get((const void *)header, conf_noffset,
|
|
|
|
FIT_LOADABLE_PROP, idx,
|
|
|
|
NULL), uname;
|
|
|
|
idx++)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_SPL_FIT_SIGNATURE
|
|
|
|
images.verify = 1;
|
|
|
|
#endif
|
|
|
|
ret = fit_image_load(&images, (ulong)header,
|
|
|
|
&uname, &fit_uname_config,
|
|
|
|
IH_ARCH_DEFAULT, IH_TYPE_LOADABLE, -1,
|
|
|
|
FIT_LOAD_OPTIONAL_NON_ZERO,
|
|
|
|
&img_data, &img_len);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-09-25 00:19:53 +00:00
|
|
|
int spl_parse_image_header(struct spl_image_info *spl_image,
|
|
|
|
const struct image_header *header)
|
2011-07-21 13:10:27 +00:00
|
|
|
{
|
2018-05-12 22:23:17 +00:00
|
|
|
#ifdef CONFIG_SPL_LOAD_FIT_FULL
|
|
|
|
int ret = spl_load_fit_image(spl_image, header);
|
|
|
|
|
|
|
|
if (!ret)
|
|
|
|
return ret;
|
|
|
|
#endif
|
2012-08-27 10:50:57 +00:00
|
|
|
if (image_get_magic(header) == IH_MAGIC) {
|
2017-02-16 17:18:39 +00:00
|
|
|
#ifdef CONFIG_SPL_LEGACY_IMAGE_SUPPORT
|
|
|
|
u32 header_size = sizeof(struct image_header);
|
|
|
|
|
2019-02-10 20:34:37 +00:00
|
|
|
#ifdef CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK
|
|
|
|
/* check uImage header CRC */
|
|
|
|
if (!image_check_hcrc(header)) {
|
|
|
|
puts("SPL: Image header CRC check failed!\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-09-25 00:19:53 +00:00
|
|
|
if (spl_image->flags & SPL_COPY_PAYLOAD_ONLY) {
|
2012-08-27 10:50:58 +00:00
|
|
|
/*
|
|
|
|
* On some system (e.g. powerpc), the load-address and
|
|
|
|
* entry-point is located at address 0. We can't load
|
|
|
|
* to 0-0x40. So skip header in this case.
|
|
|
|
*/
|
2016-09-25 00:19:53 +00:00
|
|
|
spl_image->load_addr = image_get_load(header);
|
|
|
|
spl_image->entry_point = image_get_ep(header);
|
|
|
|
spl_image->size = image_get_data_size(header);
|
2012-08-27 10:50:58 +00:00
|
|
|
} else {
|
2016-09-25 00:19:53 +00:00
|
|
|
spl_image->entry_point = image_get_load(header);
|
2012-08-27 10:50:58 +00:00
|
|
|
/* Load including the header */
|
2016-09-25 00:19:53 +00:00
|
|
|
spl_image->load_addr = spl_image->entry_point -
|
2012-08-27 10:50:58 +00:00
|
|
|
header_size;
|
2016-09-25 00:19:53 +00:00
|
|
|
spl_image->size = image_get_data_size(header) +
|
2012-08-27 10:50:58 +00:00
|
|
|
header_size;
|
|
|
|
}
|
2019-02-10 20:34:37 +00:00
|
|
|
#ifdef CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK
|
|
|
|
/* store uImage data length and CRC to check later */
|
|
|
|
spl_image->dcrc_data = image_get_load(header);
|
|
|
|
spl_image->dcrc_length = image_get_data_size(header);
|
|
|
|
spl_image->dcrc = image_get_dcrc(header);
|
|
|
|
#endif
|
|
|
|
|
2016-09-25 00:19:53 +00:00
|
|
|
spl_image->os = image_get_os(header);
|
|
|
|
spl_image->name = image_get_name(header);
|
2018-11-16 01:43:56 +00:00
|
|
|
debug(SPL_TPL_PROMPT
|
|
|
|
"payload image: %32s load addr: 0x%lx size: %d\n",
|
2018-11-02 20:49:52 +00:00
|
|
|
spl_image->name, spl_image->load_addr, spl_image->size);
|
2017-02-16 17:18:39 +00:00
|
|
|
#else
|
|
|
|
/* LEGACY image not supported */
|
2017-08-01 14:17:12 +00:00
|
|
|
debug("Legacy boot image support not enabled, proceeding to other boot methods\n");
|
2017-02-16 17:18:39 +00:00
|
|
|
return -EINVAL;
|
|
|
|
#endif
|
2011-07-21 13:10:27 +00:00
|
|
|
} else {
|
2015-03-31 09:40:50 +00:00
|
|
|
#ifdef CONFIG_SPL_PANIC_ON_RAW_IMAGE
|
|
|
|
/*
|
|
|
|
* CONFIG_SPL_PANIC_ON_RAW_IMAGE is defined when the
|
|
|
|
* code which loads images in SPL cannot guarantee that
|
|
|
|
* absolutely all read errors will be reported.
|
|
|
|
* An example is the LPC32XX MLC NAND driver, which
|
|
|
|
* will consider that a completely unreadable NAND block
|
|
|
|
* is bad, and thus should be skipped silently.
|
|
|
|
*/
|
|
|
|
panic("** no mkimage signature but raw image not supported");
|
2016-08-24 18:04:42 +00:00
|
|
|
#endif
|
|
|
|
|
2016-07-12 18:28:14 +00:00
|
|
|
#ifdef CONFIG_SPL_OS_BOOT
|
|
|
|
ulong start, end;
|
|
|
|
|
|
|
|
if (!bootz_setup((ulong)header, &start, &end)) {
|
2016-09-25 00:19:53 +00:00
|
|
|
spl_image->name = "Linux";
|
|
|
|
spl_image->os = IH_OS_LINUX;
|
|
|
|
spl_image->load_addr = CONFIG_SYS_LOAD_ADDR;
|
|
|
|
spl_image->entry_point = CONFIG_SYS_LOAD_ADDR;
|
|
|
|
spl_image->size = end - start;
|
2018-11-16 01:43:56 +00:00
|
|
|
debug(SPL_TPL_PROMPT
|
|
|
|
"payload zImage, load addr: 0x%lx size: %d\n",
|
2016-09-25 00:19:53 +00:00
|
|
|
spl_image->load_addr, spl_image->size);
|
2016-07-12 18:28:14 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
2016-08-24 18:04:42 +00:00
|
|
|
|
2017-02-16 17:18:38 +00:00
|
|
|
#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT
|
2011-07-21 13:10:27 +00:00
|
|
|
/* Signature not found - assume u-boot.bin */
|
2012-08-14 19:06:43 +00:00
|
|
|
debug("mkimage signature not found - ih_magic = %x\n",
|
2011-07-21 13:10:27 +00:00
|
|
|
header->ih_magic);
|
2016-09-25 00:19:53 +00:00
|
|
|
spl_set_header_raw_uboot(spl_image);
|
2017-02-16 17:18:38 +00:00
|
|
|
#else
|
|
|
|
/* RAW image not supported, proceed to other boot methods. */
|
2017-08-01 14:17:12 +00:00
|
|
|
debug("Raw boot image support not enabled, proceeding to other boot methods\n");
|
2017-02-16 17:18:38 +00:00
|
|
|
return -EINVAL;
|
2015-03-31 09:40:50 +00:00
|
|
|
#endif
|
2011-07-21 13:10:27 +00:00
|
|
|
}
|
2017-02-16 17:18:38 +00:00
|
|
|
|
2016-04-28 22:44:54 +00:00
|
|
|
return 0;
|
2011-07-21 13:10:27 +00:00
|
|
|
}
|
|
|
|
|
2012-10-19 21:08:22 +00:00
|
|
|
__weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
|
2011-07-21 13:10:27 +00:00
|
|
|
{
|
2013-04-24 00:41:24 +00:00
|
|
|
typedef void __noreturn (*image_entry_noargs_t)(void);
|
|
|
|
|
2011-07-21 13:10:27 +00:00
|
|
|
image_entry_noargs_t image_entry =
|
2017-01-02 11:48:31 +00:00
|
|
|
(image_entry_noargs_t)spl_image->entry_point;
|
2011-07-21 13:10:27 +00:00
|
|
|
|
2018-11-02 20:49:52 +00:00
|
|
|
debug("image entry point: 0x%lx\n", spl_image->entry_point);
|
2013-04-24 00:41:24 +00:00
|
|
|
image_entry();
|
2011-07-21 13:10:27 +00:00
|
|
|
}
|
|
|
|
|
2018-11-16 01:44:09 +00:00
|
|
|
#if CONFIG_IS_ENABLED(HANDOFF)
|
|
|
|
/**
|
|
|
|
* Set up the SPL hand-off information
|
|
|
|
*
|
|
|
|
* This is initially empty (zero) but can be written by
|
|
|
|
*/
|
|
|
|
static int setup_spl_handoff(void)
|
|
|
|
{
|
|
|
|
struct spl_handoff *ho;
|
|
|
|
|
|
|
|
ho = bloblist_ensure(BLOBLISTT_SPL_HANDOFF, sizeof(struct spl_handoff));
|
|
|
|
if (!ho)
|
|
|
|
return -ENOENT;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int write_spl_handoff(void)
|
|
|
|
{
|
|
|
|
struct spl_handoff *ho;
|
|
|
|
|
|
|
|
ho = bloblist_find(BLOBLISTT_SPL_HANDOFF, sizeof(struct spl_handoff));
|
|
|
|
if (!ho)
|
|
|
|
return -ENOENT;
|
|
|
|
handoff_save_dram(ho);
|
|
|
|
#ifdef CONFIG_SANDBOX
|
|
|
|
ho->arch.magic = TEST_HANDOFF_MAGIC;
|
|
|
|
#endif
|
|
|
|
debug(SPL_TPL_PROMPT "Wrote SPL handoff\n");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline int setup_spl_handoff(void) { return 0; }
|
|
|
|
static inline int write_spl_handoff(void) { return 0; }
|
|
|
|
|
|
|
|
#endif /* HANDOFF */
|
|
|
|
|
2017-03-15 14:43:28 +00:00
|
|
|
static int spl_common_init(bool setup_malloc)
|
2011-07-21 13:10:21 +00:00
|
|
|
{
|
2015-02-28 05:06:42 +00:00
|
|
|
int ret;
|
|
|
|
|
2017-07-24 09:43:34 +00:00
|
|
|
#if CONFIG_VAL(SYS_MALLOC_F_LEN)
|
2017-03-15 14:43:28 +00:00
|
|
|
if (setup_malloc) {
|
2016-05-25 00:14:56 +00:00
|
|
|
#ifdef CONFIG_MALLOC_F_ADDR
|
2017-03-15 14:43:28 +00:00
|
|
|
gd->malloc_base = CONFIG_MALLOC_F_ADDR;
|
2016-05-25 00:14:56 +00:00
|
|
|
#endif
|
2017-07-24 09:43:34 +00:00
|
|
|
gd->malloc_limit = CONFIG_VAL(SYS_MALLOC_F_LEN);
|
2017-03-15 14:43:28 +00:00
|
|
|
gd->malloc_ptr = 0;
|
|
|
|
}
|
2012-08-13 21:13:07 +00:00
|
|
|
#endif
|
2017-05-22 11:05:35 +00:00
|
|
|
ret = bootstage_init(true);
|
|
|
|
if (ret) {
|
|
|
|
debug("%s: Failed to set up bootstage: ret=%d\n", __func__,
|
|
|
|
ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
bootstage_mark_name(BOOTSTAGE_ID_START_SPL, "spl");
|
2018-11-16 01:43:49 +00:00
|
|
|
#if CONFIG_IS_ENABLED(LOG)
|
|
|
|
ret = log_init();
|
|
|
|
if (ret) {
|
|
|
|
debug("%s: Failed to set up logging\n", __func__);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif
|
2018-11-16 01:43:51 +00:00
|
|
|
if (CONFIG_IS_ENABLED(BLOBLIST)) {
|
|
|
|
ret = bloblist_init();
|
|
|
|
if (ret) {
|
|
|
|
debug("%s: Failed to set up bloblist: ret=%d\n",
|
|
|
|
__func__, ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
2018-11-16 01:44:09 +00:00
|
|
|
if (CONFIG_IS_ENABLED(HANDOFF)) {
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = setup_spl_handoff();
|
|
|
|
if (ret) {
|
|
|
|
puts(SPL_TPL_PROMPT "Cannot set up SPL handoff\n");
|
|
|
|
hang();
|
|
|
|
}
|
|
|
|
}
|
2016-07-04 17:57:56 +00:00
|
|
|
if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) {
|
2015-02-28 05:06:42 +00:00
|
|
|
ret = fdtdec_setup();
|
|
|
|
if (ret) {
|
|
|
|
debug("fdtdec_setup() returned error %d\n", ret);
|
2015-06-23 21:39:10 +00:00
|
|
|
return ret;
|
2015-02-28 05:06:42 +00:00
|
|
|
}
|
|
|
|
}
|
2017-06-30 17:02:53 +00:00
|
|
|
if (CONFIG_IS_ENABLED(DM)) {
|
2017-05-22 11:05:35 +00:00
|
|
|
bootstage_start(BOOTSTATE_ID_ACCUM_DM_SPL, "dm_spl");
|
2017-01-14 17:20:23 +00:00
|
|
|
/* With CONFIG_SPL_OF_PLATDATA, bring in all devices */
|
2016-07-04 17:58:14 +00:00
|
|
|
ret = dm_init_and_scan(!CONFIG_IS_ENABLED(OF_PLATDATA));
|
2017-05-22 11:05:35 +00:00
|
|
|
bootstage_accum(BOOTSTATE_ID_ACCUM_DM_SPL);
|
2015-02-28 05:06:42 +00:00
|
|
|
if (ret) {
|
|
|
|
debug("dm_init_and_scan() returned error %d\n", ret);
|
2015-06-23 21:39:10 +00:00
|
|
|
return ret;
|
2015-02-28 05:06:42 +00:00
|
|
|
}
|
|
|
|
}
|
2017-03-15 14:43:28 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-09-28 15:42:10 +00:00
|
|
|
void spl_set_bd(void)
|
|
|
|
{
|
2018-11-16 01:43:58 +00:00
|
|
|
/*
|
|
|
|
* NOTE: On some platforms (e.g. x86) bdata may be in flash and not
|
|
|
|
* writeable.
|
|
|
|
*/
|
2017-09-28 15:42:10 +00:00
|
|
|
if (!gd->bd)
|
|
|
|
gd->bd = &bdata;
|
|
|
|
}
|
|
|
|
|
2017-03-15 14:43:28 +00:00
|
|
|
int spl_early_init(void)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2018-08-13 09:24:05 +00:00
|
|
|
debug("%s\n", __func__);
|
|
|
|
|
2017-03-15 14:43:28 +00:00
|
|
|
ret = spl_common_init(true);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
gd->flags |= GD_FLG_SPL_EARLY_INIT;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int spl_init(void)
|
|
|
|
{
|
|
|
|
int ret;
|
2017-03-20 18:19:27 +00:00
|
|
|
bool setup_malloc = !(IS_ENABLED(CONFIG_SPL_STACK_R) &&
|
|
|
|
IS_ENABLED(CONFIG_SPL_SYS_MALLOC_SIMPLE));
|
2017-03-15 14:43:28 +00:00
|
|
|
|
2018-08-13 09:24:05 +00:00
|
|
|
debug("%s\n", __func__);
|
|
|
|
|
2017-03-15 14:43:28 +00:00
|
|
|
if (!(gd->flags & GD_FLG_SPL_EARLY_INIT)) {
|
2017-03-20 18:19:27 +00:00
|
|
|
ret = spl_common_init(setup_malloc);
|
2017-03-15 14:43:28 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
2015-06-23 21:39:10 +00:00
|
|
|
gd->flags |= GD_FLG_SPL_INIT;
|
2011-10-21 16:29:34 +00:00
|
|
|
|
2015-06-23 21:39:10 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-11-08 15:11:51 +00:00
|
|
|
#ifndef BOOT_DEVICE_NONE
|
|
|
|
#define BOOT_DEVICE_NONE 0xdeadbeef
|
|
|
|
#endif
|
|
|
|
|
|
|
|
__weak void board_boot_order(u32 *spl_boot_list)
|
|
|
|
{
|
|
|
|
spl_boot_list[0] = spl_boot_device();
|
|
|
|
}
|
|
|
|
|
2016-09-25 00:19:58 +00:00
|
|
|
static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
|
|
|
|
{
|
|
|
|
struct spl_image_loader *drv =
|
|
|
|
ll_entry_start(struct spl_image_loader, spl_image_loader);
|
|
|
|
const int n_ents =
|
|
|
|
ll_entry_count(struct spl_image_loader, spl_image_loader);
|
|
|
|
struct spl_image_loader *entry;
|
|
|
|
|
|
|
|
for (entry = drv; entry != drv + n_ents; entry++) {
|
|
|
|
if (boot_device == entry->boot_device)
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Not found */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-11-30 22:30:52 +00:00
|
|
|
static int spl_load_image(struct spl_image_info *spl_image,
|
|
|
|
struct spl_image_loader *loader)
|
2015-06-23 21:39:10 +00:00
|
|
|
{
|
2019-02-10 20:34:37 +00:00
|
|
|
int ret;
|
2016-09-25 00:19:57 +00:00
|
|
|
struct spl_boot_device bootdev;
|
|
|
|
|
2016-11-30 22:30:52 +00:00
|
|
|
bootdev.boot_device = loader->boot_device;
|
2016-09-25 00:19:57 +00:00
|
|
|
bootdev.boot_device_name = NULL;
|
|
|
|
|
2019-02-10 20:34:37 +00:00
|
|
|
ret = loader->load_image(spl_image, &bootdev);
|
|
|
|
#ifdef CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK
|
|
|
|
if (!ret && spl_image->dcrc_length) {
|
|
|
|
/* check data crc */
|
|
|
|
ulong dcrc = crc32_wd(0, (unsigned char *)spl_image->dcrc_data,
|
|
|
|
spl_image->dcrc_length, CHUNKSZ_CRC32);
|
|
|
|
if (dcrc != spl_image->dcrc) {
|
|
|
|
puts("SPL: Image data CRC check failed!\n");
|
|
|
|
ret = -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return ret;
|
2016-11-30 22:30:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* boot_from_devices() - Try loading an booting U-Boot from a list of devices
|
|
|
|
*
|
|
|
|
* @spl_image: Place to put the image details if successful
|
|
|
|
* @spl_boot_list: List of boot devices to try
|
|
|
|
* @count: Number of elements in spl_boot_list
|
|
|
|
* @return 0 if OK, -ve on error
|
|
|
|
*/
|
|
|
|
static int boot_from_devices(struct spl_image_info *spl_image,
|
|
|
|
u32 spl_boot_list[], int count)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < count && spl_boot_list[i] != BOOT_DEVICE_NONE; i++) {
|
|
|
|
struct spl_image_loader *loader;
|
|
|
|
|
|
|
|
loader = spl_ll_find_loader(spl_boot_list[i]);
|
2014-11-11 18:03:55 +00:00
|
|
|
#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
|
2016-11-30 22:30:53 +00:00
|
|
|
if (loader)
|
2017-01-12 16:19:55 +00:00
|
|
|
printf("Trying to boot from %s\n", loader->name);
|
2016-11-30 22:30:53 +00:00
|
|
|
else
|
2018-11-16 01:43:56 +00:00
|
|
|
puts(SPL_TPL_PROMPT "Unsupported Boot Device!\n");
|
2014-11-11 18:03:55 +00:00
|
|
|
#endif
|
2018-05-24 15:15:50 +00:00
|
|
|
if (loader && !spl_load_image(spl_image, loader)) {
|
|
|
|
spl_image->boot_device = spl_boot_list[i];
|
2016-11-30 22:30:51 +00:00
|
|
|
return 0;
|
2018-05-24 15:15:50 +00:00
|
|
|
}
|
2016-11-30 22:30:51 +00:00
|
|
|
}
|
|
|
|
|
2016-09-25 00:20:12 +00:00
|
|
|
return -ENODEV;
|
2015-11-08 15:11:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void board_init_r(gd_t *dummy1, ulong dummy2)
|
|
|
|
{
|
2016-09-25 00:20:17 +00:00
|
|
|
u32 spl_boot_list[] = {
|
|
|
|
BOOT_DEVICE_NONE,
|
|
|
|
BOOT_DEVICE_NONE,
|
|
|
|
BOOT_DEVICE_NONE,
|
|
|
|
BOOT_DEVICE_NONE,
|
|
|
|
BOOT_DEVICE_NONE,
|
|
|
|
};
|
|
|
|
struct spl_image_info spl_image;
|
2018-11-16 01:43:51 +00:00
|
|
|
int ret;
|
2015-11-08 15:11:50 +00:00
|
|
|
|
2018-11-16 01:43:56 +00:00
|
|
|
debug(">>" SPL_TPL_PROMPT "board_init_r()\n");
|
2017-09-28 15:42:10 +00:00
|
|
|
|
|
|
|
spl_set_bd();
|
|
|
|
|
2015-11-08 15:11:50 +00:00
|
|
|
#if defined(CONFIG_SYS_SPL_MALLOC_START)
|
|
|
|
mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
|
|
|
|
CONFIG_SYS_SPL_MALLOC_SIZE);
|
|
|
|
gd->flags |= GD_FLG_FULL_MALLOC_INIT;
|
|
|
|
#endif
|
|
|
|
if (!(gd->flags & GD_FLG_SPL_INIT)) {
|
|
|
|
if (spl_init())
|
|
|
|
hang();
|
|
|
|
}
|
2017-08-28 15:46:33 +00:00
|
|
|
#if !defined(CONFIG_PPC) && !defined(CONFIG_ARCH_MX6)
|
2015-11-08 15:11:50 +00:00
|
|
|
/*
|
|
|
|
* timer_init() does not exist on PPC systems. The timer is initialized
|
|
|
|
* and enabled (decrementer) in interrupt_init() here.
|
|
|
|
*/
|
|
|
|
timer_init();
|
|
|
|
#endif
|
|
|
|
|
2018-01-20 10:00:26 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BOARD_INIT)
|
2015-11-08 15:11:50 +00:00
|
|
|
spl_board_init();
|
|
|
|
#endif
|
|
|
|
|
2018-11-16 01:44:09 +00:00
|
|
|
if (IS_ENABLED(CONFIG_SPL_OS_BOOT) || CONFIG_IS_ENABLED(HANDOFF))
|
|
|
|
dram_init_banksize();
|
|
|
|
|
2018-05-02 14:10:54 +00:00
|
|
|
bootcount_inc();
|
|
|
|
|
2016-09-25 00:20:17 +00:00
|
|
|
memset(&spl_image, '\0', sizeof(spl_image));
|
2017-04-07 22:38:13 +00:00
|
|
|
#ifdef CONFIG_SYS_SPL_ARGS_ADDR
|
|
|
|
spl_image.arg = (void *)CONFIG_SYS_SPL_ARGS_ADDR;
|
|
|
|
#endif
|
2018-05-24 15:15:50 +00:00
|
|
|
spl_image.boot_device = BOOT_DEVICE_NONE;
|
2015-11-08 15:11:51 +00:00
|
|
|
board_boot_order(spl_boot_list);
|
|
|
|
|
2016-11-30 22:30:51 +00:00
|
|
|
if (boot_from_devices(&spl_image, spl_boot_list,
|
|
|
|
ARRAY_SIZE(spl_boot_list))) {
|
2018-11-16 01:43:56 +00:00
|
|
|
puts(SPL_TPL_PROMPT "failed to boot from all boot devices\n");
|
2015-11-08 15:11:50 +00:00
|
|
|
hang();
|
2015-11-08 15:11:51 +00:00
|
|
|
}
|
2015-11-08 15:11:50 +00:00
|
|
|
|
2018-05-24 15:15:50 +00:00
|
|
|
spl_perform_fixups(&spl_image);
|
2018-11-16 01:44:09 +00:00
|
|
|
if (CONFIG_IS_ENABLED(HANDOFF)) {
|
|
|
|
ret = write_spl_handoff();
|
|
|
|
if (ret)
|
|
|
|
printf(SPL_TPL_PROMPT
|
|
|
|
"SPL hand-off write failed (err=%d)\n", ret);
|
|
|
|
}
|
2018-11-16 01:43:51 +00:00
|
|
|
if (CONFIG_IS_ENABLED(BLOBLIST)) {
|
|
|
|
ret = bloblist_finish();
|
|
|
|
if (ret)
|
|
|
|
printf("Warning: Failed to finish bloblist (ret=%d)\n",
|
|
|
|
ret);
|
|
|
|
}
|
2018-05-24 15:15:50 +00:00
|
|
|
|
2017-05-28 19:55:08 +00:00
|
|
|
#ifdef CONFIG_CPU_V7M
|
|
|
|
spl_image.entry_point |= 0x1;
|
|
|
|
#endif
|
2011-09-14 19:33:34 +00:00
|
|
|
switch (spl_image.os) {
|
2011-07-21 13:10:27 +00:00
|
|
|
case IH_OS_U_BOOT:
|
|
|
|
debug("Jumping to U-Boot\n");
|
|
|
|
break;
|
2017-09-13 19:29:35 +00:00
|
|
|
#if CONFIG_IS_ENABLED(ATF)
|
|
|
|
case IH_OS_ARM_TRUSTED_FIRMWARE:
|
|
|
|
debug("Jumping to U-Boot via ARM Trusted Firmware\n");
|
|
|
|
spl_invoke_atf(&spl_image);
|
|
|
|
break;
|
|
|
|
#endif
|
2018-08-23 09:17:59 +00:00
|
|
|
#if CONFIG_IS_ENABLED(OPTEE)
|
|
|
|
case IH_OS_TEE:
|
|
|
|
debug("Jumping to U-Boot via OP-TEE\n");
|
|
|
|
spl_optee_entry(NULL, NULL, spl_image.fdt_addr,
|
|
|
|
(void *)spl_image.entry_point);
|
|
|
|
break;
|
|
|
|
#endif
|
2012-03-15 04:01:38 +00:00
|
|
|
#ifdef CONFIG_SPL_OS_BOOT
|
|
|
|
case IH_OS_LINUX:
|
|
|
|
debug("Jumping to Linux\n");
|
2017-04-18 11:57:27 +00:00
|
|
|
spl_fixup_fdt();
|
2012-03-15 04:01:38 +00:00
|
|
|
spl_board_prepare_for_linux();
|
2017-04-07 22:38:13 +00:00
|
|
|
jump_to_image_linux(&spl_image);
|
2012-03-15 04:01:38 +00:00
|
|
|
#endif
|
2011-07-21 13:10:27 +00:00
|
|
|
default:
|
2012-08-27 21:58:28 +00:00
|
|
|
debug("Unsupported OS image.. Jumping nevertheless..\n");
|
2011-07-21 13:10:27 +00:00
|
|
|
}
|
2017-07-24 09:43:34 +00:00
|
|
|
#if CONFIG_VAL(SYS_MALLOC_F_LEN) && !defined(CONFIG_SYS_SPL_MALLOC_SIZE)
|
2018-11-02 20:49:52 +00:00
|
|
|
debug("SPL malloc() used 0x%lx bytes (%ld KB)\n", gd->malloc_ptr,
|
2014-11-11 00:16:45 +00:00
|
|
|
gd->malloc_ptr / 1024);
|
|
|
|
#endif
|
2017-05-22 11:05:35 +00:00
|
|
|
#ifdef CONFIG_BOOTSTAGE_STASH
|
|
|
|
bootstage_mark_name(BOOTSTAGE_ID_END_SPL, "end_spl");
|
|
|
|
ret = bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH_ADDR,
|
|
|
|
CONFIG_BOOTSTAGE_STASH_SIZE);
|
|
|
|
if (ret)
|
|
|
|
debug("Failed to stash bootstage: err=%d\n", ret);
|
|
|
|
#endif
|
2017-09-13 10:24:24 +00:00
|
|
|
|
|
|
|
debug("loaded - jumping to U-Boot...\n");
|
2016-05-10 05:54:20 +00:00
|
|
|
spl_board_prepare_for_boot();
|
2012-10-19 21:08:22 +00:00
|
|
|
jump_to_image_no_args(&spl_image);
|
2011-07-21 13:10:21 +00:00
|
|
|
}
|
|
|
|
|
2018-04-19 04:32:51 +00:00
|
|
|
#ifdef CONFIG_SPL_SERIAL_SUPPORT
|
2012-08-22 22:31:05 +00:00
|
|
|
/*
|
|
|
|
* This requires UART clocks to be enabled. In order for this to work the
|
|
|
|
* caller must ensure that the gd pointer is valid.
|
|
|
|
*/
|
2011-07-21 13:10:21 +00:00
|
|
|
void preloader_console_init(void)
|
|
|
|
{
|
|
|
|
gd->baudrate = CONFIG_BAUDRATE;
|
|
|
|
|
|
|
|
serial_init(); /* serial communications setup */
|
|
|
|
|
2011-11-01 13:16:03 +00:00
|
|
|
gd->have_console = 1;
|
|
|
|
|
2018-11-16 01:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BANNER_PRINT)
|
2018-11-16 01:43:56 +00:00
|
|
|
puts("\nU-Boot " SPL_TPL_NAME " " PLAIN_VERSION " (" U_BOOT_DATE " - "
|
|
|
|
U_BOOT_TIME " " U_BOOT_TZ ")\n");
|
2018-01-25 17:45:22 +00:00
|
|
|
#endif
|
2012-08-13 18:37:56 +00:00
|
|
|
#ifdef CONFIG_SPL_DISPLAY_PRINT
|
|
|
|
spl_display_print();
|
|
|
|
#endif
|
2011-10-04 04:59:23 +00:00
|
|
|
}
|
2018-04-19 04:32:51 +00:00
|
|
|
#endif
|
2015-03-03 15:03:00 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* spl_relocate_stack_gd() - Relocate stack ready for board_init_r() execution
|
|
|
|
*
|
|
|
|
* Sometimes board_init_f() runs with a stack in SRAM but we want to use SDRAM
|
|
|
|
* for the main board_init_r() execution. This is typically because we need
|
|
|
|
* more stack space for things like the MMC sub-system.
|
|
|
|
*
|
|
|
|
* This function calculates the stack position, copies the global_data into
|
arm: move gd handling outside of C code
As of gcc 5.2.1 for Thumb-1, it is not possible any
more to assign gd from C code, as gd is mapped to r9,
and r9 may now be saved in the prolog sequence, and
restored in the epilog sequence, of any C functions.
Therefore arch_setup_gd(), which is supposed to set
r9, may actually have no effect, causing U-Boot to
use a bad address to access GD.
Fix this by never calling arch_setup_gd() for ARM,
and instead setting r9 in arch/arm/lib/crt0.S, to
the value returned by board_init_f_alloc_reserve().
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Reviewed-by: Simon Glass <sjg@chromium.org>
2015-11-25 16:56:33 +00:00
|
|
|
* place, sets the new gd (except for ARM, for which setting GD within a C
|
|
|
|
* function may not always work) and returns the new stack position. The
|
|
|
|
* caller is responsible for setting up the sp register and, in the case
|
|
|
|
* of ARM, setting up gd.
|
|
|
|
*
|
|
|
|
* All of this is done using the same layout and alignments as done in
|
|
|
|
* board_init_f_init_reserve() / board_init_f_alloc_reserve().
|
2015-03-03 15:03:00 +00:00
|
|
|
*
|
|
|
|
* @return new stack location, or 0 to use the same stack
|
|
|
|
*/
|
|
|
|
ulong spl_relocate_stack_gd(void)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_SPL_STACK_R
|
|
|
|
gd_t *new_gd;
|
arm: move gd handling outside of C code
As of gcc 5.2.1 for Thumb-1, it is not possible any
more to assign gd from C code, as gd is mapped to r9,
and r9 may now be saved in the prolog sequence, and
restored in the epilog sequence, of any C functions.
Therefore arch_setup_gd(), which is supposed to set
r9, may actually have no effect, causing U-Boot to
use a bad address to access GD.
Fix this by never calling arch_setup_gd() for ARM,
and instead setting r9 in arch/arm/lib/crt0.S, to
the value returned by board_init_f_alloc_reserve().
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Reviewed-by: Simon Glass <sjg@chromium.org>
2015-11-25 16:56:33 +00:00
|
|
|
ulong ptr = CONFIG_SPL_STACK_R_ADDR;
|
2015-03-03 15:03:00 +00:00
|
|
|
|
2017-07-28 09:06:03 +00:00
|
|
|
#if defined(CONFIG_SPL_SYS_MALLOC_SIMPLE) && CONFIG_VAL(SYS_MALLOC_F_LEN)
|
2015-09-13 13:04:17 +00:00
|
|
|
if (CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN) {
|
|
|
|
ptr -= CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN;
|
|
|
|
gd->malloc_base = ptr;
|
|
|
|
gd->malloc_limit = CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN;
|
|
|
|
gd->malloc_ptr = 0;
|
|
|
|
}
|
|
|
|
#endif
|
arm: move gd handling outside of C code
As of gcc 5.2.1 for Thumb-1, it is not possible any
more to assign gd from C code, as gd is mapped to r9,
and r9 may now be saved in the prolog sequence, and
restored in the epilog sequence, of any C functions.
Therefore arch_setup_gd(), which is supposed to set
r9, may actually have no effect, causing U-Boot to
use a bad address to access GD.
Fix this by never calling arch_setup_gd() for ARM,
and instead setting r9 in arch/arm/lib/crt0.S, to
the value returned by board_init_f_alloc_reserve().
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Reviewed-by: Simon Glass <sjg@chromium.org>
2015-11-25 16:56:33 +00:00
|
|
|
/* Get stack position: use 8-byte alignment for ABI compliance */
|
|
|
|
ptr = CONFIG_SPL_STACK_R_ADDR - roundup(sizeof(gd_t),16);
|
|
|
|
new_gd = (gd_t *)ptr;
|
|
|
|
memcpy(new_gd, (void *)gd, sizeof(gd_t));
|
2016-11-13 21:21:58 +00:00
|
|
|
#if CONFIG_IS_ENABLED(DM)
|
|
|
|
dm_fixup_for_gd_move(new_gd);
|
|
|
|
#endif
|
arm: move gd handling outside of C code
As of gcc 5.2.1 for Thumb-1, it is not possible any
more to assign gd from C code, as gd is mapped to r9,
and r9 may now be saved in the prolog sequence, and
restored in the epilog sequence, of any C functions.
Therefore arch_setup_gd(), which is supposed to set
r9, may actually have no effect, causing U-Boot to
use a bad address to access GD.
Fix this by never calling arch_setup_gd() for ARM,
and instead setting r9 in arch/arm/lib/crt0.S, to
the value returned by board_init_f_alloc_reserve().
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Reviewed-by: Simon Glass <sjg@chromium.org>
2015-11-25 16:56:33 +00:00
|
|
|
#if !defined(CONFIG_ARM)
|
|
|
|
gd = new_gd;
|
|
|
|
#endif
|
2015-03-03 15:03:00 +00:00
|
|
|
return ptr;
|
|
|
|
#else
|
|
|
|
return 0;
|
|
|
|
#endif
|
|
|
|
}
|