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>
This commit is contained in:
Masahiro Yamada 2014-03-11 11:05:20 +09:00 committed by Tom Rini
parent 4379ac6148
commit 01286329b2
17 changed files with 93 additions and 94 deletions

View File

@ -168,10 +168,9 @@ export srctree objtree VPATH
OBJTREE := $(objtree) OBJTREE := $(objtree)
SPLTREE := $(OBJTREE)/spl SPLTREE := $(OBJTREE)/spl
TPLTREE := $(OBJTREE)/tpl TPLTREE := $(OBJTREE)/tpl
SRCTREE := $(srctree) export OBJTREE SPLTREE TPLTREE
export SRCTREE OBJTREE SPLTREE TPLTREE
MKCONFIG := $(SRCTREE)/mkconfig MKCONFIG := $(srctree)/mkconfig
export MKCONFIG export MKCONFIG
# Make sure CDPATH settings don't interfere # Make sure CDPATH settings don't interfere

View File

@ -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 ifndef CONFIG_SPL_BUILD
ALL-y += u-boot.ubl ALL-y += u-boot.ubl
else else

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -25,7 +25,7 @@ OBJCOPYFLAGS :=
# Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains # Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains
# CPU-specific code. # CPU-specific code.
CPUDIR=arch/$(ARCH)/cpu/$(CPU) CPUDIR=arch/$(ARCH)/cpu/$(CPU)
ifneq ($(SRCTREE)/$(CPUDIR),$(wildcard $(SRCTREE)/$(CPUDIR))) ifneq ($(srctree)/$(CPUDIR),$(wildcard $(srctree)/$(CPUDIR)))
CPUDIR=arch/$(ARCH)/cpu CPUDIR=arch/$(ARCH)/cpu
endif endif

View File

@ -105,7 +105,7 @@ fi
# #
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
@ -126,7 +126,7 @@ if [ "${arch}" = "arm" ] ; then
fi fi
if [ -z "$KBUILD_SRC" ] ; then if [ -z "$KBUILD_SRC" ] ; then
cd ${SRCTREE}/include cd ${srctree}/include
fi fi
# #

View File

@ -44,28 +44,28 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# create symbolic links for common files # create symbolic links for common files
$(obj)/start.S: $(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 $@

View File

@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
$(obj)/cache.c: $(obj)/cache.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@ ln -sf $(srctree)/arch/powerpc/lib/cache.c $@
$(obj)/cpu_init_early.c: $(obj)/cpu_init_early.c:
@rm -f $@ @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: $(obj)/spl_minimal.c:
@rm -f $@ @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: $(obj)/fsl_law.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc8xxx/law.c $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@
$(obj)/law.c: $(obj)/law.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $@ ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@
$(obj)/nand_boot_fsl_elbc.c: $(obj)/nand_boot_fsl_elbc.c:
@rm -f $@ @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: $(obj)/ns16550.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@ ln -sf $(srctree)/drivers/serial/ns16550.c $@
$(obj)/resetvec.S: $(obj)/resetvec.S:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@ ln -s $(srctree)/$(CPUDIR)/resetvec.S $@
$(obj)/fixed_ivor.S: $(obj)/fixed_ivor.S:
@rm -f $@ @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 $(obj)/start.S: $(obj)/fixed_ivor.S
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/start.S $@
$(obj)/tlb.c: $(obj)/tlb.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/tlb.c $@
$(obj)/tlb_table.c: $(obj)/tlb_table.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@ ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@

View File

@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
$(obj)/cache.c: $(obj)/cache.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@ ln -sf $(srctree)/arch/powerpc/lib/cache.c $@
$(obj)/cpu_init_early.c: $(obj)/cpu_init_early.c:
@rm -f $@ @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: $(obj)/spl_minimal.c:
@rm -f $@ @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: $(obj)/fsl_law.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc8xxx/law.c $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@
$(obj)/law.c: $(obj)/law.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $@ ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@
$(obj)/nand_boot_fsl_elbc.c: $(obj)/nand_boot_fsl_elbc.c:
@rm -f $@ @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: $(obj)/ns16550.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@ ln -sf $(srctree)/drivers/serial/ns16550.c $@
$(obj)/resetvec.S: $(obj)/resetvec.S:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@ ln -s $(srctree)/$(CPUDIR)/resetvec.S $@
$(obj)/fixed_ivor.S: $(obj)/fixed_ivor.S:
@rm -f $@ @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 $(obj)/start.S: $(obj)/fixed_ivor.S
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/start.S $@
$(obj)/tlb.c: $(obj)/tlb.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/tlb.c $@
$(obj)/tlb_table.c: $(obj)/tlb_table.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@ ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@

View File

@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
$(obj)/cache.c: $(obj)/cache.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@ ln -sf $(srctree)/arch/powerpc/lib/cache.c $@
$(obj)/cpu_init_early.c: $(obj)/cpu_init_early.c:
@rm -f $@ @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: $(obj)/spl_minimal.c:
@rm -f $@ @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: $(obj)/fsl_law.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc8xxx/law.c $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@
$(obj)/law.c: $(obj)/law.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $@ ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@
$(obj)/nand_boot_fsl_elbc.c: $(obj)/nand_boot_fsl_elbc.c:
@rm -f $@ @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: $(obj)/ns16550.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@ ln -sf $(srctree)/drivers/serial/ns16550.c $@
$(obj)/resetvec.S: $(obj)/resetvec.S:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@ ln -s $(srctree)/$(CPUDIR)/resetvec.S $@
$(obj)/fixed_ivor.S: $(obj)/fixed_ivor.S:
@rm -f $@ @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 $(obj)/start.S: $(obj)/fixed_ivor.S
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/start.S $@
$(obj)/tlb.c: $(obj)/tlb.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/tlb.c $@
$(obj)/tlb_table.c: $(obj)/tlb_table.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@ ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@

View File

@ -44,48 +44,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
$(obj)/cache.c: $(obj)/cache.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@ ln -sf $(srctree)/arch/powerpc/lib/cache.c $@
$(obj)/cpu_init_early.c: $(obj)/cpu_init_early.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/$(CPUDIR)/cpu_init_early.c $@ ln -sf $(srctree)/$(CPUDIR)/cpu_init_early.c $@
$(obj)/spl_minimal.c: $(obj)/spl_minimal.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/$(CPUDIR)/spl_minimal.c $@ ln -sf $(srctree)/$(CPUDIR)/spl_minimal.c $@
$(obj)/fsl_law.c: $(obj)/fsl_law.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc8xxx/law.c $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@
$(obj)/law.c: $(obj)/law.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $@ ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@
$(obj)/nand_boot_fsl_elbc.c: $(obj)/nand_boot_fsl_elbc.c:
@rm -f $@ @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: $(obj)/ns16550.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@ ln -sf $(srctree)/drivers/serial/ns16550.c $@
$(obj)/resetvec.S: $(obj)/resetvec.S:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@ ln -s $(srctree)/$(CPUDIR)/resetvec.S $@
$(obj)/fixed_ivor.S: $(obj)/fixed_ivor.S:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/$(CPUDIR)/fixed_ivor.S $@ ln -sf $(srctree)/$(CPUDIR)/fixed_ivor.S $@
$(obj)/start.S: $(obj)/fixed_ivor.S $(obj)/start.S: $(obj)/fixed_ivor.S
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/$(CPUDIR)/start.S $@ ln -sf $(srctree)/$(CPUDIR)/start.S $@
$(obj)/tlb.c: $(obj)/tlb.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/$(CPUDIR)/tlb.c $@ ln -sf $(srctree)/$(CPUDIR)/tlb.c $@
$(obj)/tlb_table.c: $(obj)/tlb_table.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@ ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@

View File

@ -48,48 +48,48 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
$(obj)/cache.c: $(obj)/cache.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@ ln -sf $(srctree)/arch/powerpc/lib/cache.c $@
$(obj)/cpu_init_early.c: $(obj)/cpu_init_early.c:
@rm -f $@ @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: $(obj)/spl_minimal.c:
@rm -f $@ @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: $(obj)/fsl_law.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc8xxx/law.c $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@
$(obj)/law.c: $(obj)/law.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $@ ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@
$(obj)/nand_boot_fsl_elbc.c: $(obj)/nand_boot_fsl_elbc.c:
@rm -f $@ @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: $(obj)/ns16550.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@ ln -sf $(srctree)/drivers/serial/ns16550.c $@
$(obj)/resetvec.S: $(obj)/resetvec.S:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@ ln -s $(srctree)/$(CPUDIR)/resetvec.S $@
$(obj)/fixed_ivor.S: $(obj)/fixed_ivor.S:
@rm -f $@ @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 $(obj)/start.S: $(obj)/fixed_ivor.S
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/start.S $@
$(obj)/tlb.c: $(obj)/tlb.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/tlb.c $@
$(obj)/tlb_table.c: $(obj)/tlb_table.c:
@rm -f $@ @rm -f $@
ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@ ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@

View File

@ -46,36 +46,36 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
$(obj)/start.S: $(obj)/start.S:
@rm -f $@ @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: $(obj)/nand_boot_fsl_elbc.c:
@rm -f $@ @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: $(obj)/sdram.c:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/board/$(BOARDDIR)/sdram.c $@ ln -s $(srctree)/board/$(BOARDDIR)/sdram.c $@
$(obj)/$(BOARD).c: $(obj)/$(BOARD).c:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/board/$(BOARDDIR)/$(BOARD).c $@ ln -s $(srctree)/board/$(BOARDDIR)/$(BOARD).c $@
$(obj)/ns16550.c: $(obj)/ns16550.c:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/drivers/serial/ns16550.c $@ ln -s $(srctree)/drivers/serial/ns16550.c $@
$(obj)/spl_minimal.c: $(obj)/spl_minimal.c:
@rm -f $@ @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: $(obj)/cache.c:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/arch/powerpc/lib/cache.c $@ ln -s $(srctree)/arch/powerpc/lib/cache.c $@
$(obj)/time.c: $(obj)/time.c:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/arch/powerpc/lib/time.c $@ ln -s $(srctree)/arch/powerpc/lib/time.c $@
$(obj)/ticks.S: $(obj)/ticks.S:
@rm -f $@ @rm -f $@
ln -s $(SRCTREE)/arch/powerpc/lib/ticks.S $@ ln -s $(srctree)/arch/powerpc/lib/ticks.S $@

View File

@ -68,7 +68,7 @@ include/tpl-autoconf.mk: include/config.h
include/spl-autoconf.mk: include/config.h include/spl-autoconf.mk: include/config.h
$(call cmd,autoconf) $(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 ifdef CONFIG_SPL_START_S_PATH
START_PATH := $(CONFIG_SPL_START_S_PATH:"%"=%) START_PATH := $(CONFIG_SPL_START_S_PATH:"%"=%)
@ -145,7 +145,7 @@ u-boot-spl-main := $(libs-y)
# Linker Script # Linker Script
ifdef CONFIG_SPL_LDSCRIPT ifdef CONFIG_SPL_LDSCRIPT
# need to strip off double quotes # need to strip off double quotes
LDSCRIPT := $(addprefix $(SRCTREE)/,$(CONFIG_SPL_LDSCRIPT:"%"=%)) LDSCRIPT := $(addprefix $(srctree)/,$(CONFIG_SPL_LDSCRIPT:"%"=%))
endif endif
ifeq ($(wildcard $(LDSCRIPT)),) ifeq ($(wildcard $(LDSCRIPT)),)

View File

@ -172,10 +172,10 @@ endif # !LOGO_BMP
# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
# Define _GNU_SOURCE to obtain the getline prototype from stdio.h # 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)/lib/libfdt \
-I$(SRCTREE)/tools \ -I$(srctree)/tools \
-DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
-DUSE_HOSTCC \ -DUSE_HOSTCC \
-D__KERNEL_STRICT_NAMES \ -D__KERNEL_STRICT_NAMES \

2
tools/env/Makefile vendored
View File

@ -12,7 +12,7 @@ HOSTCC = $(CC)
# Compile for a hosted environment on the target # Compile for a hosted environment on the target
HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \ HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \
-idirafter $(SRCTREE)/tools/env \ -idirafter $(srctree)/tools/env \
-DUSE_HOSTCC \ -DUSE_HOSTCC \
-DTEXT_BASE=$(TEXT_BASE) -DTEXT_BASE=$(TEXT_BASE)