linux-mips
[Top] [All Lists]

[PATCH][2.6] Fix Makefiles for CONFIG_EMBEDDED_RAMDISK

To: ralf@linux-mips.org
Subject: [PATCH][2.6] Fix Makefiles for CONFIG_EMBEDDED_RAMDISK
From: Dimitri Torfs <dimitri@sonycom.com>
Date: Tue, 6 Jan 2004 21:57:59 +0100
Cc: linux-mips@linux-mips.org
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.4.1i
Hi,

  here are patches that fix the arch/mips/Makefile and
  arch/mips/ramdisk/Makefile when an embedded ramdisk image needs to
  be included through the CONFIG_EMBEDDED_RAMDISK option.


--- linux-mips-2.6.orig/arch/mips/Makefile      2004-01-06 21:17:57.000000000 
+0100
+++ linux.work/arch/mips/Makefile       2004-01-06 21:43:33.000000000 +0100
@@ -187,13 +187,11 @@
 
 #
 # ramdisk/initrd support
-# You need a compressed ramdisk image, named ramdisk.gz in
-# arch/mips/ramdisk
+# You need a compressed ramdisk image, named
+# CONFIG_EMBEDDED_RAMDISK_IMAGE. Relative pathnames 
+# are relative to arch/mips/ramdisk/.
 #
-ifdef CONFIG_EMBEDDED_RAMDISK
-CORE_FILES     += arch/mips/ramdisk/ramdisk.o
-SUBDIRS                += arch/mips/ramdisk
-endif
+core-$(CONFIG_EMBEDDED_RAMDISK)        += arch/mips/ramdisk/
 
 #
 # Firmware support



--- linux-mips-2.6.orig/arch/mips/ramdisk/Makefile      2003-07-29 
16:26:23.000000000 +0200
+++ linux.work/arch/mips/ramdisk/Makefile       2004-01-06 21:40:50.000000000 
+0100
@@ -2,8 +2,19 @@
 # Makefile for a ramdisk image
 #
 
+obj-y += ramdisk.o
+
+
 O_FORMAT = $(shell $(OBJDUMP) -i | head -n 2 | grep elf32)
-img = $(CONFIG_EMBEDDED_RAMDISK_IMAGE)
-ramdisk.o: $(subst ",,$(img)) ld.script
-       echo "O_FORMAT:  " $(O_FORMAT)
-       $(LD) -T ld.script -b binary --oformat $(O_FORMAT) -o $@ $(img)
+img := $(subst ",,$(CONFIG_EMBEDDED_RAMDISK_IMAGE))
+# add $(src) when $(img) is relative
+img := $(subst $(src)//,/,$(src)/$(img))
+
+quiet_cmd_ramdisk = LD      $@
+define cmd_ramdisk
+       $(LD) -T $(src)/ld.script -b binary --oformat $(O_FORMAT) -o $@ $(img)
+endef
+
+$(obj)/ramdisk.o: $(img) $(src)/ld.script
+       $(call cmd,ramdisk)
+


-- 
Dimitri Torfs             |  NSCE 
dimitri.torfs@sonycom.com |  Sint Stevens Woluwestraat 55
tel: +32 2 2908451        |  1130 Brussel
fax: +32 2 7262686        |  Belgium


<Prev in Thread] Current Thread [Next in Thread>