lkml.org 
[lkml]   [2008]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: (Try #3) [Patch 2/8] MIPS: Remove 'TOPDIR' from Makefiles
    On Wed, Jan 02, 2008 at 02:21:36PM +0800, WANG Cong wrote:

    > >> Shouldn't that use $(LINUXINCLUDE), or $(KBUILD_CPPFLAGS)?
    > >It would be better to use $(LINUXINCLUDE) as we then pull in all config
    > >symbols too and do not have to hardcode kbuild internal names (include2).
    >
    > OK. Refine this patch.

    LDSCRIPT also needed fixing to get builds in a separate object directory
    working again.

    I've applied below fix.

    Ralf

    From 8babf06e1265214116fb8ffc634c04df85597c52 Mon Sep 17 00:00:00 2001
    From: WANG Cong <xiyou.wangcong@gmail.com>
    Date: Wed, 2 Jan 2008 14:21:36 +0800
    Subject: [PATCH] [MIPS] Lasat: Fix built in separate object directory.

    Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>

    [Ralf: The LDSCRIPT script needed fixing, too]

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

    diff --git a/arch/mips/lasat/image/Makefile b/arch/mips/lasat/image/Makefile
    index 5332449..7ccd40d 100644
    --- a/arch/mips/lasat/image/Makefile
    +++ b/arch/mips/lasat/image/Makefile
    @@ -12,11 +12,11 @@ endif

    MKLASATIMG = mklasatimg
    MKLASATIMG_ARCH = mq2,mqpro,sp100,sp200
    -KERNEL_IMAGE = $(TOPDIR)/vmlinux
    +KERNEL_IMAGE = vmlinux
    KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep " _text" | cut -f1 -d\ )
    KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\ )

    -LDSCRIPT= -L$(obj) -Tromscript.normal
    +LDSCRIPT= -L$(srctree)/$(obj) -Tromscript.normal

    HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
    -D_kernel_entry=0x$(KERNEL_ENTRY) \
    @@ -24,7 +24,7 @@ HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
    -D TIMESTAMP=$(shell date +%s)

    $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE)
    - $(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $<
    + $(CC) -fno-pic $(HEAD_DEFINES) $(LINUXINCLUDE) -c -o $@ $<

    OBJECTS = head.o kImage.o


    \
     
     \ /
      Last update: 2008-01-11 15:21    [W:0.025 / U:1.408 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site