linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

kbuild: rename OBJTREE to objtree

Browse Source 
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>
This commit is contained in:
Masahiro Yamada
2014-03-11 11:05:21 +09:00
committed by Tom Rini
parent 01286329b2
commit 5ee828ca95
14 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -165,10 +165,9 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
export srctree objtree VPATH export srctree objtree VPATH
OBJTREE := $(objtree) SPLTREE := $(objtree)/spl
SPLTREE := $(OBJTREE)/spl TPLTREE := $(objtree)/tpl
TPLTREE := $(OBJTREE)/tpl export SPLTREE TPLTREE
export OBJTREE SPLTREE TPLTREE
MKCONFIG := $(srctree)/mkconfig MKCONFIG := $(srctree)/mkconfig
export MKCONFIG export MKCONFIG

2
arch/m68k/cpu/mcf52x2/config.mk
View File

@ -7,7 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # 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)) is5208:=$(shell grep CONFIG_M5208 $(srctree)/include/$(cfg))
is5249:=$(shell grep CONFIG_M5249 $(srctree)/include/$(cfg)) is5249:=$(shell grep CONFIG_M5249 $(srctree)/include/$(cfg))
is5253:=$(shell grep CONFIG_M5253 $(srctree)/include/$(cfg)) is5253:=$(shell grep CONFIG_M5253 $(srctree)/include/$(cfg))

2
arch/m68k/cpu/mcf532x/config.mk
View File

@ -7,7 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # 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)) is5301x:=$(shell grep CONFIG_MCF5301x $(srctree)/include/$(cfg))
is532x:=$(shell grep CONFIG_MCF532x $(srctree)/include/$(cfg)) is532x:=$(shell grep CONFIG_MCF532x $(srctree)/include/$(cfg))

2
arch/m68k/cpu/mcf5445x/config.mk
View File

@ -9,7 +9,7 @@
# SPDX-License-Identifier: GPL-2.0+ # 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)) is5441x:=$(shell grep CONFIG_MCF5441x $(srctree)/include/$(cfg))
ifneq (,$(findstring CONFIG_MCF5441x,$(is5441x))) ifneq (,$(findstring CONFIG_MCF5441x,$(is5441x)))

2
arch/powerpc/cpu/ppc4xx/config.mk
View File

@ -7,7 +7,7 @@
PLATFORM_CPPFLAGS += -DCONFIG_4xx -mstring -msoft-float 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)) is440:=$(shell grep CONFIG_440 $(srctree)/include/$(cfg))
ifneq (,$(findstring CONFIG_440,$(is440))) ifneq (,$(findstring CONFIG_440,$(is440)))

4
mkconfig
View File

@ -104,9 +104,9 @@ fi
# Create link to architecture specific headers # Create link to architecture specific headers
# #
if [ -n "$KBUILD_SRC" ] ; then if [ -n "$KBUILD_SRC" ] ; then
mkdir -p ${OBJTREE}/include mkdir -p ${objtree}/include
LNPREFIX=${srctree}/arch/${arch}/include/asm/ LNPREFIX=${srctree}/arch/${arch}/include/asm/
cd ${OBJTREE}/include cd ${objtree}/include
mkdir -p asm mkdir -p asm
else else
cd arch/${arch}/include cd arch/${arch}/include

2
nand_spl/board/freescale/mpc8315erdb/Makefile
View File

@ -8,7 +8,7 @@
PAD_TO := 0xfff04000 PAD_TO := 0xfff04000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDSCRIPT= $(srctree)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

2
nand_spl/board/freescale/mpc8536ds/Makefile
View File

@ -10,7 +10,7 @@
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000 CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
PAD_TO := 0xfff01000 PAD_TO := 0xfff01000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

2
nand_spl/board/freescale/mpc8569mds/Makefile
View File

@ -10,7 +10,7 @@
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000 CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
PAD_TO := 0xfff01000 PAD_TO := 0xfff01000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

2
nand_spl/board/freescale/mpc8572ds/Makefile
View File

@ -10,7 +10,7 @@
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000 CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
PAD_TO := 0xfff01000 PAD_TO := 0xfff01000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

2
nand_spl/board/freescale/p1023rds/Makefile
View File

@ -6,7 +6,7 @@
PAD_TO := 0xfff01000 PAD_TO := 0xfff01000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

2
nand_spl/board/freescale/p1_p2_rdb/Makefile
View File

@ -10,7 +10,7 @@
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000 CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
PAD_TO := 0xfff01000 PAD_TO := 0xfff01000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

2
nand_spl/board/sheldon/simpc8313/Makefile
View File

@ -9,7 +9,7 @@
include $(srctree)/$(src)/config.mk include $(srctree)/$(src)/config.mk
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDSCRIPT= $(srctree)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \

8
spl/Makefile
View File

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