[PATCH 40/41] scripts/dtc: Update fdt.h to the latest version

[PATCH 40/41] scripts/dtc: Update fdt.h to the latest version

[Thomas Huth]

Update the header to this upstream version to change the
__ASSEMBLY__ macro into __ASSEMBLER__ :

https://web.git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=f4c53f4ebf78

Cc: Rob Herring <robh@kernel.org>
Cc: Saravana Kannan <saravanak@google.com>
Cc: devicetree@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 scripts/dtc/libfdt/fdt.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/dtc/libfdt/fdt.h b/scripts/dtc/libfdt/fdt.h
index 0c91aa7f67b5b..a07abfcc71089 100644
--- a/scripts/dtc/libfdt/fdt.h
+++ b/scripts/dtc/libfdt/fdt.h
@@ -7,7 +7,7 @@
  * Copyright 2012 Kim Phillips, Freescale Semiconductor.
  */
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 
 struct fdt_header {
 	fdt32_t magic;			 /* magic word FDT_MAGIC */
@@ -45,7 +45,7 @@ struct fdt_property {
 	char data[];
 };
 
-#endif /* !__ASSEMBLY */
+#endif /* !__ASSEMBLER__ */
 
 #define FDT_MAGIC	0xd00dfeed	/* 4: version, 4: total size */
 #define FDT_TAGSIZE	sizeof(fdt32_t)
-- 
2.48.1

Re: [PATCH 40/41] scripts/dtc: Update fdt.h to the latest version

[Rob Herring]

On Fri, Mar 14, 2025 at 08:10:11AM +0100, Thomas Huth wrote:
> Update the header to this upstream version to change the
> __ASSEMBLY__ macro into __ASSEMBLER__ :
> 
> https://web.git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=f4c53f4ebf78
> 
> Cc: Rob Herring <robh@kernel.org>
> Cc: Saravana Kannan <saravanak@google.com>
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  scripts/dtc/libfdt/fdt.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Are you wanting me to apply this or ack it? Normally we only change dtc 
with the sync with upstream script.

Or maybe it doesn't matter? Do we use this header in any assembly in the 
kernel? Offhand, I don't think so.

Rob

Re: [PATCH 40/41] scripts/dtc: Update fdt.h to the latest version

[Thomas Huth]

On 14/03/2025 21.47, Rob Herring wrote:
> On Fri, Mar 14, 2025 at 08:10:11AM +0100, Thomas Huth wrote:
>> Update the header to this upstream version to change the
>> __ASSEMBLY__ macro into __ASSEMBLER__ :
>>
>> https://web.git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=f4c53f4ebf78
>>
>> Cc: Rob Herring <robh@kernel.org>
>> Cc: Saravana Kannan <saravanak@google.com>
>> Cc: devicetree@vger.kernel.org
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   scripts/dtc/libfdt/fdt.h | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Are you wanting me to apply this or ack it? Normally we only change dtc
> with the sync with upstream script.

As long as this series is still under discussion, I think an ack is sufficient.

  Thanks,
   Thomas