mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-29 08:01:08 +00:00
b08c8c4870
Thomas reported U-Boot failed to build host tools if libfdt-devel package is installed because tools include libfdt headers from /usr/include/ instead of using internal ones. This commit moves the header code: include/libfdt.h -> include/linux/libfdt.h include/libfdt_env.h -> include/linux/libfdt_env.h and replaces include directives: #include <libfdt.h> -> #include <linux/libfdt.h> #include <libfdt_env.h> -> #include <linux/libfdt_env.h> Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
84 lines
2.1 KiB
C
84 lines
2.1 KiB
C
/*
|
|
* (C) Copyright 2016
|
|
* Xilinx, Inc.
|
|
*
|
|
* (C) Copyright 2016
|
|
* Toradex AG
|
|
*
|
|
* Michal Simek <michal.simek@xilinx.com>
|
|
* Stefan Agner <stefan.agner@toradex.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
#include <common.h>
|
|
#include <binman_sym.h>
|
|
#include <mapmem.h>
|
|
#include <spl.h>
|
|
#include <linux/libfdt.h>
|
|
|
|
#ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
|
|
# define CONFIG_SPL_LOAD_FIT_ADDRESS 0
|
|
#endif
|
|
|
|
static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
|
|
ulong count, void *buf)
|
|
{
|
|
debug("%s: sector %lx, count %lx, buf %lx\n",
|
|
__func__, sector, count, (ulong)buf);
|
|
memcpy(buf, (void *)(CONFIG_SPL_LOAD_FIT_ADDRESS + sector), count);
|
|
return count;
|
|
}
|
|
|
|
static int spl_ram_load_image(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev)
|
|
{
|
|
struct image_header *header;
|
|
|
|
header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS;
|
|
|
|
#if defined(CONFIG_SPL_DFU_SUPPORT)
|
|
if (bootdev->boot_device == BOOT_DEVICE_DFU)
|
|
spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");
|
|
#endif
|
|
|
|
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
|
|
image_get_magic(header) == FDT_MAGIC) {
|
|
struct spl_load_info load;
|
|
|
|
debug("Found FIT\n");
|
|
load.bl_len = 1;
|
|
load.read = spl_ram_load_read;
|
|
spl_load_simple_fit(spl_image, &load, 0, header);
|
|
} else {
|
|
ulong u_boot_pos = binman_sym(ulong, u_boot_any, pos);
|
|
|
|
debug("Legacy image\n");
|
|
/*
|
|
* Get the header. It will point to an address defined by
|
|
* handoff which will tell where the image located inside
|
|
* the flash.
|
|
*/
|
|
debug("u_boot_pos = %lx\n", u_boot_pos);
|
|
if (u_boot_pos == BINMAN_SYM_MISSING) {
|
|
/*
|
|
* No binman support or no information. For now, fix it
|
|
* to the address pointed to by U-Boot.
|
|
*/
|
|
u_boot_pos = CONFIG_SYS_TEXT_BASE -
|
|
sizeof(struct image_header);
|
|
}
|
|
header = (struct image_header *)map_sysmem(u_boot_pos, 0);
|
|
|
|
spl_parse_image_header(spl_image, header);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
#if defined(CONFIG_SPL_RAM_DEVICE)
|
|
SPL_LOAD_IMAGE_METHOD("RAM", 0, BOOT_DEVICE_RAM, spl_ram_load_image);
|
|
#endif
|
|
#if defined(CONFIG_SPL_DFU_SUPPORT)
|
|
SPL_LOAD_IMAGE_METHOD("DFU", 0, BOOT_DEVICE_DFU, spl_ram_load_image);
|
|
#endif
|
|
|
|
|