kbuild: rename SRCTREE to srctree

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 <yamada.m@jp.panasonic.com>

diff --git a/Makefile b/Makefile
index f18f3eb4f528c62a61732e7c93d3fb8fcadb5332..a8ca5e90b065e32b4e24199b422e1e7a00bcf14b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -168,10 +168,9 @@ export srctree objtree VPATH
 OBJTREE                := $(objtree)
 SPLTREE                := $(OBJTREE)/spl
 TPLTREE                := $(OBJTREE)/tpl
 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
 export MKCONFIG
 
 # Make sure CDPATH settings don't interfere

diff --git a/board/ait/cam_enc_4xx/config.mk b/board/ait/cam_enc_4xx/config.mk
index c7cfacacba8f601e2eec3c58efce06e31a94cb12..2022151309bb81c9d6354b39e6d472a6a87be7da 100644 (file)
--- a/board/ait/cam_enc_4xx/config.mk
+++ b/board/ait/cam_enc_4xx/config.mk
@@ -7,7 +7,7 @@
 # (mem base + reserved)
 #
 
 # (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
 ifndef CONFIG_SPL_BUILD
 ALL-y += u-boot.ubl
 else

diff --git a/board/avnet/fx12mm/Makefile b/board/avnet/fx12mm/Makefile
index 37fb02f0aafa11a7d36b1645d82a53962eaa8b72..618b42f8917cc76562efb91858c7911708906f69 100644 (file)
--- a/board/avnet/fx12mm/Makefile
+++ b/board/avnet/fx12mm/Makefile
@@ -8,4 +8,4 @@
 
 obj-y  += fx12mm.o
 
 
 obj-y  += fx12mm.o
 

-include $(SRCTREE)/board/xilinx/ppc405-generic/Makefile
+include $(srctree)/board/xilinx/ppc405-generic/Makefile

diff --git a/board/avnet/v5fx30teval/Makefile b/board/avnet/v5fx30teval/Makefile
index f7d0417a2c9f6dc323baf28f8bad6e906a7565b7..8c41af02d4f29c90f52a7666a99ce60d0c88e50b 100644 (file)
--- a/board/avnet/v5fx30teval/Makefile
+++ b/board/avnet/v5fx30teval/Makefile
@@ -8,4 +8,4 @@
 
 obj-y  += v5fx30teval.o
 
 
 obj-y  += v5fx30teval.o
 

-include $(SRCTREE)/board/xilinx/ppc440-generic/Makefile
+include $(srctree)/board/xilinx/ppc440-generic/Makefile

diff --git a/board/xilinx/ml507/Makefile b/board/xilinx/ml507/Makefile
index 3c84651063eb4f0b11c73309617cec744ad3e29e..9a3809f3c06572548c53ff2364aede85c638f69f 100644 (file)
--- a/board/xilinx/ml507/Makefile
+++ b/board/xilinx/ml507/Makefile
@@ -8,4 +8,4 @@
 
 obj-y  += ml507.o
 
 
 obj-y  += ml507.o
 

-include $(SRCTREE)/board/xilinx/ppc440-generic/Makefile
+include $(srctree)/board/xilinx/ppc440-generic/Makefile

diff --git a/config.mk b/config.mk
index 9bf4eda56361db6f5c9c566097f83988f1336f7b..05864aabb5a99c92864161b59b2fae3fdbb16a83 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -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)
 # 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
 
 CPUDIR=arch/$(ARCH)/cpu
 endif
 

diff --git a/mkconfig b/mkconfig
index b755d2ac699bb504024f0e510eae74fd5f152bfb..17ff29819985f122aa192b74c911ee2fd9499c77 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -105,7 +105,7 @@ fi
 #
 if [ -n "$KBUILD_SRC" ] ; then
        mkdir -p ${OBJTREE}/include
 #
 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
        cd ${OBJTREE}/include
        mkdir -p asm
 else


@@ -126,7 +126,7 @@ if [ "${arch}" = "arm" ] ; then
 fi
 
 if [ -z "$KBUILD_SRC" ] ; then
 fi
 
 if [ -z "$KBUILD_SRC" ] ; then

-       cd ${SRCTREE}/include
+       cd ${srctree}/include

 fi
 
 #
 fi
 
 #

diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index 4eec00f03cfb34ecd07dfd4638fa059979db0d11..e3c87cf88e534747615f2231d79fde7f0dac6d13 100644 (file)
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -44,28 +44,28 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # create symbolic links for common files
 
 $(obj)/start.S:
 # 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:
 
 $(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:
 
 $(obj)/sdram.c:

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

 
 $(obj)/$(BOARD).c:
 
 $(obj)/$(BOARD).c:

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

 
 $(obj)/ns16550.c:
 
 $(obj)/ns16550.c:

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

 
 $(obj)/spl_minimal.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:
 
 $(obj)/cache.c:

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

 
 $(obj)/time.c:
 
 $(obj)/time.c:

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

 
 $(obj)/ticks.S:
 
 $(obj)/ticks.S:

-       ln -sf $(SRCTREE)/arch/powerpc/lib/ticks.S $@
+       ln -sf $(srctree)/arch/powerpc/lib/ticks.S $@

diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index 9a9823d0328a296829cc616ad926945a177a93f5..eefa44da6c2d7d6e763d763a6514347814309d7f 100644 (file)
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
 
 $(obj)/cache.c:
        @rm -f $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(obj)/ns16550.c:
        @rm -f $@

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

 
 $(obj)/resetvec.S:
        @rm -f $@
 
 $(obj)/resetvec.S:
        @rm -f $@

-       ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@
+       ln -s $(srctree)/$(CPUDIR)/resetvec.S $@

 
 $(obj)/fixed_ivor.S:
        @rm -f $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(obj)/tlb_table.c:
        @rm -f $@

-       ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@
+       ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@

diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index 9a9823d0328a296829cc616ad926945a177a93f5..eefa44da6c2d7d6e763d763a6514347814309d7f 100644 (file)
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
 
 $(obj)/cache.c:
        @rm -f $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(obj)/ns16550.c:
        @rm -f $@

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

 
 $(obj)/resetvec.S:
        @rm -f $@
 
 $(obj)/resetvec.S:
        @rm -f $@

-       ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@
+       ln -s $(srctree)/$(CPUDIR)/resetvec.S $@

 
 $(obj)/fixed_ivor.S:
        @rm -f $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(obj)/tlb_table.c:
        @rm -f $@

-       ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@
+       ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@

diff --git a/nand_spl/board/freescale/mpc8572ds/Makefile b/nand_spl/board/freescale/mpc8572ds/Makefile
index 9a9823d0328a296829cc616ad926945a177a93f5..eefa44da6c2d7d6e763d763a6514347814309d7f 100644 (file)
--- a/nand_spl/board/freescale/mpc8572ds/Makefile
+++ b/nand_spl/board/freescale/mpc8572ds/Makefile
@@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
 
 $(obj)/cache.c:
        @rm -f $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(obj)/ns16550.c:
        @rm -f $@

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

 
 $(obj)/resetvec.S:
        @rm -f $@
 
 $(obj)/resetvec.S:
        @rm -f $@

-       ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@
+       ln -s $(srctree)/$(CPUDIR)/resetvec.S $@

 
 $(obj)/fixed_ivor.S:
        @rm -f $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(obj)/tlb_table.c:
        @rm -f $@

-       ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@
+       ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@

diff --git a/nand_spl/board/freescale/p1023rds/Makefile b/nand_spl/board/freescale/p1023rds/Makefile
index 9e8698b2f6e8e1b6da6520020ded08cfc88eb446..f5e567c77c065db17e33a9ab71d56febcb802c8c 100644 (file)
--- a/nand_spl/board/freescale/p1023rds/Makefile
+++ b/nand_spl/board/freescale/p1023rds/Makefile
@@ -44,48 +44,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
 
 $(obj)/cache.c:
        @rm -f $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(obj)/ns16550.c:
        @rm -f $@

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

 
 $(obj)/resetvec.S:
        @rm -f $@
 
 $(obj)/resetvec.S:
        @rm -f $@

-       ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@
+       ln -s $(srctree)/$(CPUDIR)/resetvec.S $@

 
 $(obj)/fixed_ivor.S:
        @rm -f $@
 
 $(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 $@
 
 $(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 $@
 
 $(obj)/tlb.c:
        @rm -f $@

-       ln -sf $(SRCTREE)/$(CPUDIR)/tlb.c $@
+       ln -sf $(srctree)/$(CPUDIR)/tlb.c $@

 
 $(obj)/tlb_table.c:
        @rm -f $@
 
 $(obj)/tlb_table.c:
        @rm -f $@

-       ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@
+       ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@

diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index 9a9823d0328a296829cc616ad926945a177a93f5..eefa44da6c2d7d6e763d763a6514347814309d7f 100644 (file)
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
 
 $(obj)/cache.c:
        @rm -f $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(obj)/ns16550.c:
        @rm -f $@

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

 
 $(obj)/resetvec.S:
        @rm -f $@
 
 $(obj)/resetvec.S:
        @rm -f $@

-       ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@
+       ln -s $(srctree)/$(CPUDIR)/resetvec.S $@

 
 $(obj)/fixed_ivor.S:
        @rm -f $@
 
 $(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 $@
 
 $(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 $@
 
 $(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 $@
 
 $(obj)/tlb_table.c:
        @rm -f $@

-       ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@
+       ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@

diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index e08a9a03b5025f204c1a7fb4c4d70b448dcbbd11..664301cc4c73e921ff99c8249386dd888be5db98 100644 (file)
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -46,36 +46,36 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 
 $(obj)/start.S:
        @rm -f $@
 
 $(obj)/start.S:
        @rm -f $@

-       ln -s $(SRCTREE)/arch/powerpc/cpu/mpc83xx/start.S $@
+       ln -s $(srctree)/arch/powerpc/cpu/mpc83xx/start.S $@

 
 $(obj)/nand_boot_fsl_elbc.c:
        @rm -f $@
 
 $(obj)/nand_boot_fsl_elbc.c:
        @rm -f $@

-       ln -s $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c $@
+       ln -s $(srctree)/nand_spl/nand_boot_fsl_elbc.c $@

 
 $(obj)/sdram.c:
        @rm -f $@
 
 $(obj)/sdram.c:
        @rm -f $@

-       ln -s $(SRCTREE)/board/$(BOARDDIR)/sdram.c $@
+       ln -s $(srctree)/board/$(BOARDDIR)/sdram.c $@

 
 $(obj)/$(BOARD).c:
        @rm -f $@
 
 $(obj)/$(BOARD).c:
        @rm -f $@

-       ln -s $(SRCTREE)/board/$(BOARDDIR)/$(BOARD).c $@
+       ln -s $(srctree)/board/$(BOARDDIR)/$(BOARD).c $@

 
 $(obj)/ns16550.c:
        @rm -f $@
 
 $(obj)/ns16550.c:
        @rm -f $@

-       ln -s $(SRCTREE)/drivers/serial/ns16550.c $@
+       ln -s $(srctree)/drivers/serial/ns16550.c $@

 
 $(obj)/spl_minimal.c:
        @rm -f $@
 
 $(obj)/spl_minimal.c:
        @rm -f $@

-       ln -s $(SRCTREE)/arch/powerpc/cpu/mpc83xx/spl_minimal.c $@
+       ln -s $(srctree)/arch/powerpc/cpu/mpc83xx/spl_minimal.c $@

 
 $(obj)/cache.c:
        @rm -f $@
 
 $(obj)/cache.c:
        @rm -f $@

-       ln -s $(SRCTREE)/arch/powerpc/lib/cache.c $@
+       ln -s $(srctree)/arch/powerpc/lib/cache.c $@

 
 $(obj)/time.c:
        @rm -f $@
 
 $(obj)/time.c:
        @rm -f $@

-       ln -s $(SRCTREE)/arch/powerpc/lib/time.c $@
+       ln -s $(srctree)/arch/powerpc/lib/time.c $@

 
 $(obj)/ticks.S:
        @rm -f $@
 
 $(obj)/ticks.S:
        @rm -f $@

-       ln -s $(SRCTREE)/arch/powerpc/lib/ticks.S $@
+       ln -s $(srctree)/arch/powerpc/lib/ticks.S $@

diff --git a/spl/Makefile b/spl/Makefile
index 640db8b95ca45e43fcd8742b94b3162a93f6202d..b89a579f892b94cae8d3cbab2d0786eb6d58395d 100644 (file)
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -68,7 +68,7 @@ include/tpl-autoconf.mk: include/config.h
 include/spl-autoconf.mk: include/config.h
        $(call cmd,autoconf)
 
 include/spl-autoconf.mk: include/config.h
        $(call cmd,autoconf)
 

-HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(SRCTREE)/board/$(VENDOR)/common/Makefile),y,n)
+HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makefile),y,n)

 
 ifdef  CONFIG_SPL_START_S_PATH
 START_PATH := $(CONFIG_SPL_START_S_PATH:"%"=%)
 
 ifdef  CONFIG_SPL_START_S_PATH
 START_PATH := $(CONFIG_SPL_START_S_PATH:"%"=%)


@@ -145,7 +145,7 @@ u-boot-spl-main := $(libs-y)
 # Linker Script
 ifdef CONFIG_SPL_LDSCRIPT
 # need to strip off double quotes
 # Linker Script
 ifdef CONFIG_SPL_LDSCRIPT
 # need to strip off double quotes

-LDSCRIPT := $(addprefix $(SRCTREE)/,$(CONFIG_SPL_LDSCRIPT:"%"=%))
+LDSCRIPT := $(addprefix $(srctree)/,$(CONFIG_SPL_LDSCRIPT:"%"=%))

 endif
 
 ifeq ($(wildcard $(LDSCRIPT)),)
 endif
 
 ifeq ($(wildcard $(LDSCRIPT)),)

diff --git a/tools/Makefile b/tools/Makefile
index bac6aafc80b3019fc840ee12235a0be700fe2616..097cc1df17838af2f0904f1f6a361efb94d328d2 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -172,10 +172,10 @@ endif # !LOGO_BMP
 # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
 # Define _GNU_SOURCE to obtain the getline prototype from stdio.h
 #
 # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
 # Define _GNU_SOURCE to obtain the getline prototype from stdio.h
 #

-HOST_EXTRACFLAGS += -include $(SRCTREE)/include/libfdt_env.h \
+HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \

                $(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \
                $(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \

-               -I$(SRCTREE)/lib/libfdt \
-               -I$(SRCTREE)/tools \
+               -I$(srctree)/lib/libfdt \
+               -I$(srctree)/tools \

                -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
                -DUSE_HOSTCC \
                -D__KERNEL_STRICT_NAMES \
                -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
                -DUSE_HOSTCC \
                -D__KERNEL_STRICT_NAMES \

diff --git a/tools/env/Makefile b/tools/env/Makefile
index 6ad81fdb330dac971b4410a182a189afc031bb51..fcb752ddb44f292eccb6ba09b770c5b35bba1314 100644 (file)
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -12,7 +12,7 @@ HOSTCC = $(CC)
 
 # Compile for a hosted environment on the target
 HOST_EXTRACFLAGS  = $(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \
 
 # Compile for a hosted environment on the target
 HOST_EXTRACFLAGS  = $(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \

-               -idirafter $(SRCTREE)/tools/env \
+               -idirafter $(srctree)/tools/env \

                -DUSE_HOSTCC \
                -DTEXT_BASE=$(TEXT_BASE)
 
                -DUSE_HOSTCC \
                -DTEXT_BASE=$(TEXT_BASE)