kbuild: rename OBJTREE to objtree

Prior to Kbuild, $(OBJTREE) was used for pointing to the
top of build directory with absolute path.

In Kbuild style, $(objtree) is used instead.
This commit renames OBJTREE to objtree and delete the
defition of OBJTREE.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/Makefile b/Makefile
index a8ca5e90b065e32b4e24199b422e1e7a00bcf14b..fa1e0ae1839ea86bf69a9362cdc277ccbcc9f897 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -165,10 +165,9 @@ VPATH              := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
 
 export srctree objtree VPATH
 
-OBJTREE                := $(objtree)
-SPLTREE                := $(OBJTREE)/spl
-TPLTREE                := $(OBJTREE)/tpl
-export OBJTREE SPLTREE TPLTREE
+SPLTREE                := $(objtree)/spl
+TPLTREE                := $(objtree)/tpl
+export SPLTREE TPLTREE
 
 MKCONFIG       := $(srctree)/mkconfig
 export MKCONFIG

diff --git a/arch/m68k/cpu/mcf52x2/config.mk b/arch/m68k/cpu/mcf52x2/config.mk
index ebf75e6f159981ba66781755b2eff3cdecd29952..34ad99e92c0fff107be60d1a8c6b106d28275ed1 100644 (file)
--- a/arch/m68k/cpu/mcf52x2/config.mk
+++ b/arch/m68k/cpu/mcf52x2/config.mk
@@ -7,7 +7,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
+cfg=$(shell grep configs $(objtree)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
 is5208:=$(shell grep CONFIG_M5208 $(srctree)/include/$(cfg))
 is5249:=$(shell grep CONFIG_M5249 $(srctree)/include/$(cfg))
 is5253:=$(shell grep CONFIG_M5253 $(srctree)/include/$(cfg))

diff --git a/arch/m68k/cpu/mcf532x/config.mk b/arch/m68k/cpu/mcf532x/config.mk
index 0a248c3da05846bb8875cb793fc56d97eef09e70..af943543a256a23cd21f1c7a3523bf2755f48aff 100644 (file)
--- a/arch/m68k/cpu/mcf532x/config.mk
+++ b/arch/m68k/cpu/mcf532x/config.mk
@@ -7,7 +7,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
+cfg=$(shell grep configs $(objtree)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
 is5301x:=$(shell grep CONFIG_MCF5301x $(srctree)/include/$(cfg))
 is532x:=$(shell grep CONFIG_MCF532x $(srctree)/include/$(cfg))
 

diff --git a/arch/m68k/cpu/mcf5445x/config.mk b/arch/m68k/cpu/mcf5445x/config.mk
index 2f310a5d7742268e96a2d75ad0d1bac679b990d5..5fd0d4d0e21a97fcfb7bbef6b0a2ca4530261692 100644 (file)
--- a/arch/m68k/cpu/mcf5445x/config.mk
+++ b/arch/m68k/cpu/mcf5445x/config.mk
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
+cfg=$(shell grep configs $(objtree)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
 is5441x:=$(shell grep CONFIG_MCF5441x $(srctree)/include/$(cfg))
 
 ifneq (,$(findstring CONFIG_MCF5441x,$(is5441x)))

diff --git a/arch/powerpc/cpu/ppc4xx/config.mk b/arch/powerpc/cpu/ppc4xx/config.mk
index 907a3dda7f7f6cf760723c44c6eb2a3db11db64a..102f069f9e9f5d9fc392dca3428256843b09ec9a 100644 (file)
--- a/arch/powerpc/cpu/ppc4xx/config.mk
+++ b/arch/powerpc/cpu/ppc4xx/config.mk
@@ -7,7 +7,7 @@
 
 PLATFORM_CPPFLAGS += -DCONFIG_4xx -mstring -msoft-float
 
-cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
+cfg=$(shell grep configs $(objtree)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
 is440:=$(shell grep CONFIG_440 $(srctree)/include/$(cfg))
 
 ifneq (,$(findstring CONFIG_440,$(is440)))

diff --git a/mkconfig b/mkconfig
index 17ff29819985f122aa192b74c911ee2fd9499c77..cd911a9dc7322ecd4b126001b31209f44debe2d7 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -104,9 +104,9 @@ fi
 # Create link to architecture specific headers
 #
 if [ -n "$KBUILD_SRC" ] ; then
-       mkdir -p ${OBJTREE}/include
+       mkdir -p ${objtree}/include
        LNPREFIX=${srctree}/arch/${arch}/include/asm/
-       cd ${OBJTREE}/include
+       cd ${objtree}/include
        mkdir -p asm
 else
        cd arch/${arch}/include

diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index e3c87cf88e534747615f2231d79fde7f0dac6d13..f4e7854d50fd7f48e711b0c07a1ec033af8c7845 100644 (file)
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -8,7 +8,7 @@
 
 PAD_TO := 0xfff04000
 
-nandobj        := $(OBJTREE)/nand_spl/
+nandobj        := $(objtree)/nand_spl/
 
 LDSCRIPT= $(srctree)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index eefa44da6c2d7d6e763d763a6514347814309d7f..c639b126fdf44274b22da445672d9a3a7a042824 100644 (file)
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -10,7 +10,7 @@
 CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
 PAD_TO := 0xfff01000
 
-nandobj        := $(OBJTREE)/nand_spl/
+nandobj        := $(objtree)/nand_spl/
 
 LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index eefa44da6c2d7d6e763d763a6514347814309d7f..c639b126fdf44274b22da445672d9a3a7a042824 100644 (file)
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -10,7 +10,7 @@
 CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
 PAD_TO := 0xfff01000
 
-nandobj        := $(OBJTREE)/nand_spl/
+nandobj        := $(objtree)/nand_spl/
 
 LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

diff --git a/nand_spl/board/freescale/mpc8572ds/Makefile b/nand_spl/board/freescale/mpc8572ds/Makefile
index eefa44da6c2d7d6e763d763a6514347814309d7f..c639b126fdf44274b22da445672d9a3a7a042824 100644 (file)
--- a/nand_spl/board/freescale/mpc8572ds/Makefile
+++ b/nand_spl/board/freescale/mpc8572ds/Makefile
@@ -10,7 +10,7 @@
 CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
 PAD_TO := 0xfff01000
 
-nandobj        := $(OBJTREE)/nand_spl/
+nandobj        := $(objtree)/nand_spl/
 
 LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

diff --git a/nand_spl/board/freescale/p1023rds/Makefile b/nand_spl/board/freescale/p1023rds/Makefile
index f5e567c77c065db17e33a9ab71d56febcb802c8c..38f67264498d2e15cd9a6c5073f7364917917fcc 100644 (file)
--- a/nand_spl/board/freescale/p1023rds/Makefile
+++ b/nand_spl/board/freescale/p1023rds/Makefile
@@ -6,7 +6,7 @@
 
 PAD_TO := 0xfff01000
 
-nandobj        := $(OBJTREE)/nand_spl/
+nandobj        := $(objtree)/nand_spl/
 
 LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index eefa44da6c2d7d6e763d763a6514347814309d7f..c639b126fdf44274b22da445672d9a3a7a042824 100644 (file)
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -10,7 +10,7 @@
 CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
 PAD_TO := 0xfff01000
 
-nandobj        := $(OBJTREE)/nand_spl/
+nandobj        := $(objtree)/nand_spl/
 
 LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index 664301cc4c73e921ff99c8249386dd888be5db98..657f65fd22164336677925cda0ca7ffce5bd1bdd 100644 (file)
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -9,7 +9,7 @@
 
 include $(srctree)/$(src)/config.mk
 
-nandobj        := $(OBJTREE)/nand_spl/
+nandobj        := $(objtree)/nand_spl/
 
 LDSCRIPT= $(srctree)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

diff --git a/spl/Makefile b/spl/Makefile
index b89a579f892b94cae8d3cbab2d0786eb6d58395d..be5fd3b53a36ec0e41ca124f53fbcfe812c0ebb0 100644 (file)
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -166,7 +166,7 @@ endif
 # on the fly.
 LDPPFLAGS += \
        -include $(srctree)/include/u-boot/u-boot.lds.h \
-       -include $(OBJTREE)/include/config.h \
+       -include $(objtree)/include/config.h \
        -DCPUDIR=$(CPUDIR) \
        $(shell $(LD) --version | \
          sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
@@ -197,9 +197,9 @@ else
 VAR_SIZE_PARAM =
 endif
 $(obj)/$(BOARD)-spl.bin: $(obj)/u-boot-spl.bin
-       $(if $(wildcard $(OBJTREE)/spl/board/samsung/$(BOARD)/tools/mk$(BOARD)spl),\
-       $(OBJTREE)/spl/board/samsung/$(BOARD)/tools/mk$(BOARD)spl,\
-       $(OBJTREE)/tools/mkexynosspl) $(VAR_SIZE_PARAM) $< $@
+       $(if $(wildcard $(objtree)/spl/board/samsung/$(BOARD)/tools/mk$(BOARD)spl),\
+       $(objtree)/spl/board/samsung/$(BOARD)/tools/mk$(BOARD)spl,\
+       $(objtree)/tools/mkexynosspl) $(VAR_SIZE_PARAM) $< $@
 endif
 
 quiet_cmd_objcopy = OBJCOPY $@