mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-16 00:03:24 +00:00
7115007ccf
When building a system that has both TPL and SPL_OS_BOOT, code which tests for CONFIG_SPL_OS_BOOT will be built and enabled in TPL, which is not correct. While there is no CONFIG_TPL_OS_BOOT symbol at this time (and likely will not ever be) we can use CONFIG_IS_ENABLED(OS_BOOT) in these common paths to ensure we only compile these parts in the SPL case. Signed-off-by: Tom Rini <trini@konsulko.com>
30 lines
886 B
C
30 lines
886 B
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2017, STMicroelectronics - All Rights Reserved
|
|
* Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <image.h>
|
|
#include <log.h>
|
|
#include <spl.h>
|
|
|
|
static int spl_xip(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev)
|
|
{
|
|
#if CONFIG_IS_ENABLED(OS_BOOT)
|
|
if (!spl_start_uboot()) {
|
|
spl_image->arg = (void *)CONFIG_SYS_FDT_BASE;
|
|
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;
|
|
debug("spl: payload xipImage, load addr: 0x%lx\n",
|
|
spl_image->load_addr);
|
|
return 0;
|
|
}
|
|
#endif
|
|
return(spl_parse_image_header(spl_image, (const struct image_header *)
|
|
CONFIG_SYS_UBOOT_BASE));
|
|
}
|
|
SPL_LOAD_IMAGE_METHOD("XIP", 0, BOOT_DEVICE_XIP, spl_xip);
|