Skip to contentSkip to conversation

of: clean-up unnecessary libfdt include paths

PATCH In review Rob Herring 4 participants 5 messages Jun 3, 2015 – Jun 4, 2015

Subsystems (4)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 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.

Cc Ralf Baechle <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Grant Likely <[email protected]>
---
 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(-)
arch/mips/cavium-octeon/Makefile +0 -3
index 69a8a8d..2a59265 100644
@@ -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
arch/mips/mti-sead3/Makefile +0 -2
index ecd71db..2e52cbd 100644
@@ -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
arch/powerpc/kernel/Makefile +0 -1
index c1ebbda..c16e836 100644
@@ -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
drivers/firmware/efi/libstub/Makefile +0 -2
index 280bc0a..816dbe9 100644
@@ -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.
drivers/of/Makefile +0 -3
index fcacb18..156c072 100644
@@ -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
Signature · 1 line
2.1.0
Acked-by on v1 1/1
#1 lore raw
Quoted 14 lines · Rob Herring

Date: Wed, 3 Jun 2015 00:10:25 -0500
From: Rob Herring <[email protected]>
To: [email protected], [email protected]
Cc: Grant Likely <[email protected]>, Rob Herring <[email protected]>,
Ralf Baechle <[email protected]>, Benjamin Herrenschmidt <[email protected]>, Paul Mackerras <[email protected]>, Michael Ellerman <[email protected]>, [email protected], [email protected]
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.

Quoted 8 lines
Cc Ralf Baechle <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Grant Likely <[email protected]>

For the MIPS bits;

Ralf

Acked-by
#2 lore raw
Quoted 24 lines · Ralf Baechle
Quoted 14 lines · Rob Herring

Date: Wed, 3 Jun 2015 00:10:25 -0500
From: Rob Herring <[email protected]>
To: [email protected], [email protected]
Cc: Grant Likely <[email protected]>, Rob Herring <[email protected]>,
Ralf Baechle <[email protected]>, Benjamin Herrenschmidt <[email protected]>, Paul Mackerras <[email protected]>, Michael Ellerman <[email protected]>, [email protected], [email protected]
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.

Quoted 8 lines
Cc Ralf Baechle <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Grant Likely <[email protected]>
Quoted 5 lines

For the MIPS bits;

Ralf

reviewer Acked-by on v1 1/1
#3 lore raw
In reply to Rob Herring
Quoted 3 lines · Rob Herring

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" ?

arch/powerpc/kernel/Makefile line 7

Quoted 12 lines
arch/powerpc/kernel/Makefile +0 -1
index c1ebbda..c16e836 100644
@@ -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

cheers
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

author maintainer
#4 lore raw
Quoted 6 lines · Michael Ellerman
Quoted 3 lines · Rob Herring

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 9 lines
Quoted 9 lines
arch/powerpc/kernel/Makefile +0 -0
index c1ebbda..c16e836 100644
@@ -2,7 +2,6 @@
 # Makefile for the linux kernel.
 #
 
Quoted 6 lines

arch/powerpc/kernel/Makefile line 7

Quoted 4 lines
arch/powerpc/kernel/Makefile +0 -1
-CFLAGS_prom.o                = -I$(src)/../../../scripts/dtc/libfdt
 CFLAGS_ptrace.o              += -DUTS_MACHINE='"$(UTS_MACHINE)"'
 
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror

Thanks.

Rob