diff mbox

[U-Boot,v2,4/9] libfdt: Add new headers and defines

Message ID 1464340402-2249-5-git-send-email-maxime.ripard@free-electrons.com
State Accepted
Delegated to: Pantelis Antoniou
Headers show

Commit Message

Maxime Ripard May 27, 2016, 9:13 a.m. UTC
The libfdt overlay support introduces a bunch of new includes and
functions.

Make sure we are able to build it by adding the needed glue.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 include/libfdt_env.h | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Simon Glass June 10, 2016, 12:34 a.m. UTC | #1
Hi Maxime,

On 27 May 2016 at 03:13, Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> The libfdt overlay support introduces a bunch of new includes and
> functions.
>
> Make sure we are able to build it by adding the needed glue.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  include/libfdt_env.h | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/include/libfdt_env.h b/include/libfdt_env.h
> index 273b5d30f867..2d2196031332 100644
> --- a/include/libfdt_env.h
> +++ b/include/libfdt_env.h
> @@ -23,6 +23,13 @@ typedef __be64 fdt64_t;
>  #define fdt64_to_cpu(x)                be64_to_cpu(x)
>  #define cpu_to_fdt64(x)                cpu_to_be64(x)
>
> +#ifdef __UBOOT__
> +#include "malloc.h"
> +#include "vsprintf.h"

Can we use <malloc.h> and <vsprintf.h> instead?

> +
> +#define strtol(cp, endp, base) simple_strtol(cp, endp, base)
> +#endif
> +
>  /* adding a ramdisk needs 0x44 bytes in version 2008.10 */
>  #define FDT_RAMDISK_OVERHEAD   0x80
>
> --
> 2.8.2
>

Regards,
Simon
Pantelis Antoniou June 10, 2016, 2:03 p.m. UTC | #2
Hi Maxime,

> On May 27, 2016, at 12:13 , Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> 
> The libfdt overlay support introduces a bunch of new includes and
> functions.
> 
> Make sure we are able to build it by adding the needed glue.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> include/libfdt_env.h | 7 +++++++
> 1 file changed, 7 insertions(+)
> 
> diff --git a/include/libfdt_env.h b/include/libfdt_env.h
> index 273b5d30f867..2d2196031332 100644
> --- a/include/libfdt_env.h
> +++ b/include/libfdt_env.h
> @@ -23,6 +23,13 @@ typedef __be64 fdt64_t;
> #define fdt64_to_cpu(x)		be64_to_cpu(x)
> #define cpu_to_fdt64(x)		cpu_to_be64(x)
> 
> +#ifdef __UBOOT__
> +#include "malloc.h"
> +#include "vsprintf.h"
> +
> +#define strtol(cp, endp, base)	simple_strtol(cp, endp, base)
> +#endif
> +
> /* adding a ramdisk needs 0x44 bytes in version 2008.10 */
> #define FDT_RAMDISK_OVERHEAD	0x80
> 

We need to figure out what the upstream libfdt/dtc maintainer’s take is on this is.
For u-boot we’re fine and for now it’s OK.

Acked-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>

> -- 
> 2.8.2
>
David Gibson June 11, 2016, 10:30 a.m. UTC | #3
On Fri, Jun 10, 2016 at 05:03:36PM +0300, Pantelis Antoniou wrote:
> Hi Maxime,
> 
> > On May 27, 2016, at 12:13 , Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> > 
> > The libfdt overlay support introduces a bunch of new includes and
> > functions.
> > 
> > Make sure we are able to build it by adding the needed glue.
> > 
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > ---
> > include/libfdt_env.h | 7 +++++++
> > 1 file changed, 7 insertions(+)
> > 
> > diff --git a/include/libfdt_env.h b/include/libfdt_env.h
> > index 273b5d30f867..2d2196031332 100644
> > --- a/include/libfdt_env.h
> > +++ b/include/libfdt_env.h
> > @@ -23,6 +23,13 @@ typedef __be64 fdt64_t;
> > #define fdt64_to_cpu(x)		be64_to_cpu(x)
> > #define cpu_to_fdt64(x)		cpu_to_be64(x)
> > 
> > +#ifdef __UBOOT__
> > +#include "malloc.h"
> > +#include "vsprintf.h"
> > +
> > +#define strtol(cp, endp, base)	simple_strtol(cp, endp, base)
> > +#endif
> > +
> > /* adding a ramdisk needs 0x44 bytes in version 2008.10 */
> > #define FDT_RAMDISK_OVERHEAD	0x80
> > 
> 
> We need to figure out what the upstream libfdt/dtc maintainer’s take is on this is.
> For u-boot we’re fine and for now it’s OK.

These were sent to the upstream dtc list as well.

The concept is fine, but there are a number of problems in the
implementation.  I sent detailed review comments on the upstream
versions, haven't seen a respin yet.
Maxime Ripard June 13, 2016, 9:28 a.m. UTC | #4
Hi David,

On Sat, Jun 11, 2016 at 08:30:35PM +1000, David Gibson wrote:
> On Fri, Jun 10, 2016 at 05:03:36PM +0300, Pantelis Antoniou wrote:
> > Hi Maxime,
> > 
> > > On May 27, 2016, at 12:13 , Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> > > 
> > > The libfdt overlay support introduces a bunch of new includes and
> > > functions.
> > > 
> > > Make sure we are able to build it by adding the needed glue.
> > > 
> > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > > ---
> > > include/libfdt_env.h | 7 +++++++
> > > 1 file changed, 7 insertions(+)
> > > 
> > > diff --git a/include/libfdt_env.h b/include/libfdt_env.h
> > > index 273b5d30f867..2d2196031332 100644
> > > --- a/include/libfdt_env.h
> > > +++ b/include/libfdt_env.h
> > > @@ -23,6 +23,13 @@ typedef __be64 fdt64_t;
> > > #define fdt64_to_cpu(x)		be64_to_cpu(x)
> > > #define cpu_to_fdt64(x)		cpu_to_be64(x)
> > > 
> > > +#ifdef __UBOOT__
> > > +#include "malloc.h"
> > > +#include "vsprintf.h"
> > > +
> > > +#define strtol(cp, endp, base)	simple_strtol(cp, endp, base)
> > > +#endif
> > > +
> > > /* adding a ramdisk needs 0x44 bytes in version 2008.10 */
> > > #define FDT_RAMDISK_OVERHEAD	0x80
> > > 
> > 
> > We need to figure out what the upstream libfdt/dtc maintainer’s take is on this is.
> > For u-boot we’re fine and for now it’s OK.
> 
> These were sent to the upstream dtc list as well.
> 
> The concept is fine, but there are a number of problems in the
> implementation.  I sent detailed review comments on the upstream
> versions, haven't seen a respin yet.

Yes, thanks a lot for your comments, I'll address them and resend a
new serie.

(it might not be before a couple of weeks though).

Thanks!
Maxime
Simon Glass June 16, 2016, 12:39 a.m. UTC | #5
Hi Maxime,

On 13 June 2016 at 03:28, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi David,
>
> On Sat, Jun 11, 2016 at 08:30:35PM +1000, David Gibson wrote:
>> On Fri, Jun 10, 2016 at 05:03:36PM +0300, Pantelis Antoniou wrote:
>> > Hi Maxime,
>> >
>> > > On May 27, 2016, at 12:13 , Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
>> > >
>> > > The libfdt overlay support introduces a bunch of new includes and
>> > > functions.
>> > >
>> > > Make sure we are able to build it by adding the needed glue.
>> > >
>> > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
>> > > ---
>> > > include/libfdt_env.h | 7 +++++++
>> > > 1 file changed, 7 insertions(+)
>> > >
>> > > diff --git a/include/libfdt_env.h b/include/libfdt_env.h
>> > > index 273b5d30f867..2d2196031332 100644
>> > > --- a/include/libfdt_env.h
>> > > +++ b/include/libfdt_env.h
>> > > @@ -23,6 +23,13 @@ typedef __be64 fdt64_t;
>> > > #define fdt64_to_cpu(x)           be64_to_cpu(x)
>> > > #define cpu_to_fdt64(x)           cpu_to_be64(x)
>> > >
>> > > +#ifdef __UBOOT__
>> > > +#include "malloc.h"
>> > > +#include "vsprintf.h"
>> > > +
>> > > +#define strtol(cp, endp, base)   simple_strtol(cp, endp, base)
>> > > +#endif
>> > > +
>> > > /* adding a ramdisk needs 0x44 bytes in version 2008.10 */
>> > > #define FDT_RAMDISK_OVERHEAD      0x80
>> > >
>> >
>> > We need to figure out what the upstream libfdt/dtc maintainer’s take is on this is.
>> > For u-boot we’re fine and for now it’s OK.
>>
>> These were sent to the upstream dtc list as well.
>>
>> The concept is fine, but there are a number of problems in the
>> implementation.  I sent detailed review comments on the upstream
>> versions, haven't seen a respin yet.
>
> Yes, thanks a lot for your comments, I'll address them and resend a
> new serie.
>
> (it might not be before a couple of weeks though).

For U-Boot, shall we target the next merge window? Or if you would
prefer to get this in sooner, you could send an interim version with
the ntis address, and we can do a fix-up patch for U-Boot once it is
applied upstream.

>
> Thanks!
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com

Regards,
Simon
diff mbox

Patch

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 273b5d30f867..2d2196031332 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -23,6 +23,13 @@  typedef __be64 fdt64_t;
 #define fdt64_to_cpu(x)		be64_to_cpu(x)
 #define cpu_to_fdt64(x)		cpu_to_be64(x)
 
+#ifdef __UBOOT__
+#include "malloc.h"
+#include "vsprintf.h"
+
+#define strtol(cp, endp, base)	simple_strtol(cp, endp, base)
+#endif
+
 /* adding a ramdisk needs 0x44 bytes in version 2008.10 */
 #define FDT_RAMDISK_OVERHEAD	0x80