Skip to content

Commit

Permalink
kbuild: rename SRCTREE to srctree
Browse files Browse the repository at this point in the history 
Prior to Kbuild, $(TOPDIR) or $(SRCTREE) was used for
pointing to the top of source directory.
(No difference between the two.)

In Kbuild style, $(srctree) is used for instead.
This commit renames SRCTREE to srctree and deletes the
defition of SRCTREE.

Note that SRCTREE in scripts/kernel-doc, scripts/docproc.c,
doc/DocBook/Makefile should be keep.

Signed-off-by: Masahiro Yamada <[email protected]>
  • Loading branch information
@masahir0y @trini
masahir0y authored and trini committed Mar 12, 2014
1 parent 4379ac6 commit 0128632
Show file tree
Hide file tree
Showing 17 changed files with 93 additions and 94 deletions.
5 changes: 2 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,9 @@ export srctree objtree VPATH
OBJTREE := $(objtree)
SPLTREE := $(OBJTREE)/spl
TPLTREE := $(OBJTREE)/tpl
SRCTREE := $(srctree)
export SRCTREE OBJTREE SPLTREE TPLTREE
export OBJTREE SPLTREE TPLTREE

MKCONFIG := $(SRCTREE)/mkconfig
MKCONFIG := $(srctree)/mkconfig
export MKCONFIG

# Make sure CDPATH settings don't interfere
Expand Down
2 changes: 1 addition & 1 deletion board/ait/cam_enc_4xx/config.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# (mem base + reserved)
#

UBL_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/ublimage.cfg
UBL_CONFIG = $(srctree)/board/$(BOARDDIR)/ublimage.cfg
ifndef CONFIG_SPL_BUILD
ALL-y += u-boot.ubl
else
Expand Down
2 changes: 1 addition & 1 deletion board/avnet/fx12mm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

obj-y += fx12mm.o

include $(SRCTREE)/board/xilinx/ppc405-generic/Makefile
include $(srctree)/board/xilinx/ppc405-generic/Makefile
2 changes: 1 addition & 1 deletion board/avnet/v5fx30teval/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

obj-y += v5fx30teval.o

include $(SRCTREE)/board/xilinx/ppc440-generic/Makefile
include $(srctree)/board/xilinx/ppc440-generic/Makefile
2 changes: 1 addition & 1 deletion board/xilinx/ml507/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

obj-y += ml507.o

include $(SRCTREE)/board/xilinx/ppc440-generic/Makefile
include $(srctree)/board/xilinx/ppc440-generic/Makefile
2 changes: 1 addition & 1 deletion config.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ OBJCOPYFLAGS :=
# Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains
# CPU-specific code.
CPUDIR=arch/$(ARCH)/cpu/$(CPU)
ifneq ($(SRCTREE)/$(CPUDIR),$(wildcard $(SRCTREE)/$(CPUDIR)))
ifneq ($(srctree)/$(CPUDIR),$(wildcard $(srctree)/$(CPUDIR)))
CPUDIR=arch/$(ARCH)/cpu
endif

Expand Down
4 changes: 2 additions & 2 deletions mkconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ fi
#
if [ -n "$KBUILD_SRC" ] ; then
mkdir -p ${OBJTREE}/include
LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
LNPREFIX=${srctree}/arch/${arch}/include/asm/
cd ${OBJTREE}/include
mkdir -p asm
else
Expand All @@ -126,7 +126,7 @@ if [ "${arch}" = "arm" ] ; then
fi

if [ -z "$KBUILD_SRC" ] ; then
cd ${SRCTREE}/include
cd ${srctree}/include
fi

#
Expand Down
18 changes: 9 additions & 9 deletions nand_spl/board/freescale/mpc8315erdb/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,28 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# create symbolic links for common files

$(obj)/start.S:
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc83xx/start.S $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc83xx/start.S $@

$(obj)/nand_boot_fsl_elbc.c:
ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c $@
ln -sf $(srctree)/nand_spl/nand_boot_fsl_elbc.c $@

$(obj)/sdram.c:
ln -sf $(SRCTREE)/board/$(BOARDDIR)/sdram.c $@
ln -sf $(srctree)/board/$(BOARDDIR)/sdram.c $@

$(obj)/$(BOARD).c:
ln -sf $(SRCTREE)/board/$(BOARDDIR)/$(BOARD).c $@
ln -sf $(srctree)/board/$(BOARDDIR)/$(BOARD).c $@

$(obj)/ns16550.c:
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@
ln -sf $(srctree)/drivers/serial/ns16550.c $@

$(obj)/spl_minimal.c:
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc83xx/spl_minimal.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc83xx/spl_minimal.c $@

$(obj)/cache.c:
ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@
ln -sf $(srctree)/arch/powerpc/lib/cache.c $@

$(obj)/time.c:
ln -sf $(SRCTREE)/arch/powerpc/lib/time.c $@
ln -sf $(srctree)/arch/powerpc/lib/time.c $@

$(obj)/ticks.S:
ln -sf $(SRCTREE)/arch/powerpc/lib/ticks.S $@
ln -sf $(srctree)/arch/powerpc/lib/ticks.S $@
24 changes: 12 additions & 12 deletions nand_spl/board/freescale/mpc8536ds/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)

$(obj)/cache.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@
ln -sf $(srctree)/arch/powerpc/lib/cache.c $@

$(obj)/cpu_init_early.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $@

$(obj)/spl_minimal.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/spl_minimal.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/spl_minimal.c $@

$(obj)/fsl_law.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc8xxx/law.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@

$(obj)/law.c:
@rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $@
ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@

$(obj)/nand_boot_fsl_elbc.c:
@rm -f $@
ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c $@
ln -sf $(srctree)/nand_spl/nand_boot_fsl_elbc.c $@

$(obj)/ns16550.c:
@rm -f $@
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@
ln -sf $(srctree)/drivers/serial/ns16550.c $@

$(obj)/resetvec.S:
@rm -f $@
ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@
ln -s $(srctree)/$(CPUDIR)/resetvec.S $@

$(obj)/fixed_ivor.S:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $@

$(obj)/start.S: $(obj)/fixed_ivor.S
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/start.S $@

$(obj)/tlb.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/tlb.c $@

$(obj)/tlb_table.c:
@rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@
ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@
24 changes: 12 additions & 12 deletions nand_spl/board/freescale/mpc8569mds/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)

$(obj)/cache.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@
ln -sf $(srctree)/arch/powerpc/lib/cache.c $@

$(obj)/cpu_init_early.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $@

$(obj)/spl_minimal.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/spl_minimal.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/spl_minimal.c $@

$(obj)/fsl_law.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc8xxx/law.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@

$(obj)/law.c:
@rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $@
ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@

$(obj)/nand_boot_fsl_elbc.c:
@rm -f $@
ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c $@
ln -sf $(srctree)/nand_spl/nand_boot_fsl_elbc.c $@

$(obj)/ns16550.c:
@rm -f $@
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@
ln -sf $(srctree)/drivers/serial/ns16550.c $@

$(obj)/resetvec.S:
@rm -f $@
ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@
ln -s $(srctree)/$(CPUDIR)/resetvec.S $@

$(obj)/fixed_ivor.S:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $@

$(obj)/start.S: $(obj)/fixed_ivor.S
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/start.S $@

$(obj)/tlb.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/tlb.c $@

$(obj)/tlb_table.c:
@rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@
ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@
24 changes: 12 additions & 12 deletions nand_spl/board/freescale/mpc8572ds/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)

$(obj)/cache.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@
ln -sf $(srctree)/arch/powerpc/lib/cache.c $@

$(obj)/cpu_init_early.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $@

$(obj)/spl_minimal.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/spl_minimal.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/spl_minimal.c $@

$(obj)/fsl_law.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc8xxx/law.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@

$(obj)/law.c:
@rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $@
ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@

$(obj)/nand_boot_fsl_elbc.c:
@rm -f $@
ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c $@
ln -sf $(srctree)/nand_spl/nand_boot_fsl_elbc.c $@

$(obj)/ns16550.c:
@rm -f $@
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@
ln -sf $(srctree)/drivers/serial/ns16550.c $@

$(obj)/resetvec.S:
@rm -f $@
ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@
ln -s $(srctree)/$(CPUDIR)/resetvec.S $@

$(obj)/fixed_ivor.S:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $@

$(obj)/start.S: $(obj)/fixed_ivor.S
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/start.S $@

$(obj)/tlb.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/tlb.c $@

$(obj)/tlb_table.c:
@rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@
ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@
24 changes: 12 additions & 12 deletions nand_spl/board/freescale/p1023rds/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,48 +44,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)

$(obj)/cache.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@
ln -sf $(srctree)/arch/powerpc/lib/cache.c $@

$(obj)/cpu_init_early.c:
@rm -f $@
ln -sf $(SRCTREE)/$(CPUDIR)/cpu_init_early.c $@
ln -sf $(srctree)/$(CPUDIR)/cpu_init_early.c $@

$(obj)/spl_minimal.c:
@rm -f $@
ln -sf $(SRCTREE)/$(CPUDIR)/spl_minimal.c $@
ln -sf $(srctree)/$(CPUDIR)/spl_minimal.c $@

$(obj)/fsl_law.c:
@rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc8xxx/law.c $@
ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@

$(obj)/law.c:
@rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $@
ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@

$(obj)/nand_boot_fsl_elbc.c:
@rm -f $@
ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c $@
ln -sf $(srctree)/nand_spl/nand_boot_fsl_elbc.c $@

$(obj)/ns16550.c:
@rm -f $@
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@
ln -sf $(srctree)/drivers/serial/ns16550.c $@

$(obj)/resetvec.S:
@rm -f $@
ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@
ln -s $(srctree)/$(CPUDIR)/resetvec.S $@

$(obj)/fixed_ivor.S:
@rm -f $@
ln -sf $(SRCTREE)/$(CPUDIR)/fixed_ivor.S $@
ln -sf $(srctree)/$(CPUDIR)/fixed_ivor.S $@

$(obj)/start.S: $(obj)/fixed_ivor.S
@rm -f $@
ln -sf $(SRCTREE)/$(CPUDIR)/start.S $@
ln -sf $(srctree)/$(CPUDIR)/start.S $@

$(obj)/tlb.c:
@rm -f $@
ln -sf $(SRCTREE)/$(CPUDIR)/tlb.c $@
ln -sf $(srctree)/$(CPUDIR)/tlb.c $@

$(obj)/tlb_table.c:
@rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@
ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@
Loading

0 comments on commit 0128632

Please sign in to comment.