[PATCH] of: clean-up unnecessary libfdt include paths

With the latest dtc import include fixups, it is no longer necessary to
add explicit include paths to use libfdt. Remove these across the
kernel.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Ralf Baechle <redacted>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <redacted>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Grant Likely <redacted>
Cc: linux-mips@linux-mips.org
Cc: linuxppc-dev@lists.ozlabs.org
---
 arch/mips/cavium-octeon/Makefile      | 3 ---
 arch/mips/mti-sead3/Makefile          | 2 --
 arch/powerpc/kernel/Makefile          | 1 -
 drivers/firmware/efi/libstub/Makefile | 2 --
 drivers/of/Makefile                   | 3 ---
 5 files changed, 11 deletions(-)

diff --git a/arch/mips/cavium-octeon/Makefile b/arch/mips/cavium-octeon/Makefile
index 69a8a8d..2a59265 100644
--- a/arch/mips/cavium-octeon/Makefile
+++ b/arch/mips/cavium-octeon/Makefile

@@ -9,9 +9,6 @@
 # Copyright (C) 2005-2009 Cavium Networks
 #
 
-CFLAGS_octeon-platform.o = -I$(src)/../../../scripts/dtc/libfdt
-CFLAGS_setup.o = -I$(src)/../../../scripts/dtc/libfdt
-
 obj-y := cpu.o setup.o octeon-platform.o octeon-irq.o csrc-octeon.o
 obj-y += dma-octeon.o
 obj-y += octeon-memcpy.o

diff --git a/arch/mips/mti-sead3/Makefile b/arch/mips/mti-sead3/Makefile
index ecd71db..2e52cbd 100644
--- a/arch/mips/mti-sead3/Makefile
+++ b/arch/mips/mti-sead3/Makefile

@@ -15,5 +15,3 @@ obj-y				:= sead3-lcd.o sead3-display.o sead3-init.o \
 obj-y				+= leds-sead3.o
 
 obj-$(CONFIG_EARLY_PRINTK)	+= sead3-console.o
-
-CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index c1ebbda..c16e836 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile

@@ -2,7 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-CFLAGS_prom.o		= -I$(src)/../../../scripts/dtc/libfdt
 CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'
 
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror

diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
index 280bc0a..816dbe9 100644
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile

@@ -24,8 +24,6 @@ KASAN_SANITIZE			:= n
 lib-y				:= efi-stub-helper.o
 lib-$(CONFIG_EFI_ARMSTUB)	+= arm-stub.o fdt.o
 
-CFLAGS_fdt.o			+= -I$(srctree)/scripts/dtc/libfdt/
-
 #
 # arm64 puts the stub in the kernel proper, which will unnecessarily retain all
 # code indefinitely unless it is annotated as __init/__initdata/__initconst etc.

diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index fcacb18..156c072 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile

@@ -16,6 +16,3 @@ obj-$(CONFIG_OF_RESOLVE)  += resolver.o
 obj-$(CONFIG_OF_OVERLAY) += overlay.o
 
 obj-$(CONFIG_OF_UNITTEST) += unittest-data/
-
-CFLAGS_fdt.o = -I$(src)/../../scripts/dtc/libfdt
-CFLAGS_fdt_address.o = -I$(src)/../../scripts/dtc/libfdt

-- 
2.1.0

On Wed, Jun 03, 2015 at 12:10:25AM -0500, Rob Herring wrote:

Date:   Wed,  3 Jun 2015 00:10:25 -0500
From: Rob Herring <robh@kernel.org>
To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Grant Likely <redacted>, Rob Herring <robh@kernel.org>,
 Ralf Baechle [off-list ref], Benjamin Herrenschmidt
 [off-list ref], Paul Mackerras [off-list ref], Michael
 Ellerman [off-list ref], linux-mips@linux-mips.org,
 linuxppc-dev@lists.ozlabs.org
Subject: [PATCH] of: clean-up unnecessary libfdt include paths

With the latest dtc import include fixups, it is no longer necessary to
add explicit include paths to use libfdt. Remove these across the
kernel.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Ralf Baechle <redacted>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <redacted>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Grant Likely <redacted>
Cc: linux-mips@linux-mips.org
Cc: linuxppc-dev@lists.ozlabs.org

For the MIPS bits;

Acked-by: Ralf Baechle <redacted>

  Ralf

On Wed, 3 Jun 2015 10:26:38 +0200
, Ralf Baechle [off-list ref]
 wrote:

On Wed, Jun 03, 2015 at 12:10:25AM -0500, Rob Herring wrote:

quoted

Date:   Wed,  3 Jun 2015 00:10:25 -0500
From: Rob Herring <robh@kernel.org>
To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Grant Likely <redacted>, Rob Herring <robh@kernel.org>,
 Ralf Baechle [off-list ref], Benjamin Herrenschmidt
 [off-list ref], Paul Mackerras [off-list ref], Michael
 Ellerman [off-list ref], linux-mips@linux-mips.org,
 linuxppc-dev@lists.ozlabs.org
Subject: [PATCH] of: clean-up unnecessary libfdt include paths

With the latest dtc import include fixups, it is no longer necessary to
add explicit include paths to use libfdt. Remove these across the
kernel.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Ralf Baechle <redacted>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <redacted>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Grant Likely <redacted>
Cc: linux-mips@linux-mips.org
Cc: linuxppc-dev@lists.ozlabs.org

For the MIPS bits;

Acked-by: Ralf Baechle <redacted>

  Ralf

Acked-by: Grant Likely <redacted>

On Wed, 2015-03-06 at 05:10:25 UTC, Rob Herring wrote:

With the latest dtc import include fixups, it is no longer necessary to
add explicit include paths to use libfdt. Remove these across the
kernel.

What are the "latest dtc import include fixups" ?

Acked-by: Michael Ellerman <mpe@ellerman.id.au>


cheers

On Thu, Jun 4, 2015 at 5:20 AM, Michael Ellerman [off-list ref] wrote:

On Wed, 2015-03-06 at 05:10:25 UTC, Rob Herring wrote:

quoted

With the latest dtc import include fixups, it is no longer necessary to
add explicit include paths to use libfdt. Remove these across the
kernel.

What are the "latest dtc import include fixups" ?

Changing the scripts/dtc/libfdt/libfdt.h includes from <> to "". The
import script does this now and the recent import in my for-next tree
has this. I'll clarify this in the commit message.

quoted

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index c1ebbda..c16e836 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile

@@ -2,7 +2,6 @@
 # Makefile for the linux kernel.
 #

-CFLAGS_prom.o                = -I$(src)/../../../scripts/dtc/libfdt
 CFLAGS_ptrace.o              += -DUTS_MACHINE='"$(UTS_MACHINE)"'

 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror

Acked-by: Michael Ellerman <mpe@ellerman.id.au>

Thanks.

Rob