Home » Mailing list archives » linux-kernel » 2010 » August » 26

[PATCH v2 0/2] initramfs: Cleanup and fix initramfs size calculation

Previous thread: [PATCH v2 2/2] initramfs: Fix initramfs size calculation by Hendrik Brueckner on Thursday, August 26, 2010 - 4:41 am. (1 message)

Next thread: [PATCH] perf: fix possible divide-by-zero in perf_swevent_overflow() by Dongdong Deng on Thursday, August 26, 2010 - 5:07 am. (9 messages)
[view original message]
From: Hendrik Brueckner
Subject: [PATCH v2 0/2] initramfs: Cleanup and fix initramfs size calculation
Date: Thursday, August 26, 2010 - 4:41 am

Done ;-)

The first patch in this series introduces a common initramfs_data.S file
that is shared by the compression variants.  The second patch adds the new
initramfs size calculation proposed in the initial patch.
See the patch description for more details.


Kind regards,
  Hendrik
--


[ message continues ]
[view original message]
From: Hendrik Brueckner
Subject: [PATCH v2 1/2] initramfs: Generalize initramfs_data.xxx.S variants
Date: Thursday, August 26, 2010 - 4:41 am

Remove initramfs_data.{lzo,lzma,gz,bz2}.S variants and use a common
implementation in initramfs_data.S.  The common implementation expects
the file name of the initramfs to be defined in INITRAMFS_IMAGE.

Change the Makefile to set the INITRAMFS_IMAGE define symbol according
to the selected compression method.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
---
 usr/Makefile              |    6 ++++--
 usr/initramfs_data.S      |    5 +++--
 usr/initramfs_data.bz2.S  |   29 -----------------------------
 usr/initramfs_data.gz.S   |   29 -----------------------------
 usr/initramfs_data.lzma.S |   29 -----------------------------
 usr/initramfs_data.lzo.S  |   29 -----------------------------
 6 files changed, 7 insertions(+), 120 deletions(-)

--- a/usr/Makefile
+++ b/usr/Makefile
@@ -18,13 +18,15 @@ suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZ
 # Lzo
 suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZO)   = .lzo
 
+AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)"
+
 # Generate builtin.o based on initramfs_data.o
-obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data$(suffix_y).o
+obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o
 
 # initramfs_data.o contains the compressed initramfs_data.cpio image.
 # The image is included using .incbin, a dependency which is not
 # tracked automatically.
-$(obj)/initramfs_data$(suffix_y).o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE
+$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE
 
 #####
 # Generate the initramfs cpio archive
--- a/usr/initramfs_data.S
+++ b/usr/initramfs_data.S
@@ -25,6 +25,7 @@ SECTIONS
   in the ELF header, as required by certain architectures.
 */
 
-.section .init.ramfs,"a"
-.incbin "usr/initramfs_data.cpio"
+#include <linux/stringify.h>
 
+.section .init.ramfs,"a"
+.incbin __stringify(INITRAMFS_IMAGE)
--- a/usr/initramfs_data.bz2.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-  initramfs_data includes the compressed binary that is the
-  filesystem used ...
[ message continues ]
Previous thread: [PATCH v2 2/2] initramfs: Fix initramfs size calculation by Hendrik Brueckner on Thursday, August 26, 2010 - 4:41 am. (1 message)

Next thread: [PATCH] perf: fix possible divide-by-zero in perf_swevent_overflow() by Dongdong Deng on Thursday, August 26, 2010 - 5:07 am. (9 messages)