* [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring
@ 2014-03-11 2:05 Masahiro Yamada
2014-03-11 2:05 ` [U-Boot] [PATCH 01/12] kbuild,mxs: use short logs for MXS images Masahiro Yamada
` (11 more replies)
0 siblings, 12 replies; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
- Convert more make rules to Kbuild style to use short logs.
- Consolidate TOPDIR, OBJTREE, SRCTREE
- Other minor refactoring
Masahiro Yamada (12):
kbuild,mxs: use short logs for MXS images
kbuild: use short logs for some board specific make rules
kbuild,x86: use a short log for arch/x86/lib/libgcc.a
x86: specify CONFIG_USE_PRIVATE_LIBGCC more simply
kbuild: delete redundant LDSCRIPT definition
freescale: pblimage: refactor CONFIG_SYS_FSL_PBL_{PBI,RCW}
kirkwood: kwbimage: refactor CONFIG_SYS_KWD_CONFIG
kbuild: use $(KBUILD_SRC) to check out-of-tree build
kbuild: rename TOPDIR to stctree
kbuild: rename SRCTREE to srctree
kbuild: rename OBJTREE to objtree
kbuild: delete SPLTREE and TPLTREE
Makefile | 43 +++++++++++----------------
arch/arc/config.mk | 2 --
arch/arm/cpu/arm926ejs/mxs/Makefile | 13 ++++----
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | 4 +--
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg | 4 +--
arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd | 4 +--
arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd | 4 +--
arch/arm/include/asm/arch-kirkwood/config.h | 2 +-
arch/m68k/cpu/mcf52x2/config.mk | 16 +++++-----
arch/m68k/cpu/mcf532x/config.mk | 6 ++--
arch/m68k/cpu/mcf5445x/config.mk | 4 +--
arch/microblaze/config.mk | 2 --
arch/openrisc/config.mk | 2 --
arch/powerpc/cpu/ppc4xx/config.mk | 4 +--
arch/x86/config.mk | 4 +--
arch/x86/lib/Makefile | 5 ++--
board/ait/cam_enc_4xx/config.mk | 2 +-
board/avnet/fx12mm/Makefile | 2 +-
board/avnet/v5fx30teval/Makefile | 2 +-
board/cray/L1/Makefile | 15 ++++++++--
board/hymod/config.mk | 2 +-
board/korat/config.mk | 2 +-
board/matrix_vision/mvblm7/Makefile | 8 ++++-
board/matrix_vision/mvsmr/Makefile | 8 ++++-
board/xilinx/ml507/Makefile | 2 +-
config.mk | 10 +++----
doc/README.SPL | 2 +-
doc/README.TPL | 2 +-
doc/README.commands | 2 +-
doc/README.kwbimage | 2 +-
include/configs/B4860QDS.h | 4 +--
include/configs/P2041RDB.h | 5 ++--
include/configs/T1040QDS.h | 4 +--
include/configs/T208xQDS.h | 6 ++--
include/configs/T208xRDB.h | 4 +--
include/configs/T4240QDS.h | 4 +--
include/configs/corenet_ds.h | 14 ++++-----
include/configs/km/kmp204x-common.h | 4 +--
include/configs/km_kirkwood.h | 15 ++++------
include/configs/lacie_kw.h | 4 +--
include/configs/lsxl.h | 4 +--
mkconfig | 12 ++++----
nand_spl/board/freescale/mpc8315erdb/Makefile | 22 +++++++-------
nand_spl/board/freescale/mpc8536ds/Makefile | 28 ++++++++---------
nand_spl/board/freescale/mpc8569mds/Makefile | 28 ++++++++---------
nand_spl/board/freescale/mpc8572ds/Makefile | 28 ++++++++---------
nand_spl/board/freescale/p1023rds/Makefile | 28 ++++++++---------
nand_spl/board/freescale/p1_p2_rdb/Makefile | 28 ++++++++---------
nand_spl/board/sheldon/simpc8313/Makefile | 22 +++++++-------
spl/Makefile | 22 +++++++-------
tools/Makefile | 6 ++--
tools/env/Makefile | 2 +-
52 files changed, 235 insertions(+), 239 deletions(-)
--
1.8.3.2
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 01/12] kbuild,mxs: use short logs for MXS images
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-11 11:52 ` [U-Boot] [PATCH 01/12] kbuild, mxs: " Marek Vasut
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 02/12] kbuild: use short logs for some board specific make rules Masahiro Yamada
` (10 subsequent siblings)
11 siblings, 2 replies; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com>
---
Hi MXS board maitainers,
I think this commit is probably correct.
(I mean, it still generates correct "u-boot.sb" image)
But I could not corfirm it by binary comparison.
Every build generates a different u-boot.sb
even if no source file is changed.
I wish someone could do run test this patch.
Makefile | 2 +-
arch/arm/cpu/arm926ejs/mxs/Makefile | 13 +++++++------
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | 4 ++--
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg | 4 ++--
arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd | 4 ++--
arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd | 4 ++--
6 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index b795338..0df3780 100644
--- a/Makefile
+++ b/Makefile
@@ -858,7 +858,7 @@ u-boot.ais: spl/u-boot-spl.ais u-boot.img FORCE
$(call if_changed,pad_cat)
u-boot.sb: u-boot.bin spl/u-boot-spl.bin
- $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs $(objtree)/u-boot.sb
+ $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs u-boot.sb
# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
# Both images are created using mkimage (crc etc), so that the ROM
diff --git a/arch/arm/cpu/arm926ejs/mxs/Makefile b/arch/arm/cpu/arm926ejs/mxs/Makefile
index 152546e..1eee661 100644
--- a/arch/arm/cpu/arm926ejs/mxs/Makefile
+++ b/arch/arm/cpu/arm926ejs/mxs/Makefile
@@ -14,11 +14,12 @@ obj-y += spl_boot.o spl_lradc_init.o spl_mem_init.o spl_power_init.o
endif
# Specify the target for use in elftosb call
-MKIMAGE_TARGET-$(CONFIG_MX23) = mx23
-MKIMAGE_TARGET-$(CONFIG_MX28) = mx28
+MKIMAGE_TARGET-$(CONFIG_MX23) = mxsimage.mx23.cfg
+MKIMAGE_TARGET-$(CONFIG_MX28) = mxsimage.mx28.cfg
-$(OBJTREE)/mxsimage.cfg: $(SRCTREE)/$(CPUDIR)/$(SOC)/mxsimage.$(MKIMAGE_TARGET-y).cfg
- sed "s at OBJTREE@$(OBJTREE)@g" $^ > $@
+quiet_cmd_mkimage_mxs = UIMAGE $@
+cmd_mkimage_mxs = $(objtree)/tools/mkimage -n $< -T mxsimage $@ \
+ $(if $(KBUILD_VERBOSE:1=), >/dev/null)
-$(OBJTREE)/u-boot.sb: $(OBJTREE)/u-boot.bin $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/mxsimage.cfg
- $(OBJTREE)/tools/mkimage -n $(OBJTREE)/mxsimage.cfg -T mxsimage $@
+u-boot.sb: $(src)/$(MKIMAGE_TARGET-y) u-boot.bin spl/u-boot-spl.bin FORCE
+ $(call if_changed,mkimage_mxs)
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
index c9cf4b3..8118767 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
+++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
@@ -1,6 +1,6 @@
SECTION 0x0 BOOTABLE
TAG LAST
- LOAD 0x0 OBJTREE/spl/u-boot-spl.bin
+ LOAD 0x0 spl/u-boot-spl.bin
CALL 0x14 0x0
- LOAD 0x40000100 OBJTREE/u-boot.bin
+ LOAD 0x40000100 u-boot.bin
CALL 0x40000100 0x0
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
index 676f5c8..ea772f0 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
+++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
@@ -1,8 +1,8 @@
SECTION 0x0 BOOTABLE
TAG LAST
- LOAD 0x0 OBJTREE/spl/u-boot-spl.bin
+ LOAD 0x0 spl/u-boot-spl.bin
LOAD IVT 0x8000 0x14
CALL HAB 0x8000 0x0
- LOAD 0x40000100 OBJTREE/u-boot.bin
+ LOAD 0x40000100 u-boot.bin
LOAD IVT 0x8000 0x40000100
CALL HAB 0x8000 0x0
diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd
index 8b6c30e..3a51879 100644
--- a/arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd
+++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd
@@ -4,8 +4,8 @@ options {
}
sources {
- u_boot_spl="OBJTREE/spl/u-boot-spl.bin";
- u_boot="OBJTREE/u-boot.bin";
+ u_boot_spl="spl/u-boot-spl.bin";
+ u_boot="u-boot.bin";
}
section (0) {
diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
index a5fa648..c60615a 100644
--- a/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
+++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
@@ -1,6 +1,6 @@
sources {
- u_boot_spl="OBJTREE/spl/u-boot-spl.bin";
- u_boot="OBJTREE/u-boot.bin";
+ u_boot_spl="spl/u-boot-spl.bin";
+ u_boot="u-boot.bin";
}
section (0) {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 02/12] kbuild: use short logs for some board specific make rules
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
2014-03-11 2:05 ` [U-Boot] [PATCH 01/12] kbuild,mxs: use short logs for MXS images Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 03/12] kbuild, x86: use a short log for arch/x86/lib/libgcc.a Masahiro Yamada
` (9 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: David Updegraff <dave@cray.com>
Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
---
board/cray/L1/Makefile | 15 ++++++++++++---
board/matrix_vision/mvblm7/Makefile | 8 +++++++-
board/matrix_vision/mvsmr/Makefile | 8 +++++++-
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/board/cray/L1/Makefile b/board/cray/L1/Makefile
index 63f43da..655f530 100644
--- a/board/cray/L1/Makefile
+++ b/board/cray/L1/Makefile
@@ -9,10 +9,19 @@ obj-y = L1.o flash.o
obj-y += init.o
obj-y += bootscript.o
-$(obj)/bootscript.c: $(obj)/bootscript.image
- od -t x1 -v -A x $^ | awk -f $(srctree)/$(src)/x2c.awk > $@
+quiet_cmd_awk = AWK $@
+ cmd_awk = od -t x1 -v -A x $< | $(AWK) -f $(filter-out $<,$^) > $@
+$(obj)/bootscript.c: $(obj)/bootscript.image $(src)/x2c.awk
+ $(call cmd,awk)
+
+quiet_cmd_mkimage = UIMAGE $@
+cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
+ $(if $(KBUILD_VERBOSE:1=), >/dev/null)
+
+MKIMAGEFLAGS_bootscript.image := -A ppc -O linux -T script -C none \
+ -a 0 -e 0 -n bootscript
$(obj)/bootscript.image: $(src)/bootscript.hush
- -$(OBJTREE)/tools/mkimage -A ppc -O linux -T script -C none -a 0 -e 0 -n bootscript -d $< $@
+ $(call cmd,mkimage)
clean-files := bootscript.c bootscript.image
\ No newline@end of file
diff --git a/board/matrix_vision/mvblm7/Makefile b/board/matrix_vision/mvblm7/Makefile
index 1bc1d61..b5987fd 100644
--- a/board/matrix_vision/mvblm7/Makefile
+++ b/board/matrix_vision/mvblm7/Makefile
@@ -8,5 +8,11 @@ obj-y := mvblm7.o pci.o fpga.o
extra-y := bootscript.img
+quiet_cmd_mkimage = UIMAGE $@
+cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
+ $(if $(KBUILD_VERBOSE:1=), >/dev/null)
+
+MKIMAGEFLAGS_bootscript.image := -T script -C none -n M7_script
+
$(obj)/bootscript.img: $(src)/bootscript
- @mkimage -T script -C none -n M7_script -d $< $@
+ $(call cmd,mkimage)
diff --git a/board/matrix_vision/mvsmr/Makefile b/board/matrix_vision/mvsmr/Makefile
index 9454259..fae7ec2 100644
--- a/board/matrix_vision/mvsmr/Makefile
+++ b/board/matrix_vision/mvsmr/Makefile
@@ -12,5 +12,11 @@ obj-y := mvsmr.o fpga.o
extra-y := bootscript.img
+quiet_cmd_mkimage = UIMAGE $@
+cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
+ $(if $(KBUILD_VERBOSE:1=), >/dev/null)
+
+MKIMAGEFLAGS_bootscript.image := -T script -C none -n mvSMR_Script
+
$(obj)/bootscript.img: $(src)/bootscript
- @mkimage -T script -C none -n mvSMR_Script -d $< $@
+ $(call cmd,mkimage)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 03/12] kbuild, x86: use a short log for arch/x86/lib/libgcc.a
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
2014-03-11 2:05 ` [U-Boot] [PATCH 01/12] kbuild,mxs: use short logs for MXS images Masahiro Yamada
2014-03-11 2:05 ` [U-Boot] [PATCH 02/12] kbuild: use short logs for some board specific make rules Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 04/12] x86: specify CONFIG_USE_PRIVATE_LIBGCC more simply Masahiro Yamada
` (8 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
---
arch/x86/lib/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index a35d062..f7303ab 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -23,5 +23,6 @@ obj-$(CONFIG_CMD_ZBOOT) += zimage.o
LIBGCC := $(notdir $(NORMAL_LIBGCC))
extra-y := $(LIBGCC)
-$(obj)/$(LIBGCC): $(NORMAL_LIBGCC)
- $(OBJCOPY) $< $@ --prefix-symbols=__normal_
+OBJCOPYFLAGS := --prefix-symbols=__normal_
+$(obj)/$(LIBGCC): $(NORMAL_LIBGCC) FORCE
+ $(call if_changed,objcopy)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 04/12] x86: specify CONFIG_USE_PRIVATE_LIBGCC more simply
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
` (2 preceding siblings ...)
2014-03-11 2:05 ` [U-Boot] [PATCH 03/12] kbuild, x86: use a short log for arch/x86/lib/libgcc.a Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 05/12] kbuild: delete redundant LDSCRIPT definition Masahiro Yamada
` (7 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
---
arch/x86/config.mk | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/x86/config.mk b/arch/x86/config.mk
index 1e52a5e..38cb7c9 100644
--- a/arch/x86/config.mk
+++ b/arch/x86/config.mk
@@ -29,6 +29,4 @@ LDFLAGS_FINAL += --wrap=__divdi3 --wrap=__udivdi3
LDFLAGS_FINAL += --wrap=__moddi3 --wrap=__umoddi3
export NORMAL_LIBGCC = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
-PREFIXED_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/$(shell basename $(NORMAL_LIBGCC))
-
-CONFIG_USE_PRIVATE_LIBGCC=$(shell dirname $(PREFIXED_LIBGCC))
+CONFIG_USE_PRIVATE_LIBGCC := arch/x86/lib
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 05/12] kbuild: delete redundant LDSCRIPT definition
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
` (3 preceding siblings ...)
2014-03-11 2:05 ` [U-Boot] [PATCH 04/12] x86: specify CONFIG_USE_PRIVATE_LIBGCC more simply Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-11 9:09 ` Michal Simek
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 06/12] freescale: pblimage: refactor CONFIG_SYS_FSL_PBL_{PBI, RCW} Masahiro Yamada
` (6 subsequent siblings)
11 siblings, 2 replies; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
$(SRCTREE)/$(CPUDIR)/u-boot.lds is our default location
of arch-specific linker script.
Remove redundant definitions in
arch/{arc,microblaze,openrisc}/config.mk.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
---
arch/arc/config.mk | 2 --
arch/microblaze/config.mk | 2 --
arch/openrisc/config.mk | 2 --
3 files changed, 6 deletions(-)
diff --git a/arch/arc/config.mk b/arch/arc/config.mk
index d9f5d9d..a3b8df7 100644
--- a/arch/arc/config.mk
+++ b/arch/arc/config.mk
@@ -23,8 +23,6 @@ endif
PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -DCONFIG_ARC -gdwarf-2
-LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds
-
# Needed for relocation
LDFLAGS_FINAL += -pie
diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk
index cdb321a..98bbf79 100644
--- a/arch/microblaze/config.mk
+++ b/arch/microblaze/config.mk
@@ -15,5 +15,3 @@ endif
CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000
PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__
-
-LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds
diff --git a/arch/openrisc/config.mk b/arch/openrisc/config.mk
index 981edff..9902b9a 100644
--- a/arch/openrisc/config.mk
+++ b/arch/openrisc/config.mk
@@ -14,5 +14,3 @@ endif
PLATFORM_CPPFLAGS += -DCONFIG_OPENRISC -D__OR1K__ -ffixed-r10
CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
-
-LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 06/12] freescale: pblimage: refactor CONFIG_SYS_FSL_PBL_{PBI, RCW}
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
` (4 preceding siblings ...)
2014-03-11 2:05 ` [U-Boot] [PATCH 05/12] kbuild: delete redundant LDSCRIPT definition Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 07/12] kirkwood: kwbimage: refactor CONFIG_SYS_KWD_CONFIG Masahiro Yamada
` (5 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
Pull out "$(SRCTREE)/" from CONFIG_SYS_FSL_PBL_PBI
and CONFIG_SYS_FSL_PBL_RCW and push it into the top Makefile.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: York Sun <yorksun@freescale.com>
Cc: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
---
Makefile | 4 ++--
include/configs/B4860QDS.h | 4 ++--
include/configs/P2041RDB.h | 5 ++---
include/configs/T1040QDS.h | 4 ++--
include/configs/T208xQDS.h | 6 +++---
include/configs/T208xRDB.h | 4 ++--
include/configs/T4240QDS.h | 4 ++--
include/configs/corenet_ds.h | 14 +++++---------
include/configs/km/kmp204x-common.h | 4 ++--
9 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index 0df3780..198efa3 100644
--- a/Makefile
+++ b/Makefile
@@ -805,8 +805,8 @@ MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \
MKIMAGEFLAGS_u-boot.kwb = -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
-MKIMAGEFLAGS_u-boot.pbl = -n $(CONFIG_SYS_FSL_PBL_RCW) \
- -R $(CONFIG_SYS_FSL_PBL_PBI) -T pblimage
+MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
+ -R $(srctree)/$(CONFIG_SYS_FSL_PBL_PBI:"%"=%) -T pblimage
u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
$(call if_changed,mkimage)
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 64acc88..b248302 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -16,8 +16,8 @@
#ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
-#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/b4860qds/b4_pbi.cfg
-#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/b4860qds/b4_rcw.cfg
+#define CONFIG_SYS_FSL_PBL_PBI board/freescale/b4860qds/b4_pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/b4860qds/b4_rcw.cfg
#endif
#ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 47c6384..b3880f1 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -18,9 +18,8 @@
#ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
-#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/corenet_ds/pbi.cfg
-#define CONFIG_SYS_FSL_PBL_RCW \
- $(SRCTREE)/board/freescale/corenet_ds/rcw_p2041rdb.cfg
+#define CONFIG_SYS_FSL_PBL_PBI board/freescale/corenet_ds/pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p2041rdb.cfg
#endif
#ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index e776a46..993f9ae 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -32,8 +32,8 @@
#ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
-#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t1040qds/t1040_pbi.cfg
-#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t1040qds/t1040_rcw.cfg
+#define CONFIG_SYS_FSL_PBL_PBI board/freescale/t1040qds/t1040_pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t1040qds/t1040_rcw.cfg
#endif
/* High Level Configuration Options */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index c6a30db..399ddbb 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -48,11 +48,11 @@
#ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
-#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t208xqds/t208x_pbi.cfg
+#define CONFIG_SYS_FSL_PBL_PBI board/freescale/t208xqds/t208x_pbi.cfg
#if defined(CONFIG_PPC_T2080)
-#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t208xqds/t2080_rcw.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_rcw.cfg
#elif defined(CONFIG_PPC_T2081)
-#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t208xqds/t2081_rcw.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2081_rcw.cfg
#endif
#endif
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 979843b..743eee3 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -41,8 +41,8 @@
#ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
-#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t208xrdb/t2080_pbi.cfg
-#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t208xrdb/t2080_rcw.cfg
+#define CONFIG_SYS_FSL_PBL_PBI board/freescale/t208xrdb/t2080_pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_rcw.cfg
#endif
#define CONFIG_SRIO_PCIE_BOOT_MASTER
diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 0d43c27..56e1293 100644
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -21,8 +21,8 @@
#ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
-#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t4qds/t4_pbi.cfg
-#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t4qds/t4_rcw.cfg
+#define CONFIG_SYS_FSL_PBL_PBI board/freescale/t4qds/t4_pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t4qds/t4_rcw.cfg
#endif
#ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 72432e4..1e4bfc4 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -15,19 +15,15 @@
#ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
-#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/corenet_ds/pbi.cfg
+#define CONFIG_SYS_FSL_PBL_PBI board/freescale/corenet_ds/pbi.cfg
#if defined(CONFIG_P3041DS)
-#define CONFIG_SYS_FSL_PBL_RCW \
- $(SRCTREE)/board/freescale/corenet_ds/rcw_p3041ds.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p3041ds.cfg
#elif defined(CONFIG_P4080DS)
-#define CONFIG_SYS_FSL_PBL_RCW \
- $(SRCTREE)/board/freescale/corenet_ds/rcw_p4080ds.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p4080ds.cfg
#elif defined(CONFIG_P5020DS)
-#define CONFIG_SYS_FSL_PBL_RCW \
- $(SRCTREE)/board/freescale/corenet_ds/rcw_p5020ds.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5020ds.cfg
#elif defined(CONFIG_P5040DS)
-#define CONFIG_SYS_FSL_PBL_RCW \
- $(SRCTREE)/board/freescale/corenet_ds/rcw_p5040ds.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5040ds.cfg
#endif
#endif
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 0d24f78..582978a 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -28,8 +28,8 @@
#define CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
-#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/keymile/kmp204x/pbi.cfg
-#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/keymile/kmp204x/rcw_kmp204x.cfg
+#define CONFIG_SYS_FSL_PBL_PBI board/keymile/kmp204x/pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/keymile/kmp204x/rcw_kmp204x.cfg
/* High Level Configuration Options */
#define CONFIG_BOOKE
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 07/12] kirkwood: kwbimage: refactor CONFIG_SYS_KWD_CONFIG
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
` (5 preceding siblings ...)
2014-03-11 2:05 ` [U-Boot] [PATCH 06/12] freescale: pblimage: refactor CONFIG_SYS_FSL_PBL_{PBI, RCW} Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 08/12] kbuild: use $(KBUILD_SRC) to check out-of-tree build Masahiro Yamada
` (4 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
Pull out "$(SRCTREE)/" from CONFIG_SYS_KWD_CONFIG
and push it into the top Makefile.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Michael Walle <michael@walle.cc>
Cc: Simon Guinot <simon.guinot@sequanux.org>
Cc: Dave Purdy <david.c.purdy@gmail.com>
Cc: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Cc: Luka Perkov <luka@openwrt.org>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Cc: Jason Cooper <u-boot@lakedaemon.net>
Cc: Siddarth Gore <gores@marvell.com>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Eric Cooper <ecc@cmu.edu>
Cc: Suriyan Ramasami <suriyan.r@gmail.com>
---
Makefile | 4 ++--
arch/arm/include/asm/arch-kirkwood/config.h | 2 +-
doc/README.kwbimage | 2 +-
include/configs/km_kirkwood.h | 15 +++++----------
include/configs/lacie_kw.h | 4 ++--
include/configs/lsxl.h | 4 ++--
6 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index 198efa3..8a1fe9b 100644
--- a/Makefile
+++ b/Makefile
@@ -802,8 +802,8 @@ MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \
-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
-n "U-Boot $(UBOOTRELEASE) for $(BOARD) board"
-MKIMAGEFLAGS_u-boot.kwb = -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
- -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
+MKIMAGEFLAGS_u-boot.kwb = -n $(srctree)/$(CONFIG_SYS_KWD_CONFIG:"%"=%) \
+ -T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
-R $(srctree)/$(CONFIG_SYS_FSL_PBL_PBI:"%"=%) -T pblimage
diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h
index 197703b..7a688e4 100644
--- a/arch/arm/include/asm/arch-kirkwood/config.h
+++ b/arch/arm/include/asm/arch-kirkwood/config.h
@@ -38,7 +38,7 @@
* CONFIG_SYS_KWD_CONFIG should be defined in board specific header file
*/
#ifndef CONFIG_SYS_KWD_CONFIG
-#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg
+#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg
#endif /* CONFIG_SYS_KWD_CONFIG */
/* Kirkwood has 2k of Security SRAM, use it for SP */
diff --git a/doc/README.kwbimage b/doc/README.kwbimage
index 8ed708c..13f6f92 100644
--- a/doc/README.kwbimage
+++ b/doc/README.kwbimage
@@ -42,7 +42,7 @@ Board specific configuration file specifications:
kwbimage.cfg. The name can be set as part of the full path
to the file using CONFIG_SYS_KWD_CONFIG (probably in
include/configs/<yourboard>.h). The path should look like:
- $(SRCTREE)/$(CONFIG_BOARDDIR)/<yourkwbimagename>.cfg
+ $(CONFIG_BOARDDIR)/<yourkwbimagename>.cfg
2. This file can have empty lines and lines starting with "#" as first
character to put comments
3. This file can have configuration command lines as mentioned below,
diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h
index 2cde177..9eb1ad3 100644
--- a/include/configs/km_kirkwood.h
+++ b/include/configs/km_kirkwood.h
@@ -40,8 +40,7 @@
#define CONFIG_IDENT_STRING "\nKeymile Kirkwood 128M16"
#define CONFIG_HOSTNAME km_kirkwood_128m16
#undef CONFIG_SYS_KWD_CONFIG
-#define CONFIG_SYS_KWD_CONFIG \
- $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
+#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
#define CONFIG_KM_DISABLE_PCIE
#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/
@@ -59,8 +58,7 @@
#endif
#undef CONFIG_SYS_KWD_CONFIG
-#define CONFIG_SYS_KWD_CONFIG \
- $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
+#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
#define CONFIG_KM_ENV_IS_IN_SPI_NOR
#define CONFIG_KM_FPGA_CONFIG
#define CONFIG_KM_PIGGY4_88E6352
@@ -73,8 +71,7 @@
#define CONFIG_HOSTNAME mgcoge3un
#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/
#undef CONFIG_SYS_KWD_CONFIG
-#define CONFIG_SYS_KWD_CONFIG \
- $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-memphis.cfg
+#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-memphis.cfg
#define CONFIG_KM_BOARD_EXTRA_ENV "waitforne=true\0"
#define CONFIG_PIGGY_MAC_ADRESS_OFFSET 3
#define CONFIG_KM_DISABLE_PCIE
@@ -85,8 +82,7 @@
#define CONFIG_IDENT_STRING "\nKeymile COGE5UN"
#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/
#undef CONFIG_SYS_KWD_CONFIG
-#define CONFIG_SYS_KWD_CONFIG \
- $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_256M8_1.cfg
+#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_256M8_1.cfg
#define CONFIG_KM_ENV_IS_IN_SPI_NOR
#define CONFIG_PIGGY_MAC_ADRESS_OFFSET 3
#define CONFIG_HOSTNAME kmcoge5un
@@ -106,8 +102,7 @@
#define CONFIG_IDENT_STRING "\nKeymile SUV31"
#define CONFIG_HOSTNAME kmsuv31
#undef CONFIG_SYS_KWD_CONFIG
-#define CONFIG_SYS_KWD_CONFIG \
- $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
+#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
#define CONFIG_KM_ENV_IS_IN_SPI_NOR
#define CONFIG_KM_FPGA_CONFIG
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index f6e79ba..2d2e23a 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -80,9 +80,9 @@
* from the Network Space v2
*/
#if defined(CONFIG_INETSPACE_V2)
-#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-is2.cfg
+#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-is2.cfg
#elif defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-ns2l.cfg
+#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-ns2l.cfg
#endif
/*
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 92865df..2ae8a27 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -13,12 +13,12 @@
*/
#if defined(CONFIG_LSCHLV2)
#define CONFIG_IDENT_STRING " LS-CHLv2"
-#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-lschl.cfg
+#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lschl.cfg
#define CONFIG_MACH_TYPE 3006
#define CONFIG_SYS_TCLK 166666667 /* 166 MHz */
#elif defined(CONFIG_LSXHL)
#define CONFIG_IDENT_STRING " LS-XHL"
-#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-lsxhl.cfg
+#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lsxhl.cfg
#define CONFIG_MACH_TYPE 2663
/* CONFIG_SYS_TCLK is 200000000 by default */
#else
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 08/12] kbuild: use $(KBUILD_SRC) to check out-of-tree build
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
` (6 preceding siblings ...)
2014-03-11 2:05 ` [U-Boot] [PATCH 07/12] kirkwood: kwbimage: refactor CONFIG_SYS_KWD_CONFIG Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-12 21:07 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 09/12] kbuild: rename TOPDIR to stctree Masahiro Yamada
` (3 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
Non-empty $(KBUILD_SRC) means out-of-tree build.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
Makefile | 8 +++-----
mkconfig | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 8a1fe9b..1b1cfb8 100644
--- a/Makefile
+++ b/Makefile
@@ -556,11 +556,9 @@ export CONFIG_SYS_TEXT_BASE
# Use UBOOTINCLUDE when you must reference the include/ directory.
# Needed to be compatible with the O= option
-UBOOTINCLUDE :=
-ifneq ($(OBJTREE),$(SRCTREE))
-UBOOTINCLUDE += -I$(OBJTREE)/include
-endif
-UBOOTINCLUDE += -I$(srctree)/include \
+UBOOTINCLUDE := \
+ -Iinclude \
+ $(if $(KBUILD_SRC), -I$(srctree)/include) \
-I$(srctree)/arch/$(ARCH)/include
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
diff --git a/mkconfig b/mkconfig
index 9827e4d..b755d2a 100755
--- a/mkconfig
+++ b/mkconfig
@@ -103,7 +103,7 @@ fi
#
# Create link to architecture specific headers
#
-if [ "$SRCTREE" != "$OBJTREE" ] ; then
+if [ -n "$KBUILD_SRC" ] ; then
mkdir -p ${OBJTREE}/include
LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
cd ${OBJTREE}/include
@@ -125,7 +125,7 @@ if [ "${arch}" = "arm" ] ; then
ln -s ${LNPREFIX}proc-armv asm/proc
fi
-if [ "$SRCTREE" = "$OBJTREE" ] ; then
+if [ -z "$KBUILD_SRC" ] ; then
cd ${SRCTREE}/include
fi
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 09/12] kbuild: rename TOPDIR to stctree
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
` (7 preceding siblings ...)
2014-03-11 2:05 ` [U-Boot] [PATCH 08/12] kbuild: use $(KBUILD_SRC) to check out-of-tree build Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-12 21:07 ` [U-Boot] [U-Boot,09/12] " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 10/12] kbuild: rename SRCTREE to srctree Masahiro Yamada
` (2 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
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>
---
Makefile | 19 +++++++++----------
arch/m68k/cpu/mcf52x2/config.mk | 14 +++++++-------
arch/m68k/cpu/mcf532x/config.mk | 4 ++--
arch/m68k/cpu/mcf5445x/config.mk | 2 +-
arch/powerpc/cpu/ppc4xx/config.mk | 2 +-
board/hymod/config.mk | 2 +-
board/korat/config.mk | 2 +-
config.mk | 8 ++++----
doc/README.SPL | 2 +-
doc/README.TPL | 2 +-
doc/README.commands | 2 +-
nand_spl/board/freescale/mpc8315erdb/Makefile | 2 +-
nand_spl/board/freescale/mpc8536ds/Makefile | 2 +-
nand_spl/board/freescale/mpc8569mds/Makefile | 2 +-
nand_spl/board/freescale/mpc8572ds/Makefile | 2 +-
nand_spl/board/freescale/p1023rds/Makefile | 2 +-
nand_spl/board/freescale/p1_p2_rdb/Makefile | 2 +-
nand_spl/board/sheldon/simpc8313/Makefile | 2 +-
spl/Makefile | 10 +++++-----
19 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/Makefile b/Makefile
index 1b1cfb8..f18f3eb 100644
--- a/Makefile
+++ b/Makefile
@@ -169,8 +169,7 @@ OBJTREE := $(objtree)
SPLTREE := $(OBJTREE)/spl
TPLTREE := $(OBJTREE)/tpl
SRCTREE := $(srctree)
-TOPDIR := $(SRCTREE)
-export TOPDIR SRCTREE OBJTREE SPLTREE TPLTREE
+export SRCTREE OBJTREE SPLTREE TPLTREE
MKCONFIG := $(SRCTREE)/mkconfig
export MKCONFIG
@@ -490,7 +489,7 @@ endif
# standard location.
ifndef LDSCRIPT
- #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
+ #LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot.lds.debug
ifdef CONFIG_SYS_LDSCRIPT
# need to strip off double quotes
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
ifndef LDSCRIPT
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)),)
- LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
+ LDSCRIPT := $(srctree)/$(CPUDIR)/u-boot-nand.lds
endif
endif
ifeq ($(wildcard $(LDSCRIPT)),)
- LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
+ LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot.lds
endif
ifeq ($(wildcard $(LDSCRIPT)),)
- LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds
+ LDSCRIPT := $(srctree)/$(CPUDIR)/u-boot.lds
endif
ifeq ($(wildcard $(LDSCRIPT)),)
- LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot.lds
+ LDSCRIPT := $(srctree)/arch/$(ARCH)/cpu/u-boot.lds
endif
endif
@@ -666,7 +665,7 @@ export PLATFORM_LIBS
# Pass the version down so we can handle backwards compatibility
# on the fly.
LDPPFLAGS += \
- -include $(TOPDIR)/include/u-boot/u-boot.lds.h \
+ -include $(srctree)/include/u-boot/u-boot.lds.h \
-DCPUDIR=$(CPUDIR) \
$(shell $(LD) --version | \
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
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
help:
diff --git a/arch/m68k/cpu/mcf52x2/config.mk b/arch/m68k/cpu/mcf52x2/config.mk
index 25f98de..ebf75e6 100644
--- a/arch/m68k/cpu/mcf52x2/config.mk
+++ b/arch/m68k/cpu/mcf52x2/config.mk
@@ -8,13 +8,13 @@
#
cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
-is5208:=$(shell grep CONFIG_M5208 $(TOPDIR)/include/$(cfg))
-is5249:=$(shell grep CONFIG_M5249 $(TOPDIR)/include/$(cfg))
-is5253:=$(shell grep CONFIG_M5253 $(TOPDIR)/include/$(cfg))
-is5271:=$(shell grep CONFIG_M5271 $(TOPDIR)/include/$(cfg))
-is5272:=$(shell grep CONFIG_M5272 $(TOPDIR)/include/$(cfg))
-is5275:=$(shell grep CONFIG_M5275 $(TOPDIR)/include/$(cfg))
-is5282:=$(shell grep CONFIG_M5282 $(TOPDIR)/include/$(cfg))
+is5208:=$(shell grep CONFIG_M5208 $(srctree)/include/$(cfg))
+is5249:=$(shell grep CONFIG_M5249 $(srctree)/include/$(cfg))
+is5253:=$(shell grep CONFIG_M5253 $(srctree)/include/$(cfg))
+is5271:=$(shell grep CONFIG_M5271 $(srctree)/include/$(cfg))
+is5272:=$(shell grep CONFIG_M5272 $(srctree)/include/$(cfg))
+is5275:=$(shell grep CONFIG_M5275 $(srctree)/include/$(cfg))
+is5282:=$(shell grep CONFIG_M5282 $(srctree)/include/$(cfg))
ifneq (,$(findstring CONFIG_M5208,$(is5208)))
PLATFORM_CPPFLAGS += -mcpu=5208
diff --git a/arch/m68k/cpu/mcf532x/config.mk b/arch/m68k/cpu/mcf532x/config.mk
index 0604ab0..0a248c3 100644
--- a/arch/m68k/cpu/mcf532x/config.mk
+++ b/arch/m68k/cpu/mcf532x/config.mk
@@ -8,8 +8,8 @@
#
cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
-is5301x:=$(shell grep CONFIG_MCF5301x $(TOPDIR)/include/$(cfg))
-is532x:=$(shell grep CONFIG_MCF532x $(TOPDIR)/include/$(cfg))
+is5301x:=$(shell grep CONFIG_MCF5301x $(srctree)/include/$(cfg))
+is532x:=$(shell grep CONFIG_MCF532x $(srctree)/include/$(cfg))
ifneq (,$(findstring CONFIG_MCF5301x,$(is5301x)))
PLATFORM_CPPFLAGS += -mcpu=53015 -fPIC
diff --git a/arch/m68k/cpu/mcf5445x/config.mk b/arch/m68k/cpu/mcf5445x/config.mk
index 6da08d5..2f310a5 100644
--- a/arch/m68k/cpu/mcf5445x/config.mk
+++ b/arch/m68k/cpu/mcf5445x/config.mk
@@ -10,7 +10,7 @@
#
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)))
PLATFORM_CPPFLAGS += -mcpu=54418 -fPIC
diff --git a/arch/powerpc/cpu/ppc4xx/config.mk b/arch/powerpc/cpu/ppc4xx/config.mk
index 71c2a6c..907a3dd 100644
--- a/arch/powerpc/cpu/ppc4xx/config.mk
+++ b/arch/powerpc/cpu/ppc4xx/config.mk
@@ -8,7 +8,7 @@
PLATFORM_CPPFLAGS += -DCONFIG_4xx -mstring -msoft-float
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)))
PLATFORM_CPPFLAGS += -Wa,-m440 -mcpu=440
diff --git a/board/hymod/config.mk b/board/hymod/config.mk
index ee15890..2eeea50 100644
--- a/board/hymod/config.mk
+++ b/board/hymod/config.mk
@@ -9,6 +9,6 @@
# HYMOD boards
#
-PLATFORM_CPPFLAGS += -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -I$(srctree)
OBJCOPYFLAGS = --remove-section=.ppcenv
diff --git a/board/korat/config.mk b/board/korat/config.mk
index f8dba2b..42e0060 100644
--- a/board/korat/config.mk
+++ b/board/korat/config.mk
@@ -23,5 +23,5 @@ PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8CFF0000
endif
ifndef CONFIG_KORAT_PERMANENT
-LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-F7FC.lds
+LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot-F7FC.lds
endif
diff --git a/config.mk b/config.mk
index 4657577..9bf4eda 100644
--- a/config.mk
+++ b/config.mk
@@ -29,11 +29,11 @@ ifneq ($(SRCTREE)/$(CPUDIR),$(wildcard $(SRCTREE)/$(CPUDIR)))
CPUDIR=arch/$(ARCH)/cpu
endif
-sinclude $(TOPDIR)/arch/$(ARCH)/config.mk # include architecture dependend rules
-sinclude $(TOPDIR)/$(CPUDIR)/config.mk # include CPU specific rules
+sinclude $(srctree)/arch/$(ARCH)/config.mk # include architecture dependend rules
+sinclude $(srctree)/$(CPUDIR)/config.mk # include CPU specific rules
ifdef SOC
-sinclude $(TOPDIR)/$(CPUDIR)/$(SOC)/config.mk # include SoC specific rules
+sinclude $(srctree)/$(CPUDIR)/$(SOC)/config.mk # include SoC specific rules
endif
ifneq ($(BOARD),)
ifdef VENDOR
@@ -43,7 +43,7 @@ BOARDDIR = $(BOARD)
endif
endif
ifdef BOARD
-sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules
+sinclude $(srctree)/board/$(BOARDDIR)/config.mk # include board specific rules
endif
#########################################################################
diff --git a/doc/README.SPL b/doc/README.SPL
index b1bc3ca..57a39a4 100644
--- a/doc/README.SPL
+++ b/doc/README.SPL
@@ -13,7 +13,7 @@ can be reused. No code duplication or symlinking is necessary anymore.
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 final binaries which are generated are u-boot-spl, u-boot-spl.bin and
u-boot-spl.map.
diff --git a/doc/README.TPL b/doc/README.TPL
index 1df03b9..980debe 100644
--- a/doc/README.TPL
+++ b/doc/README.TPL
@@ -19,7 +19,7 @@ board can be reused. No code duplication or symlinking is necessary anymore.
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.
The object files are built separately for SPL/TPL and placed in the
diff --git a/doc/README.commands b/doc/README.commands
index 9eb3671..afd5577 100644
--- a/doc/README.commands
+++ b/doc/README.commands
@@ -28,7 +28,7 @@ these symbols when linking full U-Boot even though they are not
referenced in the source code as such.
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:
.u_boot_list : {
diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index f41a13a..4eec00f 100644
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -10,7 +10,7 @@ PAD_TO := 0xfff04000
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) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL
diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index f571862..9a9823d 100644
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -12,7 +12,7 @@ PAD_TO := 0xfff01000
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) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL
diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index f571862..9a9823d 100644
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -12,7 +12,7 @@ PAD_TO := 0xfff01000
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) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL
diff --git a/nand_spl/board/freescale/mpc8572ds/Makefile b/nand_spl/board/freescale/mpc8572ds/Makefile
index f571862..9a9823d 100644
--- a/nand_spl/board/freescale/mpc8572ds/Makefile
+++ b/nand_spl/board/freescale/mpc8572ds/Makefile
@@ -12,7 +12,7 @@ PAD_TO := 0xfff01000
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) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL
diff --git a/nand_spl/board/freescale/p1023rds/Makefile b/nand_spl/board/freescale/p1023rds/Makefile
index b7eedcd..9e8698b 100644
--- a/nand_spl/board/freescale/p1023rds/Makefile
+++ b/nand_spl/board/freescale/p1023rds/Makefile
@@ -8,7 +8,7 @@ PAD_TO := 0xfff01000
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) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL
diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index f571862..9a9823d 100644
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -12,7 +12,7 @@ PAD_TO := 0xfff01000
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) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL
diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index 8b29e97..e08a9a0 100644
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -11,7 +11,7 @@ include $(srctree)/$(src)/config.mk
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) $(LDFLAGS_FINAL)
asflags-y += -DCONFIG_NAND_SPL
diff --git a/spl/Makefile b/spl/Makefile
index bb3d349..640db8b 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -44,7 +44,7 @@ else
-include include/spl-autoconf.mk
endif
-include $(TOPDIR)/config.mk
+include $(srctree)/config.mk
# Enable garbage collection of un-used sections for SPL
KBUILD_CFLAGS += -ffunction-sections -fdata-sections
@@ -149,13 +149,13 @@ LDSCRIPT := $(addprefix $(SRCTREE)/,$(CONFIG_SPL_LDSCRIPT:"%"=%))
endif
ifeq ($(wildcard $(LDSCRIPT)),)
- LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-spl.lds
+ LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot-spl.lds
endif
ifeq ($(wildcard $(LDSCRIPT)),)
- LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-spl.lds
+ LDSCRIPT := $(srctree)/$(CPUDIR)/u-boot-spl.lds
endif
ifeq ($(wildcard $(LDSCRIPT)),)
- LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot-spl.lds
+ LDSCRIPT := $(srctree)/arch/$(ARCH)/cpu/u-boot-spl.lds
endif
ifeq ($(wildcard $(LDSCRIPT)),)
$(error could not find linker script)
@@ -165,7 +165,7 @@ endif
# Pass the version down so we can handle backwards compatibility
# on the fly.
LDPPFLAGS += \
- -include $(TOPDIR)/include/u-boot/u-boot.lds.h \
+ -include $(srctree)/include/u-boot/u-boot.lds.h \
-include $(OBJTREE)/include/config.h \
-DCPUDIR=$(CPUDIR) \
$(shell $(LD) --version | \
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 10/12] kbuild: rename SRCTREE to srctree
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
` (8 preceding siblings ...)
2014-03-11 2:05 ` [U-Boot] [PATCH 09/12] kbuild: rename TOPDIR to stctree Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-12 21:07 ` [U-Boot] [U-Boot,10/12] " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 11/12] kbuild: rename OBJTREE to objtree Masahiro Yamada
2014-03-11 2:05 ` [U-Boot] [PATCH 12/12] kbuild: delete SPLTREE and TPLTREE Masahiro Yamada
11 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
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>
---
Makefile | 5 ++---
board/ait/cam_enc_4xx/config.mk | 2 +-
board/avnet/fx12mm/Makefile | 2 +-
board/avnet/v5fx30teval/Makefile | 2 +-
board/xilinx/ml507/Makefile | 2 +-
config.mk | 2 +-
mkconfig | 4 ++--
nand_spl/board/freescale/mpc8315erdb/Makefile | 18 +++++++++---------
nand_spl/board/freescale/mpc8536ds/Makefile | 24 ++++++++++++------------
nand_spl/board/freescale/mpc8569mds/Makefile | 24 ++++++++++++------------
nand_spl/board/freescale/mpc8572ds/Makefile | 24 ++++++++++++------------
nand_spl/board/freescale/p1023rds/Makefile | 24 ++++++++++++------------
nand_spl/board/freescale/p1_p2_rdb/Makefile | 24 ++++++++++++------------
nand_spl/board/sheldon/simpc8313/Makefile | 18 +++++++++---------
spl/Makefile | 4 ++--
tools/Makefile | 6 +++---
tools/env/Makefile | 2 +-
17 files changed, 93 insertions(+), 94 deletions(-)
diff --git a/Makefile b/Makefile
index f18f3eb..a8ca5e9 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/board/ait/cam_enc_4xx/config.mk b/board/ait/cam_enc_4xx/config.mk
index c7cfaca..2022151 100644
--- a/board/ait/cam_enc_4xx/config.mk
+++ b/board/ait/cam_enc_4xx/config.mk
@@ -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
diff --git a/board/avnet/fx12mm/Makefile b/board/avnet/fx12mm/Makefile
index 37fb02f..618b42f 100644
--- a/board/avnet/fx12mm/Makefile
+++ b/board/avnet/fx12mm/Makefile
@@ -8,4 +8,4 @@
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 f7d0417..8c41af0 100644
--- a/board/avnet/v5fx30teval/Makefile
+++ b/board/avnet/v5fx30teval/Makefile
@@ -8,4 +8,4 @@
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 3c84651..9a3809f 100644
--- a/board/xilinx/ml507/Makefile
+++ b/board/xilinx/ml507/Makefile
@@ -8,4 +8,4 @@
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 9bf4eda..05864aa 100644
--- 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)
-ifneq ($(SRCTREE)/$(CPUDIR),$(wildcard $(SRCTREE)/$(CPUDIR)))
+ifneq ($(srctree)/$(CPUDIR),$(wildcard $(srctree)/$(CPUDIR)))
CPUDIR=arch/$(ARCH)/cpu
endif
diff --git a/mkconfig b/mkconfig
index b755d2a..17ff298 100755
--- a/mkconfig
+++ b/mkconfig
@@ -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
@@ -126,7 +126,7 @@ if [ "${arch}" = "arm" ] ; then
fi
if [ -z "$KBUILD_SRC" ] ; then
- cd ${SRCTREE}/include
+ cd ${srctree}/include
fi
#
diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index 4eec00f..e3c87cf 100644
--- 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:
- 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 $@
diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index 9a9823d..eefa44d 100644
--- 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 $@
- 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 $@
diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index 9a9823d..eefa44d 100644
--- 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 $@
- 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 $@
diff --git a/nand_spl/board/freescale/mpc8572ds/Makefile b/nand_spl/board/freescale/mpc8572ds/Makefile
index 9a9823d..eefa44d 100644
--- 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 $@
- 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 $@
diff --git a/nand_spl/board/freescale/p1023rds/Makefile b/nand_spl/board/freescale/p1023rds/Makefile
index 9e8698b..f5e567c 100644
--- 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 $@
- 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 $@
diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index 9a9823d..eefa44d 100644
--- 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 $@
- 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 $@
diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index e08a9a0..664301c 100644
--- 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 $@
- 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 $@
- 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 $@
- ln -s $(SRCTREE)/board/$(BOARDDIR)/sdram.c $@
+ ln -s $(srctree)/board/$(BOARDDIR)/sdram.c $@
$(obj)/$(BOARD).c:
@rm -f $@
- ln -s $(SRCTREE)/board/$(BOARDDIR)/$(BOARD).c $@
+ ln -s $(srctree)/board/$(BOARDDIR)/$(BOARD).c $@
$(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 $@
- 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 $@
- ln -s $(SRCTREE)/arch/powerpc/lib/cache.c $@
+ ln -s $(srctree)/arch/powerpc/lib/cache.c $@
$(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 $@
- 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 640db8b..b89a579 100644
--- 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)
-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:"%"=%)
@@ -145,7 +145,7 @@ u-boot-spl-main := $(libs-y)
# 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)),)
diff --git a/tools/Makefile b/tools/Makefile
index bac6aaf..097cc1d 100644
--- 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
#
-HOST_EXTRACFLAGS += -include $(SRCTREE)/include/libfdt_env.h \
+HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \
$(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 \
diff --git a/tools/env/Makefile b/tools/env/Makefile
index 6ad81fd..fcb752d 100644
--- 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)) \
- -idirafter $(SRCTREE)/tools/env \
+ -idirafter $(srctree)/tools/env \
-DUSE_HOSTCC \
-DTEXT_BASE=$(TEXT_BASE)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 11/12] kbuild: rename OBJTREE to objtree
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
` (9 preceding siblings ...)
2014-03-11 2:05 ` [U-Boot] [PATCH 10/12] kbuild: rename SRCTREE to srctree Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-12 21:07 ` [U-Boot] [U-Boot,11/12] " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 12/12] kbuild: delete SPLTREE and TPLTREE Masahiro Yamada
11 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
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>
---
Makefile | 7 +++----
arch/m68k/cpu/mcf52x2/config.mk | 2 +-
arch/m68k/cpu/mcf532x/config.mk | 2 +-
arch/m68k/cpu/mcf5445x/config.mk | 2 +-
arch/powerpc/cpu/ppc4xx/config.mk | 2 +-
mkconfig | 4 ++--
nand_spl/board/freescale/mpc8315erdb/Makefile | 2 +-
nand_spl/board/freescale/mpc8536ds/Makefile | 2 +-
nand_spl/board/freescale/mpc8569mds/Makefile | 2 +-
nand_spl/board/freescale/mpc8572ds/Makefile | 2 +-
nand_spl/board/freescale/p1023rds/Makefile | 2 +-
nand_spl/board/freescale/p1_p2_rdb/Makefile | 2 +-
nand_spl/board/sheldon/simpc8313/Makefile | 2 +-
spl/Makefile | 8 ++++----
14 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/Makefile b/Makefile
index a8ca5e9..fa1e0ae 100644
--- a/Makefile
+++ b/Makefile
@@ -165,10 +165,9 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
export srctree objtree VPATH
-OBJTREE := $(objtree)
-SPLTREE := $(OBJTREE)/spl
-TPLTREE := $(OBJTREE)/tpl
-export OBJTREE SPLTREE TPLTREE
+SPLTREE := $(objtree)/spl
+TPLTREE := $(objtree)/tpl
+export SPLTREE TPLTREE
MKCONFIG := $(srctree)/mkconfig
export MKCONFIG
diff --git a/arch/m68k/cpu/mcf52x2/config.mk b/arch/m68k/cpu/mcf52x2/config.mk
index ebf75e6..34ad99e 100644
--- a/arch/m68k/cpu/mcf52x2/config.mk
+++ b/arch/m68k/cpu/mcf52x2/config.mk
@@ -7,7 +7,7 @@
# 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))
is5249:=$(shell grep CONFIG_M5249 $(srctree)/include/$(cfg))
is5253:=$(shell grep CONFIG_M5253 $(srctree)/include/$(cfg))
diff --git a/arch/m68k/cpu/mcf532x/config.mk b/arch/m68k/cpu/mcf532x/config.mk
index 0a248c3..af94354 100644
--- a/arch/m68k/cpu/mcf532x/config.mk
+++ b/arch/m68k/cpu/mcf532x/config.mk
@@ -7,7 +7,7 @@
# 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))
is532x:=$(shell grep CONFIG_MCF532x $(srctree)/include/$(cfg))
diff --git a/arch/m68k/cpu/mcf5445x/config.mk b/arch/m68k/cpu/mcf5445x/config.mk
index 2f310a5..5fd0d4d 100644
--- a/arch/m68k/cpu/mcf5445x/config.mk
+++ b/arch/m68k/cpu/mcf5445x/config.mk
@@ -9,7 +9,7 @@
# 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))
ifneq (,$(findstring CONFIG_MCF5441x,$(is5441x)))
diff --git a/arch/powerpc/cpu/ppc4xx/config.mk b/arch/powerpc/cpu/ppc4xx/config.mk
index 907a3dd..102f069 100644
--- a/arch/powerpc/cpu/ppc4xx/config.mk
+++ b/arch/powerpc/cpu/ppc4xx/config.mk
@@ -7,7 +7,7 @@
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))
ifneq (,$(findstring CONFIG_440,$(is440)))
diff --git a/mkconfig b/mkconfig
index 17ff298..cd911a9 100755
--- a/mkconfig
+++ b/mkconfig
@@ -104,9 +104,9 @@ fi
# Create link to architecture specific headers
#
if [ -n "$KBUILD_SRC" ] ; then
- mkdir -p ${OBJTREE}/include
+ mkdir -p ${objtree}/include
LNPREFIX=${srctree}/arch/${arch}/include/asm/
- cd ${OBJTREE}/include
+ cd ${objtree}/include
mkdir -p asm
else
cd arch/${arch}/include
diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index e3c87cf..f4e7854 100644
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -8,7 +8,7 @@
PAD_TO := 0xfff04000
-nandobj := $(OBJTREE)/nand_spl/
+nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index eefa44d..c639b12 100644
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -10,7 +10,7 @@
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
PAD_TO := 0xfff01000
-nandobj := $(OBJTREE)/nand_spl/
+nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index eefa44d..c639b12 100644
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -10,7 +10,7 @@
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
PAD_TO := 0xfff01000
-nandobj := $(OBJTREE)/nand_spl/
+nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
diff --git a/nand_spl/board/freescale/mpc8572ds/Makefile b/nand_spl/board/freescale/mpc8572ds/Makefile
index eefa44d..c639b12 100644
--- a/nand_spl/board/freescale/mpc8572ds/Makefile
+++ b/nand_spl/board/freescale/mpc8572ds/Makefile
@@ -10,7 +10,7 @@
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
PAD_TO := 0xfff01000
-nandobj := $(OBJTREE)/nand_spl/
+nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
diff --git a/nand_spl/board/freescale/p1023rds/Makefile b/nand_spl/board/freescale/p1023rds/Makefile
index f5e567c..38f6726 100644
--- a/nand_spl/board/freescale/p1023rds/Makefile
+++ b/nand_spl/board/freescale/p1023rds/Makefile
@@ -6,7 +6,7 @@
PAD_TO := 0xfff01000
-nandobj := $(OBJTREE)/nand_spl/
+nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index eefa44d..c639b12 100644
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -10,7 +10,7 @@
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
PAD_TO := 0xfff01000
-nandobj := $(OBJTREE)/nand_spl/
+nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index 664301c..657f65f 100644
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -9,7 +9,7 @@
include $(srctree)/$(src)/config.mk
-nandobj := $(OBJTREE)/nand_spl/
+nandobj := $(objtree)/nand_spl/
LDSCRIPT= $(srctree)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
diff --git a/spl/Makefile b/spl/Makefile
index b89a579..be5fd3b 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -166,7 +166,7 @@ endif
# on the fly.
LDPPFLAGS += \
-include $(srctree)/include/u-boot/u-boot.lds.h \
- -include $(OBJTREE)/include/config.h \
+ -include $(objtree)/include/config.h \
-DCPUDIR=$(CPUDIR) \
$(shell $(LD) --version | \
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 =
endif
$(obj)/$(BOARD)-spl.bin: $(obj)/u-boot-spl.bin
- $(if $(wildcard $(OBJTREE)/spl/board/samsung/$(BOARD)/tools/mk$(BOARD)spl),\
- $(OBJTREE)/spl/board/samsung/$(BOARD)/tools/mk$(BOARD)spl,\
- $(OBJTREE)/tools/mkexynosspl) $(VAR_SIZE_PARAM) $< $@
+ $(if $(wildcard $(objtree)/spl/board/samsung/$(BOARD)/tools/mk$(BOARD)spl),\
+ $(objtree)/spl/board/samsung/$(BOARD)/tools/mk$(BOARD)spl,\
+ $(objtree)/tools/mkexynosspl) $(VAR_SIZE_PARAM) $< $@
endif
quiet_cmd_objcopy = OBJCOPY $@
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 12/12] kbuild: delete SPLTREE and TPLTREE
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
` (10 preceding siblings ...)
2014-03-11 2:05 ` [U-Boot] [PATCH 11/12] kbuild: rename OBJTREE to objtree Masahiro Yamada
@ 2014-03-11 2:05 ` Masahiro Yamada
2014-03-12 21:07 ` [U-Boot] [U-Boot,12/12] " Tom Rini
11 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-11 2:05 UTC (permalink / raw)
To: u-boot
These variable are no longer used.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
Makefile | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Makefile b/Makefile
index fa1e0ae..c8d5ccc 100644
--- a/Makefile
+++ b/Makefile
@@ -165,10 +165,6 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
export srctree objtree VPATH
-SPLTREE := $(objtree)/spl
-TPLTREE := $(objtree)/tpl
-export SPLTREE TPLTREE
-
MKCONFIG := $(srctree)/mkconfig
export MKCONFIG
--
1.8.3.2
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 05/12] kbuild: delete redundant LDSCRIPT definition
2014-03-11 2:05 ` [U-Boot] [PATCH 05/12] kbuild: delete redundant LDSCRIPT definition Masahiro Yamada
@ 2014-03-11 9:09 ` Michal Simek
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 34+ messages in thread
From: Michal Simek @ 2014-03-11 9:09 UTC (permalink / raw)
To: u-boot
On 03/11/2014 03:05 AM, Masahiro Yamada wrote:
> $(SRCTREE)/$(CPUDIR)/u-boot.lds is our default location
> of arch-specific linker script.
>
> Remove redundant definitions in
> arch/{arc,microblaze,openrisc}/config.mk.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
for Microblaze
Acked-by: Michal Simek <monstr@monstr.eu>
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140311/48a8466c/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 01/12] kbuild, mxs: use short logs for MXS images
2014-03-11 2:05 ` [U-Boot] [PATCH 01/12] kbuild,mxs: use short logs for MXS images Masahiro Yamada
@ 2014-03-11 11:52 ` Marek Vasut
2014-03-12 10:19 ` Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 1 reply; 34+ messages in thread
From: Marek Vasut @ 2014-03-11 11:52 UTC (permalink / raw)
To: u-boot
On Tuesday, March 11, 2014 at 03:05:11 AM, Masahiro Yamada wrote:
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com>
You can drop Lauri from CC , I think this address is dead.
> ---
>
> Hi MXS board maitainers,
>
> I think this commit is probably correct.
> (I mean, it still generates correct "u-boot.sb" image)
>
> But I could not corfirm it by binary comparison.
>
> Every build generates a different u-boot.sb
> even if no source file is changed.
Note sure about that:
marex at bfu:/tmp/u-boot$ make -j9 u-boot.sb
CHK include/config/uboot.release
CHK include/generated/timestamp_autogenerated.h
UPD include/generated/timestamp_autogenerated.h
UPD include/config/uboot.release
CHK include/generated/version_autogenerated.h
UPD include/generated/version_autogenerated.h
HOSTCC tools/dumpimage.o
HOSTCC tools/image-host.o
HOSTCC tools/mkenvimage.o
HOSTCC tools/mkimage.o
HOSTLD tools/envcrc
HOSTLD tools/mkenvimage
HOSTLD tools/dumpimage
HOSTLD tools/mkimage
AS arch/arm/cpu/arm926ejs/start.o
CC arch/arm/lib/board.o
CC drivers/video/cfb_console.o
LD arch/arm/lib/built-in.o
CC lib/display_options.o
CC common/main.o
CC common/cmd_version.o
AS spl/arch/arm/cpu/arm926ejs/mxs/start.o
LD lib/built-in.o
CC spl/lib/display_options.o
LD spl/lib/built-in.o
LD spl/u-boot-spl
OBJCOPY spl/u-boot-spl.bin
LD common/built-in.o
LD drivers/video/built-in.o
LD drivers/built-in.o
LD u-boot
OBJCOPY u-boot.bin
MXSIMAGE u-boot.sb
marex at bfu:/tmp/u-boot$ sha1sum u-boot.bin
a31b6fb66fab4a0f05634987585140ffe463452e u-boot.bin
marex at bfu:/tmp/u-boot$ make -j9 u-boot.sb
CHK include/config/uboot.release
CHK include/generated/timestamp_autogenerated.h
UPD include/generated/timestamp_autogenerated.h
CHK include/generated/version_autogenerated.h
HOSTCC tools/dumpimage.o
HOSTCC tools/image-host.o
HOSTCC tools/mkenvimage.o
HOSTCC tools/mkimage.o
HOSTLD tools/envcrc
HOSTLD tools/mkenvimage
HOSTLD tools/dumpimage
HOSTLD tools/mkimage
AS arch/arm/cpu/arm926ejs/start.o
CC arch/arm/lib/board.o
CC drivers/video/cfb_console.o
LD arch/arm/lib/built-in.o
CC lib/display_options.o
CC common/main.o
CC common/cmd_version.o
AS spl/arch/arm/cpu/arm926ejs/mxs/start.o
CC spl/lib/display_options.o
LD lib/built-in.o
LD spl/lib/built-in.o
LD spl/u-boot-spl
OBJCOPY spl/u-boot-spl.bin
LD common/built-in.o
LD drivers/video/built-in.o
LD drivers/built-in.o
LD u-boot
OBJCOPY u-boot.bin
MXSIMAGE u-boot.sb
marex at bfu:/tmp/u-boot$ sha1sum u-boot.bin
b5d5feab4a6974fe00272d3a3408300d8c8a473d u-boot.bin
Given that u-boot.bin and spl/u-boot-spl.bin are packed into u-boot.sb , this is
why you always see a different u-boot.sb .
> I wish someone could do run test this patch.
The patch is good, I have just a minor rant below, otherwise add my:
Acked-by: Marek Vasut <marex@denx.de>
btw. you can check if the image was not corrupted by issuing:
$ mkimage -l u-boot.sb
;-)
[...]
> diff --git a/arch/arm/cpu/arm926ejs/mxs/Makefile
> b/arch/arm/cpu/arm926ejs/mxs/Makefile index 152546e..1eee661 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/Makefile
> +++ b/arch/arm/cpu/arm926ejs/mxs/Makefile
> @@ -14,11 +14,12 @@ obj-y += spl_boot.o spl_lradc_init.o spl_mem_init.o
> spl_power_init.o endif
>
> # Specify the target for use in elftosb call
> -MKIMAGE_TARGET-$(CONFIG_MX23) = mx23
> -MKIMAGE_TARGET-$(CONFIG_MX28) = mx28
> +MKIMAGE_TARGET-$(CONFIG_MX23) = mxsimage.mx23.cfg
> +MKIMAGE_TARGET-$(CONFIG_MX28) = mxsimage.mx28.cfg
>
> -$(OBJTREE)/mxsimage.cfg:
> $(SRCTREE)/$(CPUDIR)/$(SOC)/mxsimage.$(MKIMAGE_TARGET-y).cfg - sed
> "s at OBJTREE@$(OBJTREE)@g" $^ > $@
> +quiet_cmd_mkimage_mxs = UIMAGE $@
Why don't we use 'MKIMAGE' here to be consistent ? Or 'MXSIMAGE' if we want to
differentiate ?
> +cmd_mkimage_mxs = $(objtree)/tools/mkimage -n $< -T mxsimage $@ \
> + $(if $(KBUILD_VERBOSE:1=), >/dev/null)
Invokation seems OK to me. Getting rid of the 'sed' call is really to my liking
here :)
Thank you!
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 01/12] kbuild, mxs: use short logs for MXS images
2014-03-11 11:52 ` [U-Boot] [PATCH 01/12] kbuild, mxs: " Marek Vasut
@ 2014-03-12 10:19 ` Masahiro Yamada
2014-03-12 10:46 ` Marek Vasut
0 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-12 10:19 UTC (permalink / raw)
To: u-boot
Hello Marek,
> > Cc: Marek Vasut <marex@denx.de>
> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > Cc: Otavio Salvador <otavio@ossystems.com.br>
> > Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com>
>
> You can drop Lauri from CC , I think this address is dead.
It looks like Cc to Lauri is not bouncing so far.
> b5d5feab4a6974fe00272d3a3408300d8c8a473d u-boot.bin
>
> Given that u-boot.bin and spl/u-boot-spl.bin are packed into u-boot.sb , this is
> why you always see a different u-boot.sb .
For other boot images, binary compare matched except a few bytes
difference which comes from time stamp.
But, when I compared u-boot.sb
I had much more diffs than I expect for the difference of timestamp.
I still cannot understand what is different from the others.
Anyway, that's good to know it worked on run test.
> > I wish someone could do run test this patch.
>
> The patch is good, I have just a minor rant below, otherwise add my:
>
> Acked-by: Marek Vasut <marex@denx.de>
It's really appreciated. Thanks!
> > -$(OBJTREE)/mxsimage.cfg:
> > $(SRCTREE)/$(CPUDIR)/$(SOC)/mxsimage.$(MKIMAGE_TARGET-y).cfg - sed
> > "s at OBJTREE@$(OBJTREE)@g" $^ > $@
> > +quiet_cmd_mkimage_mxs = UIMAGE $@
>
> Why don't we use 'MKIMAGE' here to be consistent ? Or 'MXSIMAGE' if we want to
> differentiate ?
Good point.
MXSIMAGE is no good because the short log must be within 7 characters.
MKIMAGE is OK.
Why UIMAGE?
All explanation I can give is
just the mimic of scripts/Makefile.build which originates
from Linux Kernel.
Around line 340,
quiet_cmd_uimage = UIMAGE $(UIMAGE_OUT)
cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
Anyway I do not persist on "UIMAGE".
If requested (or you can post a patch), it's OK to rename it,
althogh naming must be consistent throughout the code.
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 01/12] kbuild, mxs: use short logs for MXS images
2014-03-12 10:19 ` Masahiro Yamada
@ 2014-03-12 10:46 ` Marek Vasut
2014-03-12 12:46 ` Veli-Pekka Peltola
2014-03-13 2:32 ` Masahiro Yamada
0 siblings, 2 replies; 34+ messages in thread
From: Marek Vasut @ 2014-03-12 10:46 UTC (permalink / raw)
To: u-boot
On Wednesday, March 12, 2014 at 11:19:30 AM, Masahiro Yamada wrote:
> Hello Marek,
>
> > > Cc: Marek Vasut <marex@denx.de>
> > > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > > Cc: Otavio Salvador <otavio@ossystems.com.br>
> > > Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com>
> >
> > You can drop Lauri from CC , I think this address is dead.
>
> It looks like Cc to Lauri is not bouncing so far.
Strange, I remember the apx4 maintainer didn't work for B/G anymore.
> > b5d5feab4a6974fe00272d3a3408300d8c8a473d u-boot.bin
> >
> > Given that u-boot.bin and spl/u-boot-spl.bin are packed into u-boot.sb ,
> > this is why you always see a different u-boot.sb .
>
> For other boot images, binary compare matched except a few bytes
> difference which comes from time stamp.
>
> But, when I compared u-boot.sb
> I had much more diffs than I expect for the difference of timestamp.
>
> I still cannot understand what is different from the others.
Ah, right. The u-boot.sb is also encrypted with aes-128-cbc with zero key. The
bootrom on mx23/mx28 has the encryption enabled by default (and it can be fused
off), with the default key being all zeroes. That's why you see so many
differences.
> Anyway, that's good to know it worked on run test.
>
> > > I wish someone could do run test this patch.
> >
> > The patch is good, I have just a minor rant below, otherwise add my:
> >
> > Acked-by: Marek Vasut <marex@denx.de>
>
> It's really appreciated. Thanks!
No, thank _you_ for putting so much effort into this :)
> > > -$(OBJTREE)/mxsimage.cfg:
> > > $(SRCTREE)/$(CPUDIR)/$(SOC)/mxsimage.$(MKIMAGE_TARGET-y).cfg - sed
> > > "s at OBJTREE@$(OBJTREE)@g" $^ > $@
> > > +quiet_cmd_mkimage_mxs = UIMAGE $@
> >
> > Why don't we use 'MKIMAGE' here to be consistent ? Or 'MXSIMAGE' if we
> > want to differentiate ?
>
> Good point.
> MXSIMAGE is no good because the short log must be within 7 characters.
> MKIMAGE is OK.
>
> Why UIMAGE?
>
> All explanation I can give is
> just the mimic of scripts/Makefile.build which originates
> from Linux Kernel.
>
> Around line 340,
>
> quiet_cmd_uimage = UIMAGE $(UIMAGE_OUT)
> cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
>
>
> Anyway I do not persist on "UIMAGE".
> If requested (or you can post a patch), it's OK to rename it,
> althogh naming must be consistent throughout the code.
Yes, I see. We shall eventually rename it to mkimage throughout the code.
How shall we proceed? I see we have three options:
- Post V2 of this patch
- Fix the rest of the files which have this 'UIMAGE' in them and then post V2
- Postpone the fix and then do it globally
I would be in favor of the second option.
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 01/12] kbuild, mxs: use short logs for MXS images
2014-03-12 10:46 ` Marek Vasut
@ 2014-03-12 12:46 ` Veli-Pekka Peltola
2014-03-12 12:49 ` Marek Vasut
2014-03-13 2:32 ` Masahiro Yamada
1 sibling, 1 reply; 34+ messages in thread
From: Veli-Pekka Peltola @ 2014-03-12 12:46 UTC (permalink / raw)
To: u-boot
Hi,
On Wed, Mar 12, 2014 at 12:46 PM, Marek Vasut <marex@denx.de> wrote:
> On Wednesday, March 12, 2014 at 11:19:30 AM, Masahiro Yamada wrote:
>> Hello Marek,
>>
>> > > Cc: Marek Vasut <marex@denx.de>
>> > > Cc: Fabio Estevam <fabio.estevam@freescale.com>
>> > > Cc: Otavio Salvador <otavio@ossystems.com.br>
>> > > Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com>
>> >
>> > You can drop Lauri from CC , I think this address is dead.
>>
>> It looks like Cc to Lauri is not bouncing so far.
>
> Strange, I remember the apx4 maintainer didn't work for B/G anymore.
You remember it correctly :)
I was the original apx4 maintainer and I left Bluegiga. At that point Lauri
took care of apx4 and he is still working there.
--
Veli-Pekka Peltola
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 01/12] kbuild, mxs: use short logs for MXS images
2014-03-12 12:46 ` Veli-Pekka Peltola
@ 2014-03-12 12:49 ` Marek Vasut
0 siblings, 0 replies; 34+ messages in thread
From: Marek Vasut @ 2014-03-12 12:49 UTC (permalink / raw)
To: u-boot
On Wednesday, March 12, 2014 at 01:46:27 PM, Veli-Pekka Peltola wrote:
> Hi,
>
> On Wed, Mar 12, 2014 at 12:46 PM, Marek Vasut <marex@denx.de> wrote:
> > On Wednesday, March 12, 2014 at 11:19:30 AM, Masahiro Yamada wrote:
> >> Hello Marek,
> >>
> >> > > Cc: Marek Vasut <marex@denx.de>
> >> > > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> >> > > Cc: Otavio Salvador <otavio@ossystems.com.br>
> >> > > Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com>
> >> >
> >> > You can drop Lauri from CC , I think this address is dead.
> >>
> >> It looks like Cc to Lauri is not bouncing so far.
> >
> > Strange, I remember the apx4 maintainer didn't work for B/G anymore.
>
> You remember it correctly :)
>
> I was the original apx4 maintainer and I left Bluegiga. At that point Lauri
> took care of apx4 and he is still working there.
Ah ... sorry then.
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot, 01/12] kbuild, mxs: use short logs for MXS images
2014-03-11 2:05 ` [U-Boot] [PATCH 01/12] kbuild,mxs: use short logs for MXS images Masahiro Yamada
2014-03-11 11:52 ` [U-Boot] [PATCH 01/12] kbuild, mxs: " Marek Vasut
@ 2014-03-12 21:06 ` Tom Rini
1 sibling, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:06 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:11AM +0900, Masahiro Yamada wrote:
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com>
> Acked-by: Marek Vasut <marex@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/7a1153fc/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot, 02/12] kbuild: use short logs for some board specific make rules
2014-03-11 2:05 ` [U-Boot] [PATCH 02/12] kbuild: use short logs for some board specific make rules Masahiro Yamada
@ 2014-03-12 21:06 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:06 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:12AM +0900, Masahiro Yamada wrote:
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: David Updegraff <dave@cray.com>
> Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/b54e4ace/attachment-0001.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot, 03/12] kbuild, x86: use a short log for arch/x86/lib/libgcc.a
2014-03-11 2:05 ` [U-Boot] [PATCH 03/12] kbuild, x86: use a short log for arch/x86/lib/libgcc.a Masahiro Yamada
@ 2014-03-12 21:06 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:06 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:13AM +0900, Masahiro Yamada wrote:
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/40a756ac/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot, 04/12] x86: specify CONFIG_USE_PRIVATE_LIBGCC more simply
2014-03-11 2:05 ` [U-Boot] [PATCH 04/12] x86: specify CONFIG_USE_PRIVATE_LIBGCC more simply Masahiro Yamada
@ 2014-03-12 21:06 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:06 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:14AM +0900, Masahiro Yamada wrote:
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/5dab6b4e/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot, 05/12] kbuild: delete redundant LDSCRIPT definition
2014-03-11 2:05 ` [U-Boot] [PATCH 05/12] kbuild: delete redundant LDSCRIPT definition Masahiro Yamada
2014-03-11 9:09 ` Michal Simek
@ 2014-03-12 21:06 ` Tom Rini
1 sibling, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:06 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:15AM +0900, Masahiro Yamada wrote:
> $(SRCTREE)/$(CPUDIR)/u-boot.lds is our default location
> of arch-specific linker script.
>
> Remove redundant definitions in
> arch/{arc,microblaze,openrisc}/config.mk.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
> Acked-by: Michal Simek <monstr@monstr.eu>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/1872b27d/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot, 06/12] freescale: pblimage: refactor CONFIG_SYS_FSL_PBL_{PBI, RCW}
2014-03-11 2:05 ` [U-Boot] [PATCH 06/12] freescale: pblimage: refactor CONFIG_SYS_FSL_PBL_{PBI, RCW} Masahiro Yamada
@ 2014-03-12 21:06 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:06 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:16AM +0900, Masahiro Yamada wrote:
> Pull out "$(SRCTREE)/" from CONFIG_SYS_FSL_PBL_PBI
> and CONFIG_SYS_FSL_PBL_RCW and push it into the top Makefile.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: York Sun <yorksun@freescale.com>
> Cc: Poonam Aggrwal <poonam.aggrwal@freescale.com>
> Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/39e35cbd/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot, 07/12] kirkwood: kwbimage: refactor CONFIG_SYS_KWD_CONFIG
2014-03-11 2:05 ` [U-Boot] [PATCH 07/12] kirkwood: kwbimage: refactor CONFIG_SYS_KWD_CONFIG Masahiro Yamada
@ 2014-03-12 21:06 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:06 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:17AM +0900, Masahiro Yamada wrote:
> Pull out "$(SRCTREE)/" from CONFIG_SYS_KWD_CONFIG
> and push it into the top Makefile.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Michael Walle <michael@walle.cc>
> Cc: Simon Guinot <simon.guinot@sequanux.org>
> Cc: Dave Purdy <david.c.purdy@gmail.com>
> Cc: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
> Cc: Luka Perkov <luka@openwrt.org>
> Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> Cc: Jason Cooper <u-boot@lakedaemon.net>
> Cc: Siddarth Gore <gores@marvell.com>
> Cc: Prafulla Wadaskar <prafulla@marvell.com>
> Cc: Eric Cooper <ecc@cmu.edu>
> Cc: Suriyan Ramasami <suriyan.r@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/32760c0e/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot, 08/12] kbuild: use $(KBUILD_SRC) to check out-of-tree build
2014-03-11 2:05 ` [U-Boot] [PATCH 08/12] kbuild: use $(KBUILD_SRC) to check out-of-tree build Masahiro Yamada
@ 2014-03-12 21:07 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:07 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:18AM +0900, Masahiro Yamada wrote:
> Non-empty $(KBUILD_SRC) means out-of-tree build.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/4ccabb7d/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot,09/12] kbuild: rename TOPDIR to stctree
2014-03-11 2:05 ` [U-Boot] [PATCH 09/12] kbuild: rename TOPDIR to stctree Masahiro Yamada
@ 2014-03-12 21:07 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:07 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:19AM +0900, Masahiro Yamada wrote:
> 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/7ed469c9/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot,10/12] kbuild: rename SRCTREE to srctree
2014-03-11 2:05 ` [U-Boot] [PATCH 10/12] kbuild: rename SRCTREE to srctree Masahiro Yamada
@ 2014-03-12 21:07 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:07 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:20AM +0900, Masahiro Yamada wrote:
> 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/179a5f9a/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot,11/12] kbuild: rename OBJTREE to objtree
2014-03-11 2:05 ` [U-Boot] [PATCH 11/12] kbuild: rename OBJTREE to objtree Masahiro Yamada
@ 2014-03-12 21:07 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:07 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:21AM +0900, Masahiro Yamada wrote:
> 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/8355e7cf/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [U-Boot,12/12] kbuild: delete SPLTREE and TPLTREE
2014-03-11 2:05 ` [U-Boot] [PATCH 12/12] kbuild: delete SPLTREE and TPLTREE Masahiro Yamada
@ 2014-03-12 21:07 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-12 21:07 UTC (permalink / raw)
To: u-boot
On Tue, Mar 11, 2014 at 11:05:22AM +0900, Masahiro Yamada wrote:
> These variable are no longer used.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140312/bbdbfd1d/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 01/12] kbuild, mxs: use short logs for MXS images
2014-03-12 10:46 ` Marek Vasut
2014-03-12 12:46 ` Veli-Pekka Peltola
@ 2014-03-13 2:32 ` Masahiro Yamada
2014-03-13 4:01 ` Marek Vasut
1 sibling, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2014-03-13 2:32 UTC (permalink / raw)
To: u-boot
Hello Marek,
> > > b5d5feab4a6974fe00272d3a3408300d8c8a473d u-boot.bin
> > >
> > > Given that u-boot.bin and spl/u-boot-spl.bin are packed into u-boot.sb ,
> > > this is why you always see a different u-boot.sb .
> >
> > For other boot images, binary compare matched except a few bytes
> > difference which comes from time stamp.
> >
> > But, when I compared u-boot.sb
> > I had much more diffs than I expect for the difference of timestamp.
> >
> > I still cannot understand what is different from the others.
>
> Ah, right. The u-boot.sb is also encrypted with aes-128-cbc with zero key. The
> bootrom on mx23/mx28 has the encryption enabled by default (and it can be fused
> off), with the default key being all zeroes. That's why you see so many
> differences.
That makes sense. :-)
> Yes, I see. We shall eventually rename it to mkimage throughout the code.
>
> How shall we proceed? I see we have three options:
> - Post V2 of this patch
> - Fix the rest of the files which have this 'UIMAGE' in them and then post V2
> - Postpone the fix and then do it globally
>
> I would be in favor of the second option.
This patch is already on u-boot/master.
Can you post a follow-up patch?
I think you will have to modify 7 files.
./Makefile:731:quiet_cmd_mkimage = UIMAGE $@
./arch/arm/imx-common/Makefile:35:quiet_cmd_mkimage = UIMAGE $@
./arch/arm/cpu/arm926ejs/mxs/Makefile:20:quiet_cmd_mkimage_mxs = UIMAGE $@
./spl/Makefile:174:quiet_cmd_mkimage = UIMAGE $@
./board/cray/L1/Makefile:18:quiet_cmd_mkimage = UIMAGE $@
./board/matrix_vision/mvsmr/Makefile:15:quiet_cmd_mkimage = UIMAGE $@
./board/matrix_vision/mvblm7/Makefile:11:quiet_cmd_mkimage = UIMAGE $@
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 01/12] kbuild, mxs: use short logs for MXS images
2014-03-13 2:32 ` Masahiro Yamada
@ 2014-03-13 4:01 ` Marek Vasut
2014-03-13 13:22 ` Tom Rini
0 siblings, 1 reply; 34+ messages in thread
From: Marek Vasut @ 2014-03-13 4:01 UTC (permalink / raw)
To: u-boot
Hello Masahiro-san,
[...]
> > Yes, I see. We shall eventually rename it to mkimage throughout the code.
> >
> > How shall we proceed? I see we have three options:
> > - Post V2 of this patch
> > - Fix the rest of the files which have this 'UIMAGE' in them and then
> > post V2 - Postpone the fix and then do it globally
> >
> > I would be in favor of the second option.
>
> This patch is already on u-boot/master.
>
> Can you post a follow-up patch?
>
> I think you will have to modify 7 files.
>
> ./Makefile:731:quiet_cmd_mkimage = UIMAGE $@
> ./arch/arm/imx-common/Makefile:35:quiet_cmd_mkimage = UIMAGE $@
> ./arch/arm/cpu/arm926ejs/mxs/Makefile:20:quiet_cmd_mkimage_mxs = UIMAGE $@
> ./spl/Makefile:174:quiet_cmd_mkimage = UIMAGE $@
> ./board/cray/L1/Makefile:18:quiet_cmd_mkimage = UIMAGE $@
> ./board/matrix_vision/mvsmr/Makefile:15:quiet_cmd_mkimage = UIMAGE $@
> ./board/matrix_vision/mvblm7/Makefile:11:quiet_cmd_mkimage = UIMAGE $@
Tom, what's your take on this ... UIMAGE or MKIMAGE ?
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 01/12] kbuild, mxs: use short logs for MXS images
2014-03-13 4:01 ` Marek Vasut
@ 2014-03-13 13:22 ` Tom Rini
0 siblings, 0 replies; 34+ messages in thread
From: Tom Rini @ 2014-03-13 13:22 UTC (permalink / raw)
To: u-boot
On Thu, Mar 13, 2014 at 05:01:59AM +0100, Marek Vasut wrote:
> Hello Masahiro-san,
> [...]
> > > Yes, I see. We shall eventually rename it to mkimage throughout the code.
> > >
> > > How shall we proceed? I see we have three options:
> > > - Post V2 of this patch
> > > - Fix the rest of the files which have this 'UIMAGE' in them and then
> > > post V2 - Postpone the fix and then do it globally
> > >
> > > I would be in favor of the second option.
> >
> > This patch is already on u-boot/master.
> >
> > Can you post a follow-up patch?
> >
> > I think you will have to modify 7 files.
> >
> > ./Makefile:731:quiet_cmd_mkimage = UIMAGE $@
> > ./arch/arm/imx-common/Makefile:35:quiet_cmd_mkimage = UIMAGE $@
> > ./arch/arm/cpu/arm926ejs/mxs/Makefile:20:quiet_cmd_mkimage_mxs = UIMAGE $@
> > ./spl/Makefile:174:quiet_cmd_mkimage = UIMAGE $@
> > ./board/cray/L1/Makefile:18:quiet_cmd_mkimage = UIMAGE $@
> > ./board/matrix_vision/mvsmr/Makefile:15:quiet_cmd_mkimage = UIMAGE $@
> > ./board/matrix_vision/mvblm7/Makefile:11:quiet_cmd_mkimage = UIMAGE $@
>
> Tom, what's your take on this ... UIMAGE or MKIMAGE ?
MKIMAGE please, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140313/926fd662/attachment.pgp>
^ permalink raw reply [flat|nested] 34+ messages in thread
end of thread, other threads:[~2014-03-13 13:22 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-11 2:05 [U-Boot] [PATCH 0/12] Kbuild: A collection of more refactoring Masahiro Yamada
2014-03-11 2:05 ` [U-Boot] [PATCH 01/12] kbuild,mxs: use short logs for MXS images Masahiro Yamada
2014-03-11 11:52 ` [U-Boot] [PATCH 01/12] kbuild, mxs: " Marek Vasut
2014-03-12 10:19 ` Masahiro Yamada
2014-03-12 10:46 ` Marek Vasut
2014-03-12 12:46 ` Veli-Pekka Peltola
2014-03-12 12:49 ` Marek Vasut
2014-03-13 2:32 ` Masahiro Yamada
2014-03-13 4:01 ` Marek Vasut
2014-03-13 13:22 ` Tom Rini
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 02/12] kbuild: use short logs for some board specific make rules Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 03/12] kbuild, x86: use a short log for arch/x86/lib/libgcc.a Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 04/12] x86: specify CONFIG_USE_PRIVATE_LIBGCC more simply Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 05/12] kbuild: delete redundant LDSCRIPT definition Masahiro Yamada
2014-03-11 9:09 ` Michal Simek
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 06/12] freescale: pblimage: refactor CONFIG_SYS_FSL_PBL_{PBI, RCW} Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 07/12] kirkwood: kwbimage: refactor CONFIG_SYS_KWD_CONFIG Masahiro Yamada
2014-03-12 21:06 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 08/12] kbuild: use $(KBUILD_SRC) to check out-of-tree build Masahiro Yamada
2014-03-12 21:07 ` [U-Boot] [U-Boot, " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 09/12] kbuild: rename TOPDIR to stctree Masahiro Yamada
2014-03-12 21:07 ` [U-Boot] [U-Boot,09/12] " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 10/12] kbuild: rename SRCTREE to srctree Masahiro Yamada
2014-03-12 21:07 ` [U-Boot] [U-Boot,10/12] " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 11/12] kbuild: rename OBJTREE to objtree Masahiro Yamada
2014-03-12 21:07 ` [U-Boot] [U-Boot,11/12] " Tom Rini
2014-03-11 2:05 ` [U-Boot] [PATCH 12/12] kbuild: delete SPLTREE and TPLTREE Masahiro Yamada
2014-03-12 21:07 ` [U-Boot] [U-Boot,12/12] " Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.