diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 18:13:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 18:13:55 -0400 |
| commit | c9e2a72ff1acfdffdecb338b3d997f90c507e665 (patch) | |
| tree | 9be4b7e6a1cb90ffa86148a3937021118a5913c0 /usr/Makefile | |
| parent | 9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e (diff) | |
| parent | d63f6d1b4d3ad0d88685a5f8eb1c3cac01ddd0db (diff) | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
initramfs: Fix build break on symbol-prefixed archs
initramfs: fix initramfs size calculation
initramfs: generalize initramfs_data.xxx.S variants
scripts/kallsyms: Enable error messages while hush up unnecessary warnings
scripts/setlocalversion: update comment
kbuild: Use a single clean rule for kernel and external modules
kbuild: Do not run make clean in $(srctree)
scripts/mod/modpost.c: fix commentary accordingly to last changes
kbuild: Really don't clean bounds.h and asm-offsets.h
Diffstat (limited to 'usr/Makefile')
| -rw-r--r-- | usr/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/Makefile b/usr/Makefile index 6b4b6da0b67d..6faa444b7087 100644 --- a/usr/Makefile +++ b/usr/Makefile | |||
| @@ -18,13 +18,15 @@ suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZMA) = .lzma | |||
| 18 | # Lzo | 18 | # Lzo |
| 19 | suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZO) = .lzo | 19 | suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZO) = .lzo |
| 20 | 20 | ||
| 21 | AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)" | ||
| 22 | |||
| 21 | # Generate builtin.o based on initramfs_data.o | 23 | # Generate builtin.o based on initramfs_data.o |
| 22 | obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data$(suffix_y).o | 24 | obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o |
| 23 | 25 | ||
| 24 | # initramfs_data.o contains the compressed initramfs_data.cpio image. | 26 | # initramfs_data.o contains the compressed initramfs_data.cpio image. |
| 25 | # The image is included using .incbin, a dependency which is not | 27 | # The image is included using .incbin, a dependency which is not |
| 26 | # tracked automatically. | 28 | # tracked automatically. |
| 27 | $(obj)/initramfs_data$(suffix_y).o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE | 29 | $(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE |
| 28 | 30 | ||
| 29 | ##### | 31 | ##### |
| 30 | # Generate the initramfs cpio archive | 32 | # Generate the initramfs cpio archive |