[U-Boot] [PATCH v2] libfdt: replace ARCH_FIXUP_FDT with ARCH_FIXUP_FDT_MEMORY

[Simon Glass]

Hi,

On 23 October 2016 at 21:01, Simon Glass <sjg at chromium.org> wrote:
> On 21 October 2016 at 01:12, Alexey Brodkin <Alexey.Brodkin at synopsys.com> wrote:
>> Hello Masahiro-san,
>>
>> On Fri, 2016-10-21 at 10:58 +0900, Masahiro Yamada wrote:
>>> Hi Alexey,
>>>
>>> 2016-10-20 20:55 GMT+09:00 Alexey Brodkin <Alexey.Brodkin at synopsys.com>:
>>> >
>>> > Hello Masahiro-san,
>>> >
>>> > On Thu, 2016-10-20 at 09:15 +0900, Masahiro Yamada wrote:
>>> > >
>>> > > Commit e2f88dfd2d96 ("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 at socionext.com>
>>> > > ---
>>> > >
>>> > > Changes in v2:
>>> > >  - Add empty stub to ARC, PowerPC, Microblaze instead of
>>> > >    a weak function common/image-fdt.c
>>> >
>>> > [snip]
>>> >
>>> > >
>>> > > diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
>>> > > index 04d9d9c..5798149 100644
>>> > > --- a/arch/arc/lib/bootm.c
>>> > > +++ b/arch/arc/lib/bootm.c
>>> > > @@ -37,6 +37,11 @@ void arch_lmb_reserve(struct lmb *lmb)
>>> > >       lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp));
>>> > >  }
>>> > >
>>> > > +int arch_fixup_fdt(void *blob)
>>> > > +{
>>> > > +     return 0;
>>> > > +}
>>> > > +
>>> >
>>> > I'm wondering why don't we add weak implementation of arch_fixup_fdt()
>>> > right in say common/image-fdt.c? This will allow us to not add dummy stubs
>>> > for those arches that don't really use it.
>>>
>>>
>>> I fully agree with you.
>>>
>>>
>>> I used a weak function in v1:
>>> http://patchwork.ozlabs.org/patch/678049/
>>>
>>> But, it was change-request'ed by Simon.
>>
>> Ok, thanks for the reference.
>> Indeed Simon's comments make sense.
>>
>> So for ARC changes
>>
>> Acked-by: Alexey Brodkin <abrodkin at synopsys.com>
>
> Acked-by: Simon Glass <sjg at chromium.org>

Unfortunately this breaks sandbox - can you please take a look?

02: libfdt: replace ARCH_FIXUP_FDT with ARCH_FIXUP_FDT_MEMORY
   sandbox:  +   sandbox sandbox_spl sandbox_noblk
+common/built-in.o: In function `image_setup_libfdt':
+build/../common/image-fdt.c:477: undefined reference to `arch_fixup_fdt'
+collect2: error: ld returned 1 exit status
+make[1]: *** [u-boot] Error 1
+make: *** [sub-make] Error 2

Regards,
Simon