mirror of
https://github.com/linux-sunxi/u-boot-sunxi.git
synced 2024-02-12 11:16:03 +08:00
fdt: Implement weak arch_fixup_fdt()
Only ARM and in some configs MIPS really implement arch_fixup_fdt(). Others just use the same boilerplate which is not good by itself, but what's worse if we try to build with disabled CONFIG_CMD_BOOTM and enabled CONFIG_OF_LIBFDT we'll hit an unknown symbol which was apparently implemented in arch/xxx/lib/bootm.c. Now with weak arch_fixup_fdt() right in image-fdt.c where it is used we get both items highlighted above fixed. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Cc: Simon Glass <sjg@chromium.org> Cc: York Sun <york.sun@nxp.com> Cc: Stefan Roese <sr@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
This commit is contained in:

committed by
Simon Glass

parent
32fe36574e
commit
4280342adb
@ -37,11 +37,6 @@ void arch_lmb_reserve(struct lmb *lmb)
|
|||||||
lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp));
|
lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp));
|
||||||
}
|
}
|
||||||
|
|
||||||
int arch_fixup_fdt(void *blob)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int cleanup_before_linux(void)
|
static int cleanup_before_linux(void)
|
||||||
{
|
{
|
||||||
disable_interrupts();
|
disable_interrupts();
|
||||||
|
@ -17,11 +17,6 @@
|
|||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
int arch_fixup_fdt(void *blob)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int do_bootm_linux(int flag, int argc, char * const argv[],
|
int do_bootm_linux(int flag, int argc, char * const argv[],
|
||||||
bootm_headers_t *images)
|
bootm_headers_t *images)
|
||||||
{
|
{
|
||||||
|
@ -253,17 +253,15 @@ static int boot_reloc_fdt(bootm_headers_t *images)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT)
|
||||||
int arch_fixup_fdt(void *blob)
|
int arch_fixup_fdt(void *blob)
|
||||||
{
|
{
|
||||||
#if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT)
|
|
||||||
u64 mem_start = virt_to_phys((void *)gd->bd->bi_memstart);
|
u64 mem_start = virt_to_phys((void *)gd->bd->bi_memstart);
|
||||||
u64 mem_size = gd->ram_size;
|
u64 mem_size = gd->ram_size;
|
||||||
|
|
||||||
return fdt_fixup_memory_banks(blob, &mem_start, &mem_size, 1);
|
return fdt_fixup_memory_banks(blob, &mem_start, &mem_size, 1);
|
||||||
#else
|
|
||||||
return 0;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int boot_setup_fdt(bootm_headers_t *images)
|
static int boot_setup_fdt(bootm_headers_t *images)
|
||||||
{
|
{
|
||||||
|
@ -15,12 +15,6 @@
|
|||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
int arch_fixup_fdt(void *blob)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#if defined(CONFIG_SETUP_MEMORY_TAGS) || \
|
#if defined(CONFIG_SETUP_MEMORY_TAGS) || \
|
||||||
defined(CONFIG_CMDLINE_TAG) || \
|
defined(CONFIG_CMDLINE_TAG) || \
|
||||||
defined(CONFIG_INITRD_TAG) || \
|
defined(CONFIG_INITRD_TAG) || \
|
||||||
|
@ -40,11 +40,6 @@ static void set_clocks_in_mhz (bd_t *kbd);
|
|||||||
#define CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE (768*1024*1024)
|
#define CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE (768*1024*1024)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int arch_fixup_fdt(void *blob)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void boot_jump_linux(bootm_headers_t *images)
|
static void boot_jump_linux(bootm_headers_t *images)
|
||||||
{
|
{
|
||||||
void (*kernel)(bd_t *, ulong r4, ulong r5, ulong r6,
|
void (*kernel)(bd_t *, ulong r4, ulong r5, ulong r6,
|
||||||
|
@ -50,11 +50,6 @@ int bootz_setup(ulong image, ulong *start, ulong *end)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int arch_fixup_fdt(void *blob)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
|
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
|
||||||
{
|
{
|
||||||
if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) {
|
if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) {
|
||||||
|
@ -28,11 +28,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||||||
|
|
||||||
#define COMMAND_LINE_OFFSET 0x9000
|
#define COMMAND_LINE_OFFSET 0x9000
|
||||||
|
|
||||||
int arch_fixup_fdt(void *blob)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
__weak void board_quiesce_devices(void)
|
__weak void board_quiesce_devices(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -454,6 +454,11 @@ __weak int ft_verify_fdt(void *fdt)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__weak int arch_fixup_fdt(void *blob)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int image_setup_libfdt(bootm_headers_t *images, void *blob,
|
int image_setup_libfdt(bootm_headers_t *images, void *blob,
|
||||||
int of_size, struct lmb *lmb)
|
int of_size, struct lmb *lmb)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user