Commit:     d25a9d66e064e14aacc57c7fa95ca4b489df3df0
Parent:     0aeafb0cef401807fe7d2a50f298203659b668af
Author:     David Gibson <[EMAIL PROTECTED]>
AuthorDate: Fri May 4 17:14:13 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Mon May 7 20:31:15 2007 +1000

    [POWERPC] Fix some missing build dependencies in arch/powerpc/boot
    This patch fixes a couple of missing dependencies in
    arch/powerpc/boot/Makefile.  First, it ensures that the zlib.h header
    is linked in before attempting to build gunzip_util.o, as it is,
    building gunzip_util.o usually works, but not always depending on make
    Second, it makes the final images which are built using a dts
    dependent on that dts, so the image will be correctly rebuilt if the
    dts changes.  This in turn requires fixing the definition of the dts
    variable.  CONFIG_DEVICE_TREE from Kconfig will have quotes around it,
    which don't matter when passing the variable to a shell, but which
    need to be removed when incorporating it into a filename for make's
    Signed-off-by: David Gibson <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 arch/powerpc/boot/Makefile |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index f2d850c..d56e24b 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -37,8 +37,8 @@ zlib       := inffast.c inflate.c inftrees.c
 zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
 zliblinuxheader := zlib.h zconf.h zutil.h
-$(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) \
-               $(addprefix $(obj)/,$(zlibheader))
+$(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
+       $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix 
 src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
                ns16550.c serial.c simple_alloc.c div64.S util.S \
@@ -167,10 +167,11 @@ $(obj)/zImage.initrd.ps3: vmlinux
 $(obj)/uImage: vmlinux $(wrapperbits)
        $(call if_changed,wrap,uboot)
+# CONFIG_DEVICE_TREE will have "" around it, make sure to strip them
 dts = $(if $(shell echo $(CONFIG_DEVICE_TREE) | grep '^/'),\
-       ,$(srctree)/$(src)/dts/)$(CONFIG_DEVICE_TREE)
+       ,$(srctree)/$(src)/dts/)$(CONFIG_DEVICE_TREE:"%"=%)
-$(obj)/cuImage.%: vmlinux $(wrapperbits)
+$(obj)/cuImage.%: vmlinux $(dts) $(wrapperbits)
        $(call if_changed,wrap,cuboot-$*,$(dts))
 $(obj)/zImage:         $(addprefix $(obj)/, $(image-y))
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to