[PATCH 2/4] sandbox: only access of_add_memory_bank if it's defined
Alexander Aring
alex.aring at gmail.com
Fri Jun 27 00:28:42 PDT 2014
On Thu, Jun 26, 2014 at 10:42:32PM +0200, Sascha Hauer wrote:
> On Thu, Jun 26, 2014 at 10:49:15AM +0200, Holger Schurig wrote:
> > ... and it's defined only when CONFIG_OFTREE_MEM_GENERIC is on.
> >
> > Signed-off-by: Holger Schurig <holgerschurig at gmail.com>
> > ---
> > drivers/of/base.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/drivers/of/base.c b/drivers/of/base.c
> > index c440a69..818d76e 100644
> > --- a/drivers/of/base.c
> > +++ b/drivers/of/base.c
> > @@ -1697,6 +1697,7 @@ int of_set_property(struct device_node *np, const char *name, const void *val, i
> > return 0;
> > }
> >
> > +#ifdef CONFIG_OFTREE_MEM_GENERIC
> > int of_add_memory(struct device_node *node, bool dump)
> > {
> > const char *device_type;
> > @@ -1720,6 +1721,7 @@ int of_add_memory(struct device_node *node, bool dump)
> >
> > return 0;
> > }
> > +#endif
>
> This will break MIPS support. MIPS has it's own implementation of
> of_add_memory_bank (see ./arch/mips/boot/dtb.c), so in MIPS case
> the Kconfig options means "I have my own version of of_add_memory_bank"
>
Then maybe, move this implementation to "drivers/of/mem_generic.c". This
function doesn't use any static function of this file (What I see,
currently).
Then make a own header with dummy implementation:
#ifdef CONFIG_OFTREE_MEM_GENERIC
int of_add_memory(struct device_node *node, bool dump)
{
...
}
#else
int of_add_memory(struct device_node *node, bool dump)
{
return -EOPNOTSUPP;
}
#endif
The file drivers/of/mem_generic.c depends on PPC || ARM, so let
the buildsystem do the rest.
- Alex
More information about the barebox
mailing list