* [U-Boot] [PATCH v3 0/3] Kbuild fixes
@ 2016-02-05 8:55 Masahiro Yamada
2016-02-05 8:55 ` [U-Boot] [PATCH v3 1/3] kbuild: remove unneeded ifdef conditionals around build rules Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Masahiro Yamada @ 2016-02-05 8:55 UTC (permalink / raw)
To: u-boot
Changes in v3:
- Drop 2/4 ("kbuild: sunxi: fix build rule of sunxi-spl.bin") as well
Changes in v2:
- Drop 3/5 ("kbuild: use $(call cmd, ) rather than $(call if_changed, ) where possible")
- add tools/fdtgrep to the dependency
Masahiro Yamada (3):
kbuild: remove unneeded ifdef conditionals around build rules
kbuild: add missing FORCE where $(call if_changed, ) is used
kbuild: fix build rule of u-boot-spl.dtb
Makefile | 12 ++++++------
scripts/Makefile.spl | 18 +++++++-----------
2 files changed, 13 insertions(+), 17 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 1/3] kbuild: remove unneeded ifdef conditionals around build rules
2016-02-05 8:55 [U-Boot] [PATCH v3 0/3] Kbuild fixes Masahiro Yamada
@ 2016-02-05 8:55 ` Masahiro Yamada
2016-02-05 20:31 ` Simon Glass
2016-02-08 20:49 ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-05 8:55 ` [U-Boot] [PATCH v3 2/3] kbuild: add missing FORCE where $(call if_changed, ) is used Masahiro Yamada
2016-02-05 8:55 ` [U-Boot] [PATCH v3 3/3] kbuild: fix build rule of u-boot-spl.dtb Masahiro Yamada
2 siblings, 2 replies; 16+ messages in thread
From: Masahiro Yamada @ 2016-02-05 8:55 UTC (permalink / raw)
To: u-boot
These rules are only used for SOCFPGA, SUNXI, but no need to hide
them from other SoCs.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
scripts/Makefile.spl | 4 ----
1 file changed, 4 deletions(-)
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index f486feb..adabfcf 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -228,18 +228,14 @@ ifneq ($(CONFIG_SPL_TEXT_BASE),)
LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE)
endif
-ifdef CONFIG_ARCH_SOCFPGA
MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage
$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE
$(call if_changed,mkimage)
-endif
-ifdef CONFIG_SUNXI
quiet_cmd_mksunxiboot = MKSUNXI $@
cmd_mksunxiboot = $(objtree)/tools/mksunxiboot $< $@
$(obj)/sunxi-spl.bin: $(obj)/$(SPL_BIN).bin
$(call if_changed,mksunxiboot)
-endif
quiet_cmd_u-boot-spl = LD $@
cmd_u-boot-spl = (cd $(obj) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) \
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 2/3] kbuild: add missing FORCE where $(call if_changed, ) is used
2016-02-05 8:55 [U-Boot] [PATCH v3 0/3] Kbuild fixes Masahiro Yamada
2016-02-05 8:55 ` [U-Boot] [PATCH v3 1/3] kbuild: remove unneeded ifdef conditionals around build rules Masahiro Yamada
@ 2016-02-05 8:55 ` Masahiro Yamada
2016-02-05 20:31 ` Simon Glass
2016-02-08 20:49 ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-05 8:55 ` [U-Boot] [PATCH v3 3/3] kbuild: fix build rule of u-boot-spl.dtb Masahiro Yamada
2 siblings, 2 replies; 16+ messages in thread
From: Masahiro Yamada @ 2016-02-05 8:55 UTC (permalink / raw)
To: u-boot
FORCE is needed for $(call if_changed,...) to be evaluated every time.
Otherwise, the command is not executed when the command line has
changed but any prerequisite has not been updated.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Changes in v3: None
Changes in v2: None
Makefile | 12 ++++++------
scripts/Makefile.spl | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 430dd4f..a46c1ae 100644
--- a/Makefile
+++ b/Makefile
@@ -924,7 +924,7 @@ u-boot.sha1: u-boot.bin
u-boot.dis: u-boot
$(OBJDUMP) -d $< > $@
-u-boot.cfg: include/config.h
+u-boot.cfg: include/config.h FORCE
$(call if_changed,cpp_cfg)
ifdef CONFIG_TPL
@@ -945,15 +945,15 @@ lpc32xx-spl.img: spl/u-boot-spl.bin FORCE
OBJCOPYFLAGS_lpc32xx-boot-0.bin = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO)
-lpc32xx-boot-0.bin: lpc32xx-spl.img
+lpc32xx-boot-0.bin: lpc32xx-spl.img FORCE
$(call if_changed,objcopy)
OBJCOPYFLAGS_lpc32xx-boot-1.bin = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO)
-lpc32xx-boot-1.bin: lpc32xx-spl.img
+lpc32xx-boot-1.bin: lpc32xx-spl.img FORCE
$(call if_changed,objcopy)
-lpc32xx-full.bin: lpc32xx-boot-0.bin lpc32xx-boot-1.bin u-boot.img
+lpc32xx-full.bin: lpc32xx-boot-0.bin lpc32xx-boot-1.bin u-boot.img FORCE
$(call if_changed,cat)
CLEAN_FILES += lpc32xx-*
@@ -1056,7 +1056,7 @@ endif
cmd_ifdtool += $(IFDTOOL) $(IFDTOOL_FLAGS) u-boot.tmp;
cmd_ifdtool += mv u-boot.tmp $@
-u-boot.rom: u-boot-x86-16bit.bin u-boot.bin
+u-boot.rom: u-boot-x86-16bit.bin u-boot.bin FORCE
$(call if_changed,ifdtool)
OBJCOPYFLAGS_u-boot-x86-16bit.bin := -O binary -j .start16 -j .resetvec
@@ -1171,7 +1171,7 @@ cmd_smap = \
$(CC) $(c_flags) -DSYSTEM_MAP="\"$${smap}\"" \
-c $(srctree)/common/system_map.c -o common/system_map.o
-u-boot: $(u-boot-init) $(u-boot-main) u-boot.lds
+u-boot: $(u-boot-init) $(u-boot-main) u-boot.lds FORCE
$(call if_changed,u-boot__)
ifeq ($(CONFIG_KALLSYMS),y)
$(call cmd,smap)
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index adabfcf..bd333e2 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -114,7 +114,7 @@ MKIMAGEFLAGS_MLO = -T omapimage -a $(CONFIG_SPL_TEXT_BASE)
MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE)
-MLO MLO.byteswap: $(obj)/u-boot-spl.bin
+MLO MLO.byteswap: $(obj)/u-boot-spl.bin FORCE
$(call if_changed,mkimage)
ifeq ($(CONFIG_SYS_SOC),"at91")
@@ -126,12 +126,12 @@ MKIMAGEFLAGS_boot.bin += -n $(shell $(obj)/../tools/atmel_pmecc_params)
boot.bin: $(obj)/../tools/atmel_pmecc_params
endif
-boot.bin: $(obj)/u-boot-spl.bin
+boot.bin: $(obj)/u-boot-spl.bin FORCE
$(call if_changed,mkimage)
else
MKIMAGEFLAGS_boot.bin = -T zynqimage
-spl/boot.bin: $(obj)/u-boot-spl.bin
+spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
$(call if_changed,mkimage)
endif
@@ -200,7 +200,7 @@ quiet_cmd_cpp_cfg = CFG $@
cmd_cpp_cfg = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
-DDO_DEPS_ONLY -D__ASSEMBLY__ -x assembler-with-cpp -P -dM -E -o $@ $<
-$(obj)/$(SPL_BIN).cfg: include/config.h
+$(obj)/$(SPL_BIN).cfg: include/config.h FORCE
$(call if_changed,cpp_cfg)
ifdef CONFIG_SAMSUNG
@@ -234,7 +234,7 @@ $(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE
quiet_cmd_mksunxiboot = MKSUNXI $@
cmd_mksunxiboot = $(objtree)/tools/mksunxiboot $< $@
-$(obj)/sunxi-spl.bin: $(obj)/$(SPL_BIN).bin
+$(obj)/sunxi-spl.bin: $(obj)/$(SPL_BIN).bin FORCE
$(call if_changed,mksunxiboot)
quiet_cmd_u-boot-spl = LD $@
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 3/3] kbuild: fix build rule of u-boot-spl.dtb
2016-02-05 8:55 [U-Boot] [PATCH v3 0/3] Kbuild fixes Masahiro Yamada
2016-02-05 8:55 ` [U-Boot] [PATCH v3 1/3] kbuild: remove unneeded ifdef conditionals around build rules Masahiro Yamada
2016-02-05 8:55 ` [U-Boot] [PATCH v3 2/3] kbuild: add missing FORCE where $(call if_changed, ) is used Masahiro Yamada
@ 2016-02-05 8:55 ` Masahiro Yamada
2016-02-05 20:31 ` Simon Glass
2016-02-08 20:49 ` [U-Boot] [U-Boot, v3, " Tom Rini
2 siblings, 2 replies; 16+ messages in thread
From: Masahiro Yamada @ 2016-02-05 8:55 UTC (permalink / raw)
To: u-boot
The build command of u-boot-spl.dtb is not constant, but dependent
on CONFIG_OF_SPL_REMOVE_PROPS. Use $(call if_changed,...) so that
the change of CONFIG_OF_SPL_REMOVE_PROPS is detected.
Also, add tools/fdtgrep to the dependency to make sure u-boot-spl.dtb
is generated by the up-to-date fdtgrep in case the tool is modified.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Changes in v3: None
Changes in v2:
- add tools/fdtgrep to the dependency
scripts/Makefile.spl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index bd333e2..4424284 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -193,8 +193,8 @@ quiet_cmd_fdtgrep = FDTGREP $@
$(objtree)/tools/fdtgrep -r -O dtb - -o $@ \
$(addprefix -P ,$(subst $\",,$(CONFIG_OF_SPL_REMOVE_PROPS)))
-$(obj)/$(SPL_BIN).dtb: dts/dt.dtb
- $(call cmd,fdtgrep)
+$(obj)/$(SPL_BIN).dtb: dts/dt.dtb $(objtree)/tools/fdtgrep FORCE
+ $(call if_changed,fdtgrep)
quiet_cmd_cpp_cfg = CFG $@
cmd_cpp_cfg = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 2/3] kbuild: add missing FORCE where $(call if_changed, ) is used
2016-02-05 8:55 ` [U-Boot] [PATCH v3 2/3] kbuild: add missing FORCE where $(call if_changed, ) is used Masahiro Yamada
@ 2016-02-05 20:31 ` Simon Glass
2016-02-08 20:49 ` [U-Boot] [U-Boot, v3, " Tom Rini
1 sibling, 0 replies; 16+ messages in thread
From: Simon Glass @ 2016-02-05 20:31 UTC (permalink / raw)
To: u-boot
On 5 February 2016 at 01:55, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> FORCE is needed for $(call if_changed,...) to be evaluated every time.
> Otherwise, the command is not executed when the command line has
> changed but any prerequisite has not been updated.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> Makefile | 12 ++++++------
> scripts/Makefile.spl | 10 +++++-----
> 2 files changed, 11 insertions(+), 11 deletions(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 3/3] kbuild: fix build rule of u-boot-spl.dtb
2016-02-05 8:55 ` [U-Boot] [PATCH v3 3/3] kbuild: fix build rule of u-boot-spl.dtb Masahiro Yamada
@ 2016-02-05 20:31 ` Simon Glass
2016-02-08 20:49 ` [U-Boot] [U-Boot, v3, " Tom Rini
1 sibling, 0 replies; 16+ messages in thread
From: Simon Glass @ 2016-02-05 20:31 UTC (permalink / raw)
To: u-boot
On 5 February 2016 at 01:55, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> The build command of u-boot-spl.dtb is not constant, but dependent
> on CONFIG_OF_SPL_REMOVE_PROPS. Use $(call if_changed,...) so that
> the change of CONFIG_OF_SPL_REMOVE_PROPS is detected.
>
> Also, add tools/fdtgrep to the dependency to make sure u-boot-spl.dtb
> is generated by the up-to-date fdtgrep in case the tool is modified.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> Changes in v3: None
> Changes in v2:
> - add tools/fdtgrep to the dependency
>
> scripts/Makefile.spl | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 1/3] kbuild: remove unneeded ifdef conditionals around build rules
2016-02-05 8:55 ` [U-Boot] [PATCH v3 1/3] kbuild: remove unneeded ifdef conditionals around build rules Masahiro Yamada
@ 2016-02-05 20:31 ` Simon Glass
2016-02-08 20:49 ` [U-Boot] [U-Boot, v3, " Tom Rini
1 sibling, 0 replies; 16+ messages in thread
From: Simon Glass @ 2016-02-05 20:31 UTC (permalink / raw)
To: u-boot
On 5 February 2016 at 01:55, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> These rules are only used for SOCFPGA, SUNXI, but no need to hide
> them from other SoCs.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> scripts/Makefile.spl | 4 ----
> 1 file changed, 4 deletions(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 1/3] kbuild: remove unneeded ifdef conditionals around build rules
2016-02-05 8:55 ` [U-Boot] [PATCH v3 1/3] kbuild: remove unneeded ifdef conditionals around build rules Masahiro Yamada
2016-02-05 20:31 ` Simon Glass
@ 2016-02-08 20:49 ` Tom Rini
1 sibling, 0 replies; 16+ messages in thread
From: Tom Rini @ 2016-02-08 20:49 UTC (permalink / raw)
To: u-boot
On Fri, Feb 05, 2016 at 05:55:12PM +0900, Masahiro Yamada wrote:
> These rules are only used for SOCFPGA, SUNXI, but no need to hide
> them from other SoCs.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160208/983d3cf2/attachment.sig>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 2/3] kbuild: add missing FORCE where $(call if_changed, ) is used
2016-02-05 8:55 ` [U-Boot] [PATCH v3 2/3] kbuild: add missing FORCE where $(call if_changed, ) is used Masahiro Yamada
2016-02-05 20:31 ` Simon Glass
@ 2016-02-08 20:49 ` Tom Rini
1 sibling, 0 replies; 16+ messages in thread
From: Tom Rini @ 2016-02-08 20:49 UTC (permalink / raw)
To: u-boot
On Fri, Feb 05, 2016 at 05:55:13PM +0900, Masahiro Yamada wrote:
> FORCE is needed for $(call if_changed,...) to be evaluated every time.
> Otherwise, the command is not executed when the command line has
> changed but any prerequisite has not been updated.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160208/c29ae5b2/attachment.sig>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 3/3] kbuild: fix build rule of u-boot-spl.dtb
2016-02-05 8:55 ` [U-Boot] [PATCH v3 3/3] kbuild: fix build rule of u-boot-spl.dtb Masahiro Yamada
2016-02-05 20:31 ` Simon Glass
@ 2016-02-08 20:49 ` Tom Rini
2016-02-22 15:51 ` Michal Simek
1 sibling, 1 reply; 16+ messages in thread
From: Tom Rini @ 2016-02-08 20:49 UTC (permalink / raw)
To: u-boot
On Fri, Feb 05, 2016 at 05:55:14PM +0900, Masahiro Yamada wrote:
> The build command of u-boot-spl.dtb is not constant, but dependent
> on CONFIG_OF_SPL_REMOVE_PROPS. Use $(call if_changed,...) so that
> the change of CONFIG_OF_SPL_REMOVE_PROPS is detected.
>
> Also, add tools/fdtgrep to the dependency to make sure u-boot-spl.dtb
> is generated by the up-to-date fdtgrep in case the tool is modified.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160208/335da4a9/attachment.sig>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 3/3] kbuild: fix build rule of u-boot-spl.dtb
2016-02-08 20:49 ` [U-Boot] [U-Boot, v3, " Tom Rini
@ 2016-02-22 15:51 ` Michal Simek
2016-02-22 16:16 ` Tom Rini
0 siblings, 1 reply; 16+ messages in thread
From: Michal Simek @ 2016-02-22 15:51 UTC (permalink / raw)
To: u-boot
Hi,
On 8.2.2016 21:49, Tom Rini wrote:
> On Fri, Feb 05, 2016 at 05:55:14PM +0900, Masahiro Yamada wrote:
>
>> The build command of u-boot-spl.dtb is not constant, but dependent
>> on CONFIG_OF_SPL_REMOVE_PROPS. Use $(call if_changed,...) so that
>> the change of CONFIG_OF_SPL_REMOVE_PROPS is detected.
>>
>> Also, add tools/fdtgrep to the dependency to make sure u-boot-spl.dtb
>> is generated by the up-to-date fdtgrep in case the tool is modified.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> Reviewed-by: Simon Glass <sjg@chromium.org>
>
> Applied to u-boot/master, thanks!
This patch is breaking build for Microblaze SPL.
make microblaze-generic_defconfig && make -j
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: 181 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160222/6502ad8d/attachment.sig>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 3/3] kbuild: fix build rule of u-boot-spl.dtb
2016-02-22 15:51 ` Michal Simek
@ 2016-02-22 16:16 ` Tom Rini
2016-02-23 2:57 ` Masahiro Yamada
0 siblings, 1 reply; 16+ messages in thread
From: Tom Rini @ 2016-02-22 16:16 UTC (permalink / raw)
To: u-boot
On Mon, Feb 22, 2016 at 04:51:47PM +0100, Michal Simek wrote:
> Hi,
>
> On 8.2.2016 21:49, Tom Rini wrote:
> > On Fri, Feb 05, 2016 at 05:55:14PM +0900, Masahiro Yamada wrote:
> >
> >> The build command of u-boot-spl.dtb is not constant, but dependent
> >> on CONFIG_OF_SPL_REMOVE_PROPS. Use $(call if_changed,...) so that
> >> the change of CONFIG_OF_SPL_REMOVE_PROPS is detected.
> >>
> >> Also, add tools/fdtgrep to the dependency to make sure u-boot-spl.dtb
> >> is generated by the up-to-date fdtgrep in case the tool is modified.
> >>
> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> >> Reviewed-by: Simon Glass <sjg@chromium.org>
> >
> > Applied to u-boot/master, thanks!
>
> This patch is breaking build for Microblaze SPL.
> make microblaze-generic_defconfig && make -j
Can you poke around a bit more at what rule is likely needing an update
here? FWIW, when this was merged microblaze was broken due to the
eth-uclass.c problem so that's how I missed it, sorry!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160222/2bb5a60e/attachment.sig>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 3/3] kbuild: fix build rule of u-boot-spl.dtb
2016-02-22 16:16 ` Tom Rini
@ 2016-02-23 2:57 ` Masahiro Yamada
2016-02-23 7:06 ` Michal Simek
0 siblings, 1 reply; 16+ messages in thread
From: Masahiro Yamada @ 2016-02-23 2:57 UTC (permalink / raw)
To: u-boot
Hi Michal, Tom, Simon
2016-02-23 1:16 GMT+09:00 Tom Rini <trini@konsulko.com>:
> On Mon, Feb 22, 2016 at 04:51:47PM +0100, Michal Simek wrote:
>> Hi,
>>
>> On 8.2.2016 21:49, Tom Rini wrote:
>> > On Fri, Feb 05, 2016 at 05:55:14PM +0900, Masahiro Yamada wrote:
>> >
>> >> The build command of u-boot-spl.dtb is not constant, but dependent
>> >> on CONFIG_OF_SPL_REMOVE_PROPS. Use $(call if_changed,...) so that
>> >> the change of CONFIG_OF_SPL_REMOVE_PROPS is detected.
>> >>
>> >> Also, add tools/fdtgrep to the dependency to make sure u-boot-spl.dtb
>> >> is generated by the up-to-date fdtgrep in case the tool is modified.
>> >>
>> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> >> Reviewed-by: Simon Glass <sjg@chromium.org>
>> >
>> > Applied to u-boot/master, thanks!
>>
>> This patch is breaking build for Microblaze SPL.
>> make microblaze-generic_defconfig && make -j
>
> Can you poke around a bit more at what rule is likely needing an update
> here? FWIW, when this was merged microblaze was broken due to the
> eth-uclass.c problem so that's how I missed it, sorry!
This breakage is not due to this commit.
Even if I revert commit 35b786780f3 ("kbuild: fix build rule of
u-boot-spl.dtb"), this board is still broken.
I suspect the problem is in the fdtgrep tool itself.
This is my log:
yamada at beagle:~/workspace/u-boot$ git clean -d -f -x
yamada at beagle:~/workspace/u-boot$ git pull
Already up-to-date.
yamada at beagle:~/workspace/u-boot$ git describe
v2016.03-rc2-84-g595af9d
yamada at beagle:~/workspace/u-boot$ git checkout -b revert_test
Switched to a new branch 'revert_test'
yamada at beagle:~/workspace/u-boot$ git revert 35b78678
[revert_test b0dbed5] Revert "kbuild: fix build rule of u-boot-spl.dtb"
1 file changed, 2 insertions(+), 2 deletions(-)
yamada at beagle:~/workspace/u-boot$ make microblaze-generic_defconfig
HOSTCC scripts/basic/fixdep
HOSTCC scripts/kconfig/conf.o
SHIPPED scripts/kconfig/zconf.tab.c
SHIPPED scripts/kconfig/zconf.lex.c
SHIPPED scripts/kconfig/zconf.hash.c
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
#
# configuration written to .config
#
yamada at beagle:~/workspace/u-boot$ make CROSS_COMPILE=microblaze-linux-
scripts/kconfig/conf --silentoldconfig Kconfig
CHK include/config.h
UPD include/config.h
GEN include/autoconf.mk
GEN include/autoconf.mk.dep
GEN spl/include/autoconf.mk
CHK include/config/uboot.release
UPD include/config/uboot.release
CHK include/generated/version_autogenerated.h
UPD include/generated/version_autogenerated.h
CHK include/generated/timestamp_autogenerated.h
UPD include/generated/timestamp_autogenerated.h
CC lib/asm-offsets.s
CHK include/generated/generic-asm-offsets.h
UPD include/generated/generic-asm-offsets.h
HOSTCC tools/envcrc.o
WRAP tools/lib/crc32.c
HOSTCC tools/lib/crc32.o
WRAP tools/common/env_embedded.c
HOSTCC tools/common/env_embedded.o
WRAP tools/lib/sha1.c
HOSTCC tools/lib/sha1.o
HOSTLD tools/envcrc
HOSTCC tools/gen_eth_addr
HOSTCC tools/img2srec
HOSTCC tools/mkenvimage.o
HOSTCC tools/os_support.o
HOSTLD tools/mkenvimage
HOSTCC tools/aisimage.o
HOSTCC tools/atmelimage.o
WRAP tools/common/bootm.c
HOSTCC tools/common/bootm.o
HOSTCC tools/default_image.o
WRAP tools/lib/fdtdec_common.c
HOSTCC tools/lib/fdtdec_common.o
WRAP tools/lib/fdtdec.c
HOSTCC tools/lib/fdtdec.o
HOSTCC tools/fit_common.o
HOSTCC tools/fit_image.o
HOSTCC tools/gpimage.o
HOSTCC tools/gpimage-common.o
WRAP tools/common/image-fit.c
HOSTCC tools/common/image-fit.o
HOSTCC tools/image-host.o
WRAP tools/common/image.c
HOSTCC tools/common/image.o
HOSTCC tools/imagetool.o
HOSTCC tools/imximage.o
HOSTCC tools/kwbimage.o
WRAP tools/lib/md5.c
HOSTCC tools/lib/md5.o
HOSTCC tools/lpc32xximage.o
HOSTCC tools/mxsimage.o
HOSTCC tools/omapimage.o
HOSTCC tools/pblimage.o
HOSTCC tools/pbl_crc32.o
WRAP tools/lib/rc4.c
HOSTCC tools/lib/rc4.o
HOSTCC tools/rkcommon.o
HOSTCC tools/rkimage.o
HOSTCC tools/rksd.o
HOSTCC tools/rkspi.o
HOSTCC tools/socfpgaimage.o
WRAP tools/lib/sha256.c
HOSTCC tools/lib/sha256.o
WRAP tools/common/hash.c
HOSTCC tools/common/hash.o
HOSTCC tools/ublimage.o
HOSTCC tools/zynqimage.o
WRAP tools/lib/libfdt/fdt.c
HOSTCC tools/lib/libfdt/fdt.o
WRAP tools/lib/libfdt/fdt_ro.c
HOSTCC tools/lib/libfdt/fdt_ro.o
WRAP tools/lib/libfdt/fdt_rw.c
HOSTCC tools/lib/libfdt/fdt_rw.o
WRAP tools/lib/libfdt/fdt_strerror.c
HOSTCC tools/lib/libfdt/fdt_strerror.o
WRAP tools/lib/libfdt/fdt_wip.c
HOSTCC tools/lib/libfdt/fdt_wip.o
WRAP tools/lib/libfdt/fdt_region.c
HOSTCC tools/lib/libfdt/fdt_region.o
HOSTCC tools/dumpimage.o
HOSTLD tools/dumpimage
HOSTCC tools/mkimage.o
HOSTLD tools/mkimage
HOSTCC tools/ncb
HOSTCC tools/proftool
HOSTCC tools/fdtgrep.o
HOSTLD tools/fdtgrep
AS arch/microblaze/cpu/irq.o
CC arch/microblaze/cpu/interrupts.o
CC arch/microblaze/cpu/cache.o
CC arch/microblaze/cpu/exception.o
CC arch/microblaze/cpu/timer.o
LD arch/microblaze/cpu/built-in.o
AS arch/microblaze/cpu/start.o
CC arch/microblaze/lib/bootm.o
CC arch/microblaze/lib/muldi3.o
LD arch/microblaze/lib/built-in.o
CC board/xilinx/microblaze-generic/microblaze-generic.o
LD board/xilinx/microblaze-generic/built-in.o
CC cmd/boot.o
CC cmd/bootm.o
CC cmd/help.o
CC cmd/version.o
CC cmd/source.o
CC cmd/bdinfo.o
CC cmd/console.o
CC cmd/echo.o
CC cmd/elf.o
CC cmd/exit.o
CC cmd/fdt.o
CC cmd/flash.o
CC cmd/gpio.o
CC cmd/irq.o
CC cmd/itest.o
CC cmd/jffs2.o
CC cmd/load.o
CC cmd/mem.o
CC cmd/mfsl.o
CC cmd/mii.o
CC cmd/mdio.o
CC cmd/misc.o
CC cmd/mtdparts.o
CC cmd/net.o
CC cmd/pcmcia.o
CC cmd/test.o
CC cmd/ubi.o
CC cmd/ximg.o
CC cmd/spl.o
CC cmd/nvedit.o
CC cmd/disk.o
LD cmd/built-in.o
CC common/init/board_init.o
LD common/init/built-in.o
CC common/main.o
CC common/exports.o
CC common/hash.o
CC common/cli_hush.o
CC common/autoboot.o
CC common/board_f.o
CC common/board_r.o
CC common/bootm.o
CC common/bootm_os.o
CC common/env_attr.o
CC common/env_callback.o
CC common/env_flags.o
CC common/env_flash.o
CC common/fdt_support.o
CC common/miiphyutil.o
CC common/flash.o
CC common/splash.o
CC common/env_common.o
CC common/console.o
CC common/dlmalloc.o
CC common/malloc_simple.o
CC common/image.o
CC common/image-fdt.o
CC common/image-fit.o
CC common/memsize.o
CC common/stdio.o
CC common/cli_simple.o
CC common/cli.o
CC common/cli_readline.o
CC common/command.o
CC common/s_record.o
CC common/xyzModem.o
LD common/built-in.o
CC common/env_embedded.o
CC disk/part.o
LD disk/built-in.o
LD drivers/adc/built-in.o
CC drivers/block/disk-uclass.o
LD drivers/block/built-in.o
CC drivers/core/device.o
CC drivers/core/lists.o
CC drivers/core/root.o
CC drivers/core/uclass.o
CC drivers/core/util.o
CC drivers/core/device-remove.o
CC drivers/core/simple-bus.o
CC drivers/core/dump.o
LD drivers/core/built-in.o
CC drivers/crypto/fsl/sec.o
LD drivers/crypto/fsl/built-in.o
LD drivers/crypto/rsa_mod_exp/built-in.o
LD drivers/crypto/built-in.o
LD drivers/dfu/built-in.o
LD drivers/hwmon/built-in.o
CC drivers/input/input.o
CC drivers/input/key_matrix.o
LD drivers/input/built-in.o
LD drivers/memory/built-in.o
LD drivers/misc/built-in.o
CC drivers/pcmcia/tqm8xx_pcmcia.o
LD drivers/pcmcia/built-in.o
LD drivers/pwm/built-in.o
CC drivers/rtc/date.o
LD drivers/rtc/built-in.o
LD drivers/soc/built-in.o
LD drivers/sound/built-in.o
LD drivers/thermal/built-in.o
LD drivers/timer/built-in.o
LD drivers/tpm/built-in.o
LD drivers/twserial/built-in.o
LD drivers/video/bridge/built-in.o
LD drivers/video/built-in.o
CC drivers/watchdog/xilinx_tb_wdt.o
LD drivers/watchdog/built-in.o
LD drivers/built-in.o
LD drivers/dma/built-in.o
CC drivers/gpio/xilinx_gpio.o
LD drivers/gpio/built-in.o
LD drivers/i2c/built-in.o
LD drivers/mmc/built-in.o
CC drivers/mtd/mtdcore.o
CC drivers/mtd/mtd_uboot.o
CC drivers/mtd/mtdpart.o
CC drivers/mtd/cfi_flash.o
CC drivers/mtd/cfi_mtd.o
LD drivers/mtd/built-in.o
LD drivers/mtd/onenand/built-in.o
LD drivers/mtd/spi/built-in.o
CC drivers/mtd/ubi/attach.o
CC drivers/mtd/ubi/build.o
CC drivers/mtd/ubi/vtbl.o
CC drivers/mtd/ubi/vmt.o
CC drivers/mtd/ubi/upd.o
CC drivers/mtd/ubi/kapi.o
CC drivers/mtd/ubi/eba.o
CC drivers/mtd/ubi/io.o
CC drivers/mtd/ubi/wl.o
CC drivers/mtd/ubi/crc32.o
CC drivers/mtd/ubi/misc.o
CC drivers/mtd/ubi/debug.o
LD drivers/mtd/ubi/built-in.o
CC drivers/net/netconsole.o
CC drivers/net/xilinx_axi_emac.o
CC drivers/net/xilinx_emaclite.o
LD drivers/net/built-in.o
CC drivers/net/phy/phy.o
CC drivers/net/phy/atheros.o
CC drivers/net/phy/broadcom.o
CC drivers/net/phy/davicom.o
CC drivers/net/phy/lxt.o
CC drivers/net/phy/marvell.o
CC drivers/net/phy/micrel.o
CC drivers/net/phy/natsemi.o
CC drivers/net/phy/realtek.o
CC drivers/net/phy/vitesse.o
LD drivers/net/phy/built-in.o
LD drivers/pci/built-in.o
LD drivers/power/built-in.o
LD drivers/power/battery/built-in.o
LD drivers/power/fuel_gauge/built-in.o
LD drivers/power/mfd/built-in.o
LD drivers/power/pmic/built-in.o
LD drivers/power/regulator/built-in.o
CC drivers/serial/serial-uclass.o
CC drivers/serial/ns16550.o
CC drivers/serial/serial_xuartlite.o
LD drivers/serial/built-in.o
CC drivers/spi/spi.o
LD drivers/spi/built-in.o
LD drivers/usb/dwc3/built-in.o
LD drivers/usb/emul/built-in.o
LD drivers/usb/eth/built-in.o
LD drivers/usb/gadget/built-in.o
LD drivers/usb/gadget/udc/built-in.o
LD drivers/usb/host/built-in.o
LD drivers/usb/musb-new/built-in.o
LD drivers/usb/musb/built-in.o
LD drivers/usb/phy/built-in.o
LD drivers/usb/ulpi/built-in.o
DTC arch/microblaze/dts/microblaze-generic.dtb
SHIPPED dts/dt.dtb
DTB dts/dt.dtb.S
AS dts/dt.dtb.o
LD dts/built-in.o
CC fs/fs.o
LD fs/fat/built-in.o
CC fs/jffs2/compr_rtime.o
CC fs/jffs2/compr_rubin.o
CC fs/jffs2/compr_zlib.o
CC fs/jffs2/jffs2_1pass.o
CC fs/jffs2/mini_inflate.o
LD fs/jffs2/built-in.o
LD fs/built-in.o
CC lib/libfdt/fdt.o
CC lib/libfdt/fdt_ro.o
CC lib/libfdt/fdt_rw.o
CC lib/libfdt/fdt_strerror.o
CC lib/libfdt/fdt_sw.o
CC lib/libfdt/fdt_wip.o
CC lib/libfdt/fdt_empty_tree.o
CC lib/libfdt/fdt_addresses.o
CC lib/libfdt/fdt_region.o
LD lib/libfdt/built-in.o
CC lib/zlib/zlib.o
LD lib/zlib/built-in.o
CC lib/crc7.o
CC lib/crc8.o
CC lib/crc16.o
CC lib/fdtdec_common.o
CC lib/fdtdec.o
CC lib/gunzip.o
CC lib/initcall.o
CC lib/lmb.o
CC lib/ldiv.o
CC lib/md5.o
CC lib/net_utils.o
CC lib/qsort.o
CC lib/rc4.o
CC lib/sha1.o
CC lib/sha256.o
CC lib/strmhz.o
CC lib/rbtree.o
CC lib/list_sort.o
CC lib/hashtable.o
CC lib/errno.o
CC lib/display_options.o
CC lib/crc32.o
CC lib/ctype.o
CC lib/div64.o
CC lib/hang.o
CC lib/linux_compat.o
CC lib/linux_string.o
CC lib/membuff.o
CC lib/slre.o
CC lib/string.o
CC lib/time.o
CC lib/vsprintf.o
CC lib/panic.o
CC lib/strto.o
LD lib/built-in.o
CC net/checksum.o
CC net/arp.o
CC net/bootp.o
CC net/eth-uclass.o
CC net/eth_common.o
CC net/net.o
CC net/nfs.o
CC net/ping.o
CC net/tftp.o
LD net/built-in.o
LD test/built-in.o
CC test/dm/cmd_dm.o
LD test/dm/built-in.o
CC examples/standalone/stubs.o
LD examples/standalone/libstubs.o
CC examples/standalone/hello_world.o
LD examples/standalone/hello_world
OBJCOPY examples/standalone/hello_world.srec
OBJCOPY examples/standalone/hello_world.bin
LDS u-boot.lds
LD u-boot
OBJCOPY u-boot.srec
OBJCOPY u-boot-nodtb.bin
COPY u-boot.bin
SYM u-boot.sym
CFG u-boot.cfg
AS spl/arch/microblaze/cpu/irq.o
CC spl/arch/microblaze/cpu/interrupts.o
CC spl/arch/microblaze/cpu/cache.o
CC spl/arch/microblaze/cpu/exception.o
CC spl/arch/microblaze/cpu/timer.o
CC spl/arch/microblaze/cpu/spl.o
LD spl/arch/microblaze/cpu/built-in.o
AS spl/arch/microblaze/cpu/start.o
CC spl/arch/microblaze/lib/bootm.o
CC spl/arch/microblaze/lib/muldi3.o
LD spl/arch/microblaze/lib/built-in.o
CC spl/board/xilinx/microblaze-generic/microblaze-generic.o
LD spl/board/xilinx/microblaze-generic/built-in.o
CC spl/common/spl/spl.o
CC spl/common/spl/spl_nor.o
LD spl/common/spl/built-in.o
CC spl/common/init/board_init.o
LD spl/common/init/built-in.o
CC spl/common/env_flash.o
CC spl/common/env_common.o
CC spl/common/console.o
CC spl/common/dlmalloc.o
CC spl/common/malloc_simple.o
CC spl/common/image.o
CC spl/common/image-fdt.o
CC spl/common/image-fit.o
CC spl/common/memsize.o
CC spl/common/stdio.o
CC spl/common/cli_simple.o
CC spl/common/cli.o
CC spl/common/cli_readline.o
CC spl/common/command.o
CC spl/common/s_record.o
CC spl/common/xyzModem.o
LD spl/common/built-in.o
CC spl/cmd/nvedit.o
CC spl/cmd/disk.o
LD spl/cmd/built-in.o
CC spl/drivers/core/device.o
CC spl/drivers/core/lists.o
CC spl/drivers/core/root.o
CC spl/drivers/core/uclass.o
CC spl/drivers/core/util.o
CC spl/drivers/core/simple-bus.o
CC spl/drivers/core/dump.o
LD spl/drivers/core/built-in.o
CC spl/drivers/serial/serial-uclass.o
CC spl/drivers/serial/ns16550.o
CC spl/drivers/serial/serial_xuartlite.o
LD spl/drivers/serial/built-in.o
LD spl/drivers/built-in.o
AS spl/dts/dt.dtb.o
LD spl/dts/built-in.o
LD spl/fs/built-in.o
CC spl/lib/libfdt/fdt.o
CC spl/lib/libfdt/fdt_ro.o
CC spl/lib/libfdt/fdt_rw.o
CC spl/lib/libfdt/fdt_strerror.o
CC spl/lib/libfdt/fdt_sw.o
CC spl/lib/libfdt/fdt_wip.o
CC spl/lib/libfdt/fdt_empty_tree.o
CC spl/lib/libfdt/fdt_addresses.o
CC spl/lib/libfdt/fdt_region.o
LD spl/lib/libfdt/built-in.o
CC spl/lib/fdtdec_common.o
CC spl/lib/fdtdec.o
CC spl/lib/hashtable.o
CC spl/lib/errno.o
CC spl/lib/display_options.o
CC spl/lib/crc32.o
CC spl/lib/ctype.o
CC spl/lib/div64.o
CC spl/lib/hang.o
CC spl/lib/linux_compat.o
CC spl/lib/linux_string.o
CC spl/lib/membuff.o
CC spl/lib/slre.o
CC spl/lib/string.o
CC spl/lib/time.o
CC spl/lib/vsprintf.o
CC spl/lib/panic.o
CC spl/lib/strto.o
LD spl/lib/built-in.o
LDS spl/u-boot-spl.lds
LD spl/u-boot-spl
OBJCOPY spl/u-boot-spl-nodtb.bin
FDTGREP spl/u-boot-spl.dtb
Error: FDT_ERR_BADMAGIC
make[1]: *** [spl/u-boot-spl.dtb] Error 1
make: *** [spl/u-boot-spl] Error 2
I saw this problem before when I was porting my new ARMv8 SoC.
See below:
http://lists.denx.de/pipermail/u-boot/2016-February/245870.html
I hope Simon could help us figure out the root cause.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 3/3] kbuild: fix build rule of u-boot-spl.dtb
2016-02-23 2:57 ` Masahiro Yamada
@ 2016-02-23 7:06 ` Michal Simek
2016-02-23 7:47 ` Masahiro Yamada
0 siblings, 1 reply; 16+ messages in thread
From: Michal Simek @ 2016-02-23 7:06 UTC (permalink / raw)
To: u-boot
On 23.2.2016 03:57, Masahiro Yamada wrote:
> Hi Michal, Tom, Simon
>
>
>
>
> 2016-02-23 1:16 GMT+09:00 Tom Rini <trini@konsulko.com>:
>> On Mon, Feb 22, 2016 at 04:51:47PM +0100, Michal Simek wrote:
>>> Hi,
>>>
>>> On 8.2.2016 21:49, Tom Rini wrote:
>>>> On Fri, Feb 05, 2016 at 05:55:14PM +0900, Masahiro Yamada wrote:
>>>>
>>>>> The build command of u-boot-spl.dtb is not constant, but dependent
>>>>> on CONFIG_OF_SPL_REMOVE_PROPS. Use $(call if_changed,...) so that
>>>>> the change of CONFIG_OF_SPL_REMOVE_PROPS is detected.
>>>>>
>>>>> Also, add tools/fdtgrep to the dependency to make sure u-boot-spl.dtb
>>>>> is generated by the up-to-date fdtgrep in case the tool is modified.
>>>>>
>>>>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>>>>> Reviewed-by: Simon Glass <sjg@chromium.org>
>>>>
>>>> Applied to u-boot/master, thanks!
>>>
>>> This patch is breaking build for Microblaze SPL.
>>> make microblaze-generic_defconfig && make -j
>>
>> Can you poke around a bit more at what rule is likely needing an update
>> here? FWIW, when this was merged microblaze was broken due to the
>> eth-uclass.c problem so that's how I missed it, sorry!
>
>
> This breakage is not due to this commit.
>
> Even if I revert commit 35b786780f3 ("kbuild: fix build rule of
> u-boot-spl.dtb"), this board is still broken.
That's interesting. I found this commit by bisect.
>
> I suspect the problem is in the fdtgrep tool itself.
Anyway I was playing with it and this is supposed to be a fix.
fdtgrep tool is expecting more nodes to be present in DTS file.
Because mb dts is generic because every hw design is different dts
is quite empty.
Masahiro: Can you please try this and build it?
Thanks,
Michal
diff --git a/arch/microblaze/dts/microblaze-generic.dts
b/arch/microblaze/dts/microblaze-generic.dts
index 203330987bda..08a1396f2db2 100644
--- a/arch/microblaze/dts/microblaze-generic.dts
+++ b/arch/microblaze/dts/microblaze-generic.dts
@@ -4,4 +4,6 @@
#size-cells = <1>;
aliases {
} ;
+ chosen {
+ } ;
} ;
--
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: 181 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160223/0fbcf5c5/attachment-0001.sig>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 3/3] kbuild: fix build rule of u-boot-spl.dtb
2016-02-23 7:06 ` Michal Simek
@ 2016-02-23 7:47 ` Masahiro Yamada
2016-02-23 7:53 ` Michal Simek
0 siblings, 1 reply; 16+ messages in thread
From: Masahiro Yamada @ 2016-02-23 7:47 UTC (permalink / raw)
To: u-boot
Hi Michal,
2016-02-23 16:06 GMT+09:00 Michal Simek <monstr@monstr.eu>:
> On 23.2.2016 03:57, Masahiro Yamada wrote:
>> Hi Michal, Tom, Simon
>>
>>
>>
>>
>> 2016-02-23 1:16 GMT+09:00 Tom Rini <trini@konsulko.com>:
>>> On Mon, Feb 22, 2016 at 04:51:47PM +0100, Michal Simek wrote:
>>>> Hi,
>>>>
>>>> On 8.2.2016 21:49, Tom Rini wrote:
>>>>> On Fri, Feb 05, 2016 at 05:55:14PM +0900, Masahiro Yamada wrote:
>>>>>
>>>>>> The build command of u-boot-spl.dtb is not constant, but dependent
>>>>>> on CONFIG_OF_SPL_REMOVE_PROPS. Use $(call if_changed,...) so that
>>>>>> the change of CONFIG_OF_SPL_REMOVE_PROPS is detected.
>>>>>>
>>>>>> Also, add tools/fdtgrep to the dependency to make sure u-boot-spl.dtb
>>>>>> is generated by the up-to-date fdtgrep in case the tool is modified.
>>>>>>
>>>>>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>>>>>> Reviewed-by: Simon Glass <sjg@chromium.org>
>>>>>
>>>>> Applied to u-boot/master, thanks!
>>>>
>>>> This patch is breaking build for Microblaze SPL.
>>>> make microblaze-generic_defconfig && make -j
>>>
>>> Can you poke around a bit more at what rule is likely needing an update
>>> here? FWIW, when this was merged microblaze was broken due to the
>>> eth-uclass.c problem so that's how I missed it, sorry!
>>
>>
>> This breakage is not due to this commit.
>>
>> Even if I revert commit 35b786780f3 ("kbuild: fix build rule of
>> u-boot-spl.dtb"), this board is still broken.
>
> That's interesting. I found this commit by bisect.
>
>>
>> I suspect the problem is in the fdtgrep tool itself.
>
> Anyway I was playing with it and this is supposed to be a fix.
> fdtgrep tool is expecting more nodes to be present in DTS file.
> Because mb dts is generic because every hw design is different dts
> is quite empty.
>
> Masahiro: Can you please try this and build it?
>
> Thanks,
> Michal
>
> diff --git a/arch/microblaze/dts/microblaze-generic.dts
> b/arch/microblaze/dts/microblaze-generic.dts
> index 203330987bda..08a1396f2db2 100644
> --- a/arch/microblaze/dts/microblaze-generic.dts
> +++ b/arch/microblaze/dts/microblaze-generic.dts
> @@ -4,4 +4,6 @@
> #size-cells = <1>;
> aliases {
> } ;
> + chosen {
> + } ;
> } ;
>
Yeah, this fixed the error. Thanks!
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 3/3] kbuild: fix build rule of u-boot-spl.dtb
2016-02-23 7:47 ` Masahiro Yamada
@ 2016-02-23 7:53 ` Michal Simek
0 siblings, 0 replies; 16+ messages in thread
From: Michal Simek @ 2016-02-23 7:53 UTC (permalink / raw)
To: u-boot
On 23.2.2016 08:47, Masahiro Yamada wrote:
> Hi Michal,
>
>
> 2016-02-23 16:06 GMT+09:00 Michal Simek <monstr@monstr.eu>:
>> On 23.2.2016 03:57, Masahiro Yamada wrote:
>>> Hi Michal, Tom, Simon
>>>
>>>
>>>
>>>
>>> 2016-02-23 1:16 GMT+09:00 Tom Rini <trini@konsulko.com>:
>>>> On Mon, Feb 22, 2016 at 04:51:47PM +0100, Michal Simek wrote:
>>>>> Hi,
>>>>>
>>>>> On 8.2.2016 21:49, Tom Rini wrote:
>>>>>> On Fri, Feb 05, 2016 at 05:55:14PM +0900, Masahiro Yamada wrote:
>>>>>>
>>>>>>> The build command of u-boot-spl.dtb is not constant, but dependent
>>>>>>> on CONFIG_OF_SPL_REMOVE_PROPS. Use $(call if_changed,...) so that
>>>>>>> the change of CONFIG_OF_SPL_REMOVE_PROPS is detected.
>>>>>>>
>>>>>>> Also, add tools/fdtgrep to the dependency to make sure u-boot-spl.dtb
>>>>>>> is generated by the up-to-date fdtgrep in case the tool is modified.
>>>>>>>
>>>>>>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>>>>>>> Reviewed-by: Simon Glass <sjg@chromium.org>
>>>>>>
>>>>>> Applied to u-boot/master, thanks!
>>>>>
>>>>> This patch is breaking build for Microblaze SPL.
>>>>> make microblaze-generic_defconfig && make -j
>>>>
>>>> Can you poke around a bit more at what rule is likely needing an update
>>>> here? FWIW, when this was merged microblaze was broken due to the
>>>> eth-uclass.c problem so that's how I missed it, sorry!
>>>
>>>
>>> This breakage is not due to this commit.
>>>
>>> Even if I revert commit 35b786780f3 ("kbuild: fix build rule of
>>> u-boot-spl.dtb"), this board is still broken.
>>
>> That's interesting. I found this commit by bisect.
>>
>>>
>>> I suspect the problem is in the fdtgrep tool itself.
>>
>> Anyway I was playing with it and this is supposed to be a fix.
>> fdtgrep tool is expecting more nodes to be present in DTS file.
>> Because mb dts is generic because every hw design is different dts
>> is quite empty.
>>
>> Masahiro: Can you please try this and build it?
>>
>> Thanks,
>> Michal
>>
>> diff --git a/arch/microblaze/dts/microblaze-generic.dts
>> b/arch/microblaze/dts/microblaze-generic.dts
>> index 203330987bda..08a1396f2db2 100644
>> --- a/arch/microblaze/dts/microblaze-generic.dts
>> +++ b/arch/microblaze/dts/microblaze-generic.dts
>> @@ -4,4 +4,6 @@
>> #size-cells = <1>;
>> aliases {
>> } ;
>> + chosen {
>> + } ;
>> } ;
>>
>
> Yeah, this fixed the error. Thanks!
Ok. I will send this as a patch or temporary solution or even maybe final.
Thanks,
Michal
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-02-23 7:53 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-05 8:55 [U-Boot] [PATCH v3 0/3] Kbuild fixes Masahiro Yamada
2016-02-05 8:55 ` [U-Boot] [PATCH v3 1/3] kbuild: remove unneeded ifdef conditionals around build rules Masahiro Yamada
2016-02-05 20:31 ` Simon Glass
2016-02-08 20:49 ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-05 8:55 ` [U-Boot] [PATCH v3 2/3] kbuild: add missing FORCE where $(call if_changed, ) is used Masahiro Yamada
2016-02-05 20:31 ` Simon Glass
2016-02-08 20:49 ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-05 8:55 ` [U-Boot] [PATCH v3 3/3] kbuild: fix build rule of u-boot-spl.dtb Masahiro Yamada
2016-02-05 20:31 ` Simon Glass
2016-02-08 20:49 ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-22 15:51 ` Michal Simek
2016-02-22 16:16 ` Tom Rini
2016-02-23 2:57 ` Masahiro Yamada
2016-02-23 7:06 ` Michal Simek
2016-02-23 7:47 ` Masahiro Yamada
2016-02-23 7:53 ` Michal Simek
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.