Patchwork [U-Boot] fdt: fix dts preprocessor options

login
register
mail settings
Submitter Allen Martin
Date Jan. 9, 2013, 2:07 a.m.
Message ID <1357697274-20758-1-git-send-email-amartin@nvidia.com>
Download mbox | patch
Permalink /patch/210605/
State Accepted
Delegated to: Jerry Van Baren
Headers show

Comments

Allen Martin - Jan. 9, 2013, 2:07 a.m.
Using "-ansi" preprocessor option will cause dts lines that begin with
'#' to choke the preprocessor.  Change to "-x assembler-with-cpp"
instead which is what the kernel uses to preprocess dts files.

Signed-off-by: Allen Martin <amartin@nvidia.com>
---
 dts/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Stephen Warren - Jan. 9, 2013, 3:50 a.m.
On 01/08/2013 07:07 PM, Allen Martin wrote:
> Using "-ansi" preprocessor option will cause dts lines that begin with
> '#' to choke the preprocessor.  Change to "-x assembler-with-cpp"
> instead which is what the kernel uses to preprocess dts files.

Well, it's what the kernel hopefully /will/ use if I can ever get the
patch accepted. But anyway, this seems good to me.

Reviewed-by: Stephen Warren <swarren@nvidia.com>
Simon Glass - Jan. 12, 2013, 5:02 p.m.
On Tue, Jan 8, 2013 at 6:07 PM, Allen Martin <amartin@nvidia.com> wrote:
> Using "-ansi" preprocessor option will cause dts lines that begin with
> '#' to choke the preprocessor.  Change to "-x assembler-with-cpp"
> instead which is what the kernel uses to preprocess dts files.
>
> Signed-off-by: Allen Martin <amartin@nvidia.com>

Acked-by: Simon Glass <sjg@chromium.org>

Thanks for picking this up.

> ---
>  dts/Makefile |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dts/Makefile b/dts/Makefile
> index 785104e..922c78c 100644
> --- a/dts/Makefile
> +++ b/dts/Makefile
> @@ -36,7 +36,7 @@ $(error Your architecture does not have device tree support enabled. \
>  Please define CONFIG_ARCH_DEVICE_TREE))
>
>  # We preprocess the device tree file provide a useful define
> -DTS_CPPFLAGS := -ansi \
> +DTS_CPPFLAGS := -x assembler-with-cpp \
>                 -DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" \
>                 -DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\"
>
> --
> 1.7.10.4
>

Patch

diff --git a/dts/Makefile b/dts/Makefile
index 785104e..922c78c 100644
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -36,7 +36,7 @@  $(error Your architecture does not have device tree support enabled. \
 Please define CONFIG_ARCH_DEVICE_TREE))
 
 # We preprocess the device tree file provide a useful define
-DTS_CPPFLAGS := -ansi \
+DTS_CPPFLAGS := -x assembler-with-cpp \
 		-DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" \
 		-DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\"