[PATCH u-boot-v2016.07] libfdt: Make it compatible with newer dtc

[PATCH u-boot-v2016.07] libfdt: Make it compatible with newer dtc

[Patrick Williams]

From: Alejandro Enedino Hernandez Samaniego <aehs29@gmail.com>

DTC does not use an underscore for the LIBFDT_H and
LIBFDT_ENV_H variables, this causes an error since
u-boot does.

Remove the underscore from these variables to allow u-boot
to compile along with dtc.

Signed-off-by: Alejandro Enedino Hernandez Samaniego <aehs29@gmail.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
---
 include/libfdt.h     | 4 ++--
 include/libfdt_env.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/libfdt.h b/include/libfdt.h
index 74b1d149c2..a8a6ffb445 100644
--- a/include/libfdt.h
+++ b/include/libfdt.h
@@ -1,5 +1,5 @@
-#ifndef _LIBFDT_H
-#define _LIBFDT_H
+#ifndef LIBFDT_H
+#define LIBFDT_H
 /*
  * libfdt - Flat Device Tree manipulation
  * Copyright (C) 2006 David Gibson, IBM Corporation.
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 273b5d30f8..b45c9624d8 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier:	LGPL-2.1+
  */
 
-#ifndef _LIBFDT_ENV_H
-#define _LIBFDT_ENV_H
+#ifndef LIBFDT_ENV_H
+#define LIBFDT_ENV_H
 
 #include "compiler.h"
 #include "linux/types.h"
-- 
2.26.2

Re: [PATCH u-boot-v2016.07] libfdt: Make it compatible with newer dtc

[Patrick Williams]

[-- Attachment #1: Type: text/plain, Size: 838 bytes --]

On Tue, May 12, 2020 at 04:27:55PM -0500, Patrick Williams wrote:
> From: Alejandro Enedino Hernandez Samaniego <aehs29@gmail.com>
> 
> DTC does not use an underscore for the LIBFDT_H and
> LIBFDT_ENV_H variables, this causes an error since
> u-boot does.
> 
> Remove the underscore from these variables to allow u-boot
> to compile along with dtc.
> 
> Signed-off-by: Alejandro Enedino Hernandez Samaniego <aehs29@gmail.com>
> Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
> ---

Hi Joel,

This patch is a port from facebook/openbmc to fix some failures we're
seeing building u-boot in some cases.  I originally tried to submit it
as a Yocto patch [1] and Andrew Jeffery suggested I send it to your
branch instead.

1. https://gerrit.openbmc-project.xyz/c/openbmc/meta-aspeed/+/31833

-- 
Patrick Williams

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH u-boot-v2016.07] libfdt: Make it compatible with newer dtc

[Patrick Williams]

[-- Attachment #1: Type: text/plain, Size: 986 bytes --]

Hi Joel,

Any feedback on this?

On Tue, May 12, 2020 at 04:31:35PM -0500, Patrick Williams wrote:
> On Tue, May 12, 2020 at 04:27:55PM -0500, Patrick Williams wrote:
> > From: Alejandro Enedino Hernandez Samaniego <aehs29@gmail.com>
> > 
> > DTC does not use an underscore for the LIBFDT_H and
> > LIBFDT_ENV_H variables, this causes an error since
> > u-boot does.
> > 
> > Remove the underscore from these variables to allow u-boot
> > to compile along with dtc.
> > 
> > Signed-off-by: Alejandro Enedino Hernandez Samaniego <aehs29@gmail.com>
> > Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
> > ---
> 
> Hi Joel,
> 
> This patch is a port from facebook/openbmc to fix some failures we're
> seeing building u-boot in some cases.  I originally tried to submit it
> as a Yocto patch [1] and Andrew Jeffery suggested I send it to your
> branch instead.
> 
> 1. https://gerrit.openbmc-project.xyz/c/openbmc/meta-aspeed/+/31833

-- 
Patrick Williams

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH u-boot-v2016.07] libfdt: Make it compatible with newer dtc

[Brad Bishop]

On Mon, 2020-05-18 at 14:41 -0500, Patrick Williams wrote:
> Hi Joel,
> 
> Any feedback on this?
> 
> On Tue, May 12, 2020 at 04:31:35PM -0500, Patrick Williams wrote:
> > On Tue, May 12, 2020 at 04:27:55PM -0500, Patrick Williams wrote:
> > > From: Alejandro Enedino Hernandez Samaniego <aehs29@gmail.com>
> > > 
> > > DTC does not use an underscore for the LIBFDT_H and
> > > LIBFDT_ENV_H variables, this causes an error since
> > > u-boot does.
> > > 
> > > Remove the underscore from these variables to allow u-boot
> > > to compile along with dtc.
> > > 
> > > Signed-off-by: Alejandro Enedino Hernandez Samaniego <
> > > aehs29@gmail.com>
> > > Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
> > > ---
> > 
> > Hi Joel,
> > 
> > This patch is a port from facebook/openbmc to fix some failures
> > we're
> > seeing building u-boot in some cases.  I originally tried to submit
> > it
> > as a Yocto patch [1] and Andrew Jeffery suggested I send it to your
> > branch instead.
> > 
> > 1. https://gerrit.openbmc-project.xyz/c/openbmc/meta-aspeed/+/31833

Hi Joel

Is there some other way you'd like to see this fixed?  I also ran into
the problem addressed by this patch.

thx - brad