[PATCH] usr/: Updated .incbin support

Update support for .incbin in /usr. No longer generate .S files
from within the Makefile.

Also deleted the assignment to LDFLAGS_BLOB for most architectures.
I did not touch ARM and cris:
 arm: Russell told me they did not have a new as that could be used
 cris: Looked like it was used for more than just usr/

diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index 9ee21e0..fa248f6 100644 (file)
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -11,7 +11,6 @@
 NM := $(NM) -B
 
 LDFLAGS_vmlinux        := -static -N #-relax
-LDFLAGS_BLOB   := --format binary --oformat elf64-alpha
 cflags-y       := -pipe -mno-fp-regs -ffixed-8
 
 # Determine if we can use the BWX instructions with GAS.

diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index 105db70..5ed84ef 100644 (file)
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -34,7 +34,6 @@ CFLAGS += -D__linux__
 CFLAGS += -DUTS_SYSNAME=\"uClinux\" -DTARGET=$(BOARD)
 AFLAGS += -DPLATFORM=$(PLATFORM) -DTARGET=$(BOARD) -DMODEL=$(MODEL) $(cflags-y)
 LDFLAGS += $(ldflags-y)
-LDFLAGS_BLOB :=  --format binary --oformat elf32-h8300
 
 CROSS_COMPILE = h8300-elf-
 #HEAD := arch/$(ARCH)/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 8292045..01f4853 100644 (file)
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -18,7 +18,6 @@
 LDFLAGS                := -m elf_i386
 OBJCOPYFLAGS   := -O binary -R .note -R .comment -S
 LDFLAGS_vmlinux :=
-LDFLAGS_BLOB   := --format binary --oformat elf32-i386
 
 CFLAGS += -pipe
 

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 45aaa73..2091b1c 100644 (file)
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -19,7 +19,6 @@ COMPILE_ARCH = $(shell uname -m)
 # override top level makefile
 AS += -m68020
 LDFLAGS := -m m68kelf
-LDFLAGS_BLOB := --format binary --oformat elf32-m68k
 ifneq ($(COMPILE_ARCH),$(ARCH))
        # prefix for cross-compiling binaries
        CROSS_COMPILE = m68k-linux-

diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index e7f435a..53fb220 100644 (file)
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -85,8 +85,6 @@ CFLAGS += -O2 -g
 CFLAGS += -D__linux__
 CFLAGS += -DUTS_SYSNAME=\"uClinux\"
 
-LDFLAGS_BLOB   := --format binary --oformat elf32-m68k
-
 head-y := arch/m68knommu/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
 
 CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h \

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 3173743..d7240aa 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -18,11 +18,9 @@
 ifdef CONFIG_CPU_LITTLE_ENDIAN
 tool-prefix    = mipsel-linux-
 JIFFIES32      = jiffies_64
-LDFLAGS_BLOB   := --format binary --oformat elf32-tradlittlemips
 else
 tool-prefix    = mips-linux-
 JIFFIES32      = jiffies_64 + 4
-LDFLAGS_BLOB   := --format binary --oformat elf32-tradbigmips
 endif
 
 ifdef CONFIG_CROSSCOMPILE

diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 0360608..f615675 100644 (file)
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -20,13 +20,11 @@
 ifdef CONFIG_PARISC64
 CROSS_COMPILE  := hppa64-linux-
 UTS_MACHINE    := parisc64
-LDFLAGS_BLOB   := --format binary --oformat elf64-hppa-linux
 else
 MACHINE := $(subst 64,,$(shell uname -m))
 ifneq ($(MACHINE),parisc)
 CROSS_COMPILE  := hppa-linux-
 endif
-LDFLAGS_BLOB   := --format binary --oformat elf32-hppa-linux
 endif
 
 FINAL_LD=$(CROSS_COMPILE)ld --warn-common --warn-section-align 

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index a4c2f61..033f661 100644 (file)
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -13,7 +13,6 @@
 # This must match PAGE_OFFSET in include/asm-ppc/page.h.
 KERNELLOAD     := $(CONFIG_KERNEL_START)
 
-LDFLAGS_BLOB   := --format binary --oformat elf32-powerpc
 LDFLAGS_vmlinux        := -Ttext $(KERNELLOAD) -Bstatic
 CPPFLAGS       += -Iarch/$(ARCH)
 AFLAGS         += -Iarch/$(ARCH)

diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index 5143955..6758cfc 100644 (file)
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -17,7 +17,6 @@ KERNELLOAD    := 0xc000000000000000
 
 LDFLAGS                := -m elf64ppc
 LDFLAGS_vmlinux        := -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD)
-LDFLAGS_BLOB   := --format binary --oformat elf64-powerpc
 CFLAGS         += -msoft-float -pipe -Wno-uninitialized -mminimal-toc \
                -mtraceback=full -mcpu=power4
 

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index a2a5a89..2fa3cdd 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -17,7 +17,6 @@ check_gcc = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null > /dev
 
 ifdef CONFIG_ARCH_S390_31
 LDFLAGS                := -m elf_s390
-LDFLAGS_BLOB   := --format binary --oformat elf32-s390
 CFLAGS         += -m31
 AFLAGS         += -m31
 UTS_MACHINE    := s390
@@ -26,7 +25,6 @@ endif
 ifdef CONFIG_ARCH_S390X
 LDFLAGS                := -m elf64_s390
 MODFLAGS       += -fpic -D__PIC__
-LDFLAGS_BLOB   := --format binary --oformat elf64-s390
 CFLAGS         += -m64
 AFLAGS         += -m64
 UTS_MACHINE    := s390x

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index e965c9b..b946323 100644 (file)
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -50,10 +50,8 @@ LDFLAGS_vmlinux     += -e _stext
 
 ifdef CONFIG_CPU_LITTLE_ENDIAN
 LDFLAGS_vmlinux     +=  --defsym 'jiffies=jiffies_64' -EL
-LDFLAGS_BLOB    :=--format binary --oformat elf32-sh-linux
 else
 LDFLAGS_vmlinux     +=  --defsym 'jiffies=jiffies_64+4' -EB
-LDFLAGS_BLOB    :=--format binary --oformat elf32-shbig-linux
 endif
 
 CFLAGS         += -pipe $(cpu-y)

diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 7ad7fb7..6d94034 100644 (file)
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -23,8 +23,6 @@ AS              := $(AS) -32
 LDFLAGS                := -m elf32_sparc
 endif
 
-LDFLAGS_BLOB   := --format binary --oformat elf32-sparc
-
 #CFLAGS := $(CFLAGS) -g -pipe -fcall-used-g5 -fcall-used-g7
 ifneq ($(IS_EGCS),y)
 CFLAGS := $(CFLAGS) -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7

diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile
index 7a36556..a48cd18 100644 (file)
--- a/arch/sparc64/Makefile
+++ b/arch/sparc64/Makefile
@@ -32,7 +32,6 @@ RANLIB                = sparc64-linux-ranlib
 else
 AS             := $(AS) -64
 LDFLAGS                := -m elf64_sparc
-LDFLAGS_BLOB   := --format binary --oformat elf64-sparc
 endif
 
 ifneq ($(UNDECLARED_REGS),y)

diff --git a/arch/v850/Makefile b/arch/v850/Makefile
index f1d21d6..6edaed4 100644 (file)
--- a/arch/v850/Makefile
+++ b/arch/v850/Makefile
@@ -27,7 +27,6 @@ CFLAGS += -D__linux__ -DUTS_SYSNAME=\"uClinux\"
 # some reason)
 LDFLAGS_MODULE += --unique=.gnu.linkonce.this_module
 
-LDFLAGS_BLOB := -b binary --oformat elf32-little
 OBJCOPY_FLAGS_BLOB := -I binary -O elf32-little -B v850e
 
 

diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 35447c8..2f6e40f 100644 (file)
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -36,7 +36,6 @@ export IA32_CC IA32_LD IA32_AS IA32_OBJCOPY IA32_CPP
 LDFLAGS                := -m elf_x86_64
 OBJCOPYFLAGS   := -O binary -R .note -R .comment -S
 LDFLAGS_vmlinux := -e stext
-LDFLAGS_BLOB   := --format binary --oformat elf64-x86-64
 
 CFLAGS += -mno-red-zone
 CFLAGS += -mcmodel=kernel

diff --git a/usr/Makefile b/usr/Makefile
index 5c1de8c..fe62659 100644 (file)
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -3,11 +3,12 @@ obj-y := initramfs_data.o
 
 host-progs  := gen_init_cpio
 
-clean-files := initramfs_data.cpio.gz initramfs_data.S
+clean-files := initramfs_data.cpio.gz
 
-$(src)/initramfs_data.S: $(obj)/initramfs_data.cpio.gz
-       echo "  .section .init.ramfs,\"a\"" > $(src)/initramfs_data.S
-       echo ".incbin \"usr/initramfs_data.cpio.gz\"" >> $(src)/initramfs_data.S
+# initramfs_data.o contains the initramfs_data.cpio.gz image.
+# The image is included using .incbin, a dependency which is not
+# tracked automatically.
+$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE
 
 # initramfs-y are the programs which will be copied into the CPIO
 # archive. Currently, the filenames are hardcoded in gen_init_cpio,

diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S
new file mode 100644 (file)
index 0000000..c2e1ad4
--- /dev/null
+++ b/usr/initramfs_data.S
@@ -0,0 +1,30 @@
+/*
+  initramfs_data includes the compressed binary that is the
+  filesystem used for early user space.
+  Note: Older versions of "as" (prior to binutils 2.11.90.0.23
+  released on 2001-07-14) dit not support .incbin.
+  If you are forced to use older binutils than that then the
+  following trick can be applied to create the resulting binary:
+
+
+  ld -m elf_i386  --format binary --oformat elf32-i386 -r \
+  -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
+   ld -m elf_i386  -r -o built-in.o initramfs_data.o
+
+  initramfs_data.scr looks like this:
+SECTIONS
+{
+       .init.ramfs : { *(.data) }
+}
+
+  The above example is for i386 - the parameters vary from architectures.
+  Eventually look up LDFLAGS_BLOB in an older version of the
+  arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
+
+  Using .incbin has the advantage over ld that the correct flags are set
+  in the ELF header, as required by certain architectures.
+*/
+
+.section .init.ramfs,"a"
+.incbin "usr/initramfs_data.cpio.gz"
+