kbuild: Fix up initramfs, adapt arch/alpha

Grrh, don't do last minute changes without retesting.

Adapt arch/alpha as well, other archs need to
o add LDFLAGS_BLOB to arch/$(ARCH)/Makefile
o add .init.ramfs to arch/$(ARCH)/vmlinux.lds.S

See arch/i386/{Makefile,vmlinux.lds.S} for guidance ;)

diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index d7faf0a..5730945 100644 (file)
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -12,7 +12,7 @@ NM := $(NM) -B
 
 LDFLAGS_vmlinux = -static -N #-relax
 CFLAGS := $(CFLAGS) -pipe -mno-fp-regs -ffixed-8
-ARCHBLOBLFLAGS := -I binary -O elf64-alpha -B alpha
+LDFLAGS_BLOB := --format binary --oformat elf64-alpha
 
 # Determine if we can use the BWX instructions with GAS.
 old_gas := $(shell if $(AS) --version 2>&1 | grep 'version 2.7' > /dev/null; then echo y; else echo n; fi)

diff --git a/arch/alpha/vmlinux.lds.S b/arch/alpha/vmlinux.lds.S
index 91c9e71..f6e1728 100644 (file)
--- a/arch/alpha/vmlinux.lds.S
+++ b/arch/alpha/vmlinux.lds.S
@@ -69,7 +69,7 @@ SECTIONS
 
   .init.ramfs ALIGN(8192): {
        __initramfs_start = .;
-       *(.init.initramfs)
+       *(.init.ramfs)
        __initramfs_end = .;
   }
 

diff --git a/usr/Makefile b/usr/Makefile
index 60858e8..5ff4e0c 100644 (file)
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -11,6 +11,6 @@ $(obj)/initramfs_data.o: $(src)/initramfs_data.scr $(obj)/initramfs_data.cpio.gz
        $(call if_changed,ld)
 
 $(obj)/initramfs_data.cpio.gz: $(obj)/gen_init_cpio
-       ( cd $(obj) ; ./$< | gzip -9c > $@ )
+       ./$< | gzip -9c > $@