mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-15 17:28:15 +00:00
63c0941726
Commit e2f88dfd2d ("libfdt: Introduce new ARCH_FIXUP_FDT option")
allows us to skip memory setup of DTB, but a problem for ARM is that
spin_table_update_dt() and psci_update_dt() are skipped as well if
CONFIG_ARCH_FIXUP_FDT is disabled.
This commit allows us to skip only fdt_fixup_memory_banks() instead
of the whole of arch_fixup_fdt(). It will be useful when we want to
use a memory node from a kernel DTB as is, but need some fixups for
Spin-Table/PSCI.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
Acked-by: Simon Glass <sjg@chromium.org>
Fixed build error for x86:
Signed-off-by: Simon Glass <sjg@chromium.org>
91 lines
2.1 KiB
C
91 lines
2.1 KiB
C
/*
|
|
* (C) Copyright 2007 Michal Simek
|
|
* (C) Copyright 2004 Atmark Techno, Inc.
|
|
*
|
|
* Michal SIMEK <monstr@monstr.eu>
|
|
* Yasushi SHOJI <yashi@atmark-techno.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <fdt_support.h>
|
|
#include <image.h>
|
|
#include <u-boot/zlib.h>
|
|
#include <asm/byteorder.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int arch_fixup_fdt(void *blob)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int do_bootm_linux(int flag, int argc, char * const argv[],
|
|
bootm_headers_t *images)
|
|
{
|
|
/* First parameter is mapped to $r5 for kernel boot args */
|
|
void (*thekernel) (char *, ulong, ulong);
|
|
char *commandline = getenv("bootargs");
|
|
ulong rd_data_start, rd_data_end;
|
|
|
|
/*
|
|
* allow the PREP bootm subcommand, it is required for bootm to work
|
|
*/
|
|
if (flag & BOOTM_STATE_OS_PREP)
|
|
return 0;
|
|
|
|
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
|
|
return 1;
|
|
|
|
int ret;
|
|
|
|
char *of_flat_tree = NULL;
|
|
#if defined(CONFIG_OF_LIBFDT)
|
|
/* did generic code already find a device tree? */
|
|
if (images->ft_len)
|
|
of_flat_tree = images->ft_addr;
|
|
#endif
|
|
|
|
thekernel = (void (*)(char *, ulong, ulong))images->ep;
|
|
|
|
/* find ramdisk */
|
|
ret = boot_get_ramdisk(argc, argv, images, IH_ARCH_MICROBLAZE,
|
|
&rd_data_start, &rd_data_end);
|
|
if (ret)
|
|
return 1;
|
|
|
|
bootstage_mark(BOOTSTAGE_ID_RUN_OS);
|
|
|
|
if (!of_flat_tree && argc > 1)
|
|
of_flat_tree = (char *)simple_strtoul(argv[1], NULL, 16);
|
|
|
|
/* fixup the initrd now that we know where it should be */
|
|
if (images->rd_start && images->rd_end && of_flat_tree)
|
|
ret = fdt_initrd(of_flat_tree, images->rd_start,
|
|
images->rd_end);
|
|
if (ret)
|
|
return 1;
|
|
|
|
#ifdef DEBUG
|
|
printf("## Transferring control to Linux (at address 0x%08lx) ",
|
|
(ulong)thekernel);
|
|
printf("ramdisk 0x%08lx, FDT 0x%08lx...\n",
|
|
rd_data_start, (ulong) of_flat_tree);
|
|
#endif
|
|
|
|
#ifdef XILINX_USE_DCACHE
|
|
flush_cache(0, XILINX_DCACHE_BYTE_SIZE);
|
|
#endif
|
|
/*
|
|
* Linux Kernel Parameters (passing device tree):
|
|
* r5: pointer to command line
|
|
* r6: pointer to ramdisk
|
|
* r7: pointer to the fdt, followed by the board info data
|
|
*/
|
|
thekernel(commandline, rd_data_start, (ulong)of_flat_tree);
|
|
/* does not return */
|
|
|
|
return 1;
|
|
}
|