diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-03 19:43:51 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-03 19:43:51 -0500 |
| commit | 73eed452b9c9827474c0789c30729dca6fcf061d (patch) | |
| tree | b33a39a41b7b2891b0171f79ea9b5599658884c3 /arch/mips/lib/bootm.c | |
| parent | bfb380b30ad2d678c09037560abb6f09a5e9c9b6 (diff) | |
| parent | a2558e8729831e0bcef634ea2440e60425ef0ff6 (diff) | |
| download | u-boot-imx-73eed452b9c9827474c0789c30729dca6fcf061d.zip u-boot-imx-73eed452b9c9827474c0789c30729dca6fcf061d.tar.gz u-boot-imx-73eed452b9c9827474c0789c30729dca6fcf061d.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-dm
Diffstat (limited to 'arch/mips/lib/bootm.c')
| -rw-r--r-- | arch/mips/lib/bootm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 9fec4ad..be87762 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -253,7 +253,6 @@ static int boot_reloc_fdt(bootm_headers_t *images) #endif } -#ifdef CONFIG_ARCH_FIXUP_FDT int arch_fixup_fdt(void *blob) { #if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT) @@ -265,7 +264,6 @@ int arch_fixup_fdt(void *blob) return 0; #endif } -#endif static int boot_setup_fdt(bootm_headers_t *images) { |