diff for duplicates of <20080111141754.GC19900@linux-mips.org> diff --git a/a/1.txt b/N1/1.txt index c12e887..c9617db 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,41 +12,3 @@ 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 diff --git a/a/content_digest b/N1/content_digest index eaa5e30..c33e439 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -29,44 +29,6 @@ "\n" "I've applied below fix.\n" "\n" - " Ralf\n" - "\n" - "From 8babf06e1265214116fb8ffc634c04df85597c52 Mon Sep 17 00:00:00 2001\n" - "From: WANG Cong <xiyou.wangcong@gmail.com>\n" - "Date: Wed, 2 Jan 2008 14:21:36 +0800\n" - "Subject: [PATCH] [MIPS] Lasat: Fix built in separate object directory.\n" - "\n" - "Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>\n" - "\n" - "[Ralf: The LDSCRIPT script needed fixing, too]\n" - "\n" - "Signed-off-by: Ralf Baechle <ralf@linux-mips.org>\n" - "\n" - "diff --git a/arch/mips/lasat/image/Makefile b/arch/mips/lasat/image/Makefile\n" - "index 5332449..7ccd40d 100644\n" - "--- a/arch/mips/lasat/image/Makefile\n" - "+++ b/arch/mips/lasat/image/Makefile\n" - "@@ -12,11 +12,11 @@ endif\n" - " \n" - " MKLASATIMG = mklasatimg\n" - " MKLASATIMG_ARCH = mq2,mqpro,sp100,sp200\n" - "-KERNEL_IMAGE = $(TOPDIR)/vmlinux\n" - "+KERNEL_IMAGE = vmlinux\n" - " KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep \" _text\" | cut -f1 -d\\ )\n" - " KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\\ )\n" - " \n" - "-LDSCRIPT= -L$(obj) -Tromscript.normal\n" - "+LDSCRIPT= -L$(srctree)/$(obj) -Tromscript.normal\n" - " \n" - " HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \\\n" - " \t\t-D_kernel_entry=0x$(KERNEL_ENTRY) \\\n" - "@@ -24,7 +24,7 @@ HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \\\n" - " \t\t-D TIMESTAMP=$(shell date +%s)\n" - " \n" - " $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE)\n" - "-\t$(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $<\n" - "+\t$(CC) -fno-pic $(HEAD_DEFINES) $(LINUXINCLUDE) -c -o $@ $<\n" - " \n" - OBJECTS = head.o kImage.o + Ralf -7cd8521ecae08fdf116ebc951894e22e2fe382dca377aae1e049c30cbec444d3 +3c7d0ec5363988ff24ed4f2170146de599e5ad386abac6c8e0759cafde1feb30
diff --git a/a/1.txt b/N2/1.txt index c12e887..893d053 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -13,7 +13,7 @@ I've applied below fix. Ralf -From 8babf06e1265214116fb8ffc634c04df85597c52 Mon Sep 17 00:00:00 2001 +>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. diff --git a/a/content_digest b/N2/content_digest index eaa5e30..2144f09 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -31,7 +31,7 @@ "\n" " Ralf\n" "\n" - "From 8babf06e1265214116fb8ffc634c04df85597c52 Mon Sep 17 00:00:00 2001\n" + ">From 8babf06e1265214116fb8ffc634c04df85597c52 Mon Sep 17 00:00:00 2001\n" "From: WANG Cong <xiyou.wangcong@gmail.com>\n" "Date: Wed, 2 Jan 2008 14:21:36 +0800\n" "Subject: [PATCH] [MIPS] Lasat: Fix built in separate object directory.\n" @@ -69,4 +69,4 @@ " \n" OBJECTS = head.o kImage.o -7cd8521ecae08fdf116ebc951894e22e2fe382dca377aae1e049c30cbec444d3 +8abed4ff944a8ed64d16958bde5c7f161a7f04971ff7d5637ba37d8029b53e0f
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.