Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kbuild: rename TOPDIR to stctree

Browse Source 
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 instead.
This commit renames TOPDIR to srctree and delete the
defition of TOPDIR.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
master
Masahiro Yamada 10 years ago committed by Tom Rini
parent f5c66bdb18
commit 4379ac6148
19 changed files with 41 additions and 42 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 19
      Makefile
  2. 14
      arch/m68k/cpu/mcf52x2/config.mk
  3. 4
      arch/m68k/cpu/mcf532x/config.mk
  4. 2
      arch/m68k/cpu/mcf5445x/config.mk
  5. 2
      arch/powerpc/cpu/ppc4xx/config.mk
  6. 2
      board/hymod/config.mk
  7. 2
      board/korat/config.mk
  8. 8
      config.mk
  9. 2
      doc/README.SPL
  10. 2
      doc/README.TPL
  11. 2
      doc/README.commands
  12. 2
      nand_spl/board/freescale/mpc8315erdb/Makefile
  13. 2
      nand_spl/board/freescale/mpc8536ds/Makefile
  14. 2
      nand_spl/board/freescale/mpc8569mds/Makefile
  15. 2
      nand_spl/board/freescale/mpc8572ds/Makefile
  16. 2
      nand_spl/board/freescale/p1023rds/Makefile
  17. 2
      nand_spl/board/freescale/p1_p2_rdb/Makefile
  18. 2
      nand_spl/board/sheldon/simpc8313/Makefile
  19. 10
      spl/Makefile

19
Makefile
Unescape View File

@ -169,8 +169,7 @@ OBJTREE := $(objtree)
SPLTREE := $(OBJTREE)/spl SPLTREE := $(OBJTREE)/spl
TPLTREE := $(OBJTREE)/tpl TPLTREE := $(OBJTREE)/tpl
SRCTREE := $(srctree) SRCTREE := $(srctree)
TOPDIR := $(SRCTREE) export SRCTREE OBJTREE SPLTREE TPLTREE
export TOPDIR SRCTREE OBJTREE SPLTREE TPLTREE
MKCONFIG := $(SRCTREE)/mkconfig MKCONFIG := $(SRCTREE)/mkconfig
export MKCONFIG export MKCONFIG
@ -490,7 +489,7 @@ endif
# standard location. # standard location.
ifndef LDSCRIPT ifndef LDSCRIPT
#LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug #LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot.lds.debug
ifdef CONFIG_SYS_LDSCRIPT ifdef CONFIG_SYS_LDSCRIPT
# need to strip off double quotes # need to strip off double quotes
LDSCRIPT := $(srctree)/$(CONFIG_SYS_LDSCRIPT:"%"=%) LDSCRIPT := $(srctree)/$(CONFIG_SYS_LDSCRIPT:"%"=%)
@ -500,19 +499,19 @@ endif
# If there is no specified link script, we look in a number of places for it # If there is no specified link script, we look in a number of places for it
ifndef LDSCRIPT ifndef LDSCRIPT
ifeq ($(CONFIG_NAND_U_BOOT),y) ifeq ($(CONFIG_NAND_U_BOOT),y)
LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot-nand.lds
ifeq ($(wildcard $(LDSCRIPT)),) ifeq ($(wildcard $(LDSCRIPT)),)
LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds LDSCRIPT := $(srctree)/$(CPUDIR)/u-boot-nand.lds
endif endif
endif endif
ifeq ($(wildcard $(LDSCRIPT)),) ifeq ($(wildcard $(LDSCRIPT)),)
LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot.lds
endif endif
ifeq ($(wildcard $(LDSCRIPT)),) ifeq ($(wildcard $(LDSCRIPT)),)
LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds LDSCRIPT := $(srctree)/$(CPUDIR)/u-boot.lds
endif endif
ifeq ($(wildcard $(LDSCRIPT)),) ifeq ($(wildcard $(LDSCRIPT)),)
LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot.lds LDSCRIPT := $(srctree)/arch/$(ARCH)/cpu/u-boot.lds
endif endif
endif endif
@ -666,7 +665,7 @@ export PLATFORM_LIBS
# Pass the version down so we can handle backwards compatibility # Pass the version down so we can handle backwards compatibility
# on the fly. # on the fly.
LDPPFLAGS += \ LDPPFLAGS += \
-include $(TOPDIR)/include/u-boot/u-boot.lds.h \ -include $(srctree)/include/u-boot/u-boot.lds.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')
@ -1240,7 +1239,7 @@ distclean: mrproper
-type f -print | xargs rm -f -type f -print | xargs rm -f
backup: backup:
F=`basename $(TOPDIR)` ; cd .. ; \ F=`basename $(srctree)` ; cd .. ; \
gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
help: help:

14
arch/m68k/cpu/mcf52x2/config.mk
Unescape View File

@ -8,13 +8,13 @@
# #
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 $(TOPDIR)/include/$(cfg)) is5208:=$(shell grep CONFIG_M5208 $(srctree)/include/$(cfg))
is5249:=$(shell grep CONFIG_M5249 $(TOPDIR)/include/$(cfg)) is5249:=$(shell grep CONFIG_M5249 $(srctree)/include/$(cfg))
is5253:=$(shell grep CONFIG_M5253 $(TOPDIR)/include/$(cfg)) is5253:=$(shell grep CONFIG_M5253 $(srctree)/include/$(cfg))
is5271:=$(shell grep CONFIG_M5271 $(TOPDIR)/include/$(cfg)) is5271:=$(shell grep CONFIG_M5271 $(srctree)/include/$(cfg))
is5272:=$(shell grep CONFIG_M5272 $(TOPDIR)/include/$(cfg)) is5272:=$(shell grep CONFIG_M5272 $(srctree)/include/$(cfg))
is5275:=$(shell grep CONFIG_M5275 $(TOPDIR)/include/$(cfg)) is5275:=$(shell grep CONFIG_M5275 $(srctree)/include/$(cfg))
is5282:=$(shell grep CONFIG_M5282 $(TOPDIR)/include/$(cfg)) is5282:=$(shell grep CONFIG_M5282 $(srctree)/include/$(cfg))
ifneq (,$(findstring CONFIG_M5208,$(is5208))) ifneq (,$(findstring CONFIG_M5208,$(is5208)))
PLATFORM_CPPFLAGS += -mcpu=5208 PLATFORM_CPPFLAGS += -mcpu=5208

4
arch/m68k/cpu/mcf532x/config.mk
Unescape View File

@ -8,8 +8,8 @@
# #
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 $(TOPDIR)/include/$(cfg)) is5301x:=$(shell grep CONFIG_MCF5301x $(srctree)/include/$(cfg))
is532x:=$(shell grep CONFIG_MCF532x $(TOPDIR)/include/$(cfg)) is532x:=$(shell grep CONFIG_MCF532x $(srctree)/include/$(cfg))
ifneq (,$(findstring CONFIG_MCF5301x,$(is5301x))) ifneq (,$(findstring CONFIG_MCF5301x,$(is5301x)))
PLATFORM_CPPFLAGS += -mcpu=53015 -fPIC PLATFORM_CPPFLAGS += -mcpu=53015 -fPIC

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

@ -10,7 +10,7 @@
# #
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 $(TOPDIR)/include/$(cfg)) is5441x:=$(shell grep CONFIG_MCF5441x $(srctree)/include/$(cfg))
ifneq (,$(findstring CONFIG_MCF5441x,$(is5441x))) ifneq (,$(findstring CONFIG_MCF5441x,$(is5441x)))
PLATFORM_CPPFLAGS += -mcpu=54418 -fPIC PLATFORM_CPPFLAGS += -mcpu=54418 -fPIC

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

@ -8,7 +8,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 $(TOPDIR)/include/$(cfg)) is440:=$(shell grep CONFIG_440 $(srctree)/include/$(cfg))
ifneq (,$(findstring CONFIG_440,$(is440))) ifneq (,$(findstring CONFIG_440,$(is440)))
PLATFORM_CPPFLAGS += -Wa,-m440 -mcpu=440 PLATFORM_CPPFLAGS += -Wa,-m440 -mcpu=440

2
board/hymod/config.mk
Unescape View File

@ -9,6 +9,6 @@
# HYMOD boards # HYMOD boards
# #
PLATFORM_CPPFLAGS += -I$(TOPDIR) PLATFORM_CPPFLAGS += -I$(srctree)
OBJCOPYFLAGS = --remove-section=.ppcenv OBJCOPYFLAGS = --remove-section=.ppcenv

2
board/korat/config.mk
Unescape View File

@ -23,5 +23,5 @@ PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8CFF0000
endif endif
ifndef CONFIG_KORAT_PERMANENT ifndef CONFIG_KORAT_PERMANENT
LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-F7FC.lds LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot-F7FC.lds
endif endif

8
config.mk
Unescape View File

@ -29,11 +29,11 @@ ifneq ($(SRCTREE)/$(CPUDIR),$(wildcard $(SRCTREE)/$(CPUDIR)))
CPUDIR=arch/$(ARCH)/cpu CPUDIR=arch/$(ARCH)/cpu
endif endif
sinclude $(TOPDIR)/arch/$(ARCH)/config.mk # include architecture dependend rules sinclude $(srctree)/arch/$(ARCH)/config.mk # include architecture dependend rules
sinclude $(TOPDIR)/$(CPUDIR)/config.mk # include CPU specific rules sinclude $(srctree)/$(CPUDIR)/config.mk # include CPU specific rules
ifdef SOC ifdef SOC
sinclude $(TOPDIR)/$(CPUDIR)/$(SOC)/config.mk # include SoC specific rules sinclude $(srctree)/$(CPUDIR)/$(SOC)/config.mk # include SoC specific rules
endif endif
ifneq ($(BOARD),) ifneq ($(BOARD),)
ifdef VENDOR ifdef VENDOR
@ -43,7 +43,7 @@ BOARDDIR = $(BOARD)
endif endif
endif endif
ifdef BOARD ifdef BOARD
sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules sinclude $(srctree)/board/$(BOARDDIR)/config.mk # include board specific rules
endif endif
######################################################################### #########################################################################

2
doc/README.SPL
Unescape View File

@ -13,7 +13,7 @@ can be reused. No code duplication or symlinking is necessary anymore.
How it works How it works
------------ ------------
There is a new directory TOPDIR/spl which contains only a Makefile. There is a new directory $(srctree)/spl which contains only a Makefile.
The object files are built separately for SPL and placed in this directory. The object files are built separately for SPL and placed in this directory.
The final binaries which are generated are u-boot-spl, u-boot-spl.bin and The final binaries which are generated are u-boot-spl, u-boot-spl.bin and
u-boot-spl.map. u-boot-spl.map.

2
doc/README.TPL
Unescape View File

@ -19,7 +19,7 @@ board can be reused. No code duplication or symlinking is necessary anymore.
How it works How it works
------------ ------------
There has been a directory TOPDIR/spl which contains only a Makefile. The There has been a directory $(srctree)/spl which contains only a Makefile. The
Makefile is shared by SPL and TPL. Makefile is shared by SPL and TPL.
The object files are built separately for SPL/TPL and placed in the The object files are built separately for SPL/TPL and placed in the

2
doc/README.commands
Unescape View File

@ -28,7 +28,7 @@ these symbols when linking full U-Boot even though they are not
referenced in the source code as such. referenced in the source code as such.
If a new board is defined do not forget to define the command section If a new board is defined do not forget to define the command section
by writing in u-boot.lds ($(TOPDIR)/board/boardname/u-boot.lds) these by writing in u-boot.lds ($(srctree)/board/boardname/u-boot.lds) these
3 lines: 3 lines:
.u_boot_list : { .u_boot_list : {

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

@ -10,7 +10,7 @@ PAD_TO := 0xfff04000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/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) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL

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

@ -12,7 +12,7 @@ PAD_TO := 0xfff01000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/$(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) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL

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

@ -12,7 +12,7 @@ PAD_TO := 0xfff01000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/$(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) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL

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

@ -12,7 +12,7 @@ PAD_TO := 0xfff01000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/$(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) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL

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

@ -8,7 +8,7 @@ PAD_TO := 0xfff01000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/$(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) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL

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

@ -12,7 +12,7 @@ PAD_TO := 0xfff01000
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/$(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) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL

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

@ -11,7 +11,7 @@ include $(srctree)/$(src)/config.mk
nandobj := $(OBJTREE)/nand_spl/ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/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) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL

10
spl/Makefile
Unescape View File

@ -44,7 +44,7 @@ else
-include include/spl-autoconf.mk -include include/spl-autoconf.mk
endif endif
include $(TOPDIR)/config.mk include $(srctree)/config.mk
# Enable garbage collection of un-used sections for SPL # Enable garbage collection of un-used sections for SPL
KBUILD_CFLAGS += -ffunction-sections -fdata-sections KBUILD_CFLAGS += -ffunction-sections -fdata-sections
@ -149,13 +149,13 @@ LDSCRIPT := $(addprefix $(SRCTREE)/,$(CONFIG_SPL_LDSCRIPT:"%"=%))
endif endif
ifeq ($(wildcard $(LDSCRIPT)),) ifeq ($(wildcard $(LDSCRIPT)),)
LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-spl.lds LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot-spl.lds
endif endif
ifeq ($(wildcard $(LDSCRIPT)),) ifeq ($(wildcard $(LDSCRIPT)),)
LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-spl.lds LDSCRIPT := $(srctree)/$(CPUDIR)/u-boot-spl.lds
endif endif
ifeq ($(wildcard $(LDSCRIPT)),) ifeq ($(wildcard $(LDSCRIPT)),)
LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot-spl.lds LDSCRIPT := $(srctree)/arch/$(ARCH)/cpu/u-boot-spl.lds
endif endif
ifeq ($(wildcard $(LDSCRIPT)),) ifeq ($(wildcard $(LDSCRIPT)),)
$(error could not find linker script) $(error could not find linker script)
@ -165,7 +165,7 @@ endif
# Pass the version down so we can handle backwards compatibility # Pass the version down so we can handle backwards compatibility
# on the fly. # on the fly.
LDPPFLAGS += \ LDPPFLAGS += \
-include $(TOPDIR)/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 | \

Write Preview
Loading…
Cancel
Save