@@ -17,10 +17,10 @@ CONFIG_AUDIT_ARCH=y
CONFIG_B43=m
CONFIG_B43LEGACY=m
CONFIG_B44=m
-CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_BT=m
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_CDROM_PKTCDVD=y
+CONFIG_CRAMFS=m
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_DRM_RADEON=m
CONFIG_FB_BOOT_VESA_SUPPORT=y
@@ -9,10 +9,10 @@
# CONFIG_B43 is not set
# CONFIG_B43LEGACY is not set
# CONFIG_B44 is not set
-CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BT is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_CRAMFS=y
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq"
@@ -384,6 +384,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
# CONFIG_BLK_DEV_SR_VENDOR is not set
@@ -610,7 +611,6 @@ CONFIG_CPU_SUP_TRANSMETA_32=y
CONFIG_CPU_SUP_UMC_32=y
CONFIG_CPU_TLB_V7=y
CONFIG_CPU_V7=y
-CONFIG_CRAMFS=m
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
CONFIG_CRC32=y
@@ -15,10 +15,10 @@ CONFIG_ATM=m
CONFIG_B43=m
CONFIG_B43LEGACY=m
CONFIG_B44=m
-CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_BT=m
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_CDROM_PKTCDVD=y
+CONFIG_CRAMFS=m
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_DRM_RADEON=m
CONFIG_FB_BOOT_VESA_SUPPORT=y
@@ -16,10 +16,10 @@ CONFIG_ATM=m
CONFIG_B43=m
CONFIG_B43LEGACY=m
CONFIG_B44=m
-CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_BT=m
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_CDROM_PKTCDVD=y
+CONFIG_CRAMFS=m
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq"
Bump CONFIG_BLK_DEV_RAM_SIZE as 4096 was too small for the unpacked size of our current d-i versatile initrd (~11 MB); 65536 is probably fine as on the other architectures. Also, set CONFIG_CRAMFS=y as apparently qemu loads the -initrd arg in a way which only works with the kernel's initrd support instead of the initramfs code; this is a workaround until qemu's ARM loader is fixed. BugLink: https://bugs.launchpad.net/bugs/524893 Signed-off-by: Loïc Minier <loic.minier@ubuntu.com> --- debian.master/config/amd64/config.common.amd64 | 2 +- debian.master/config/armel/config.common.armel | 2 +- debian.master/config/config.common.ubuntu | 2 +- debian.master/config/i386/config.common.i386 | 2 +- debian.master/config/lpia/config.common.lpia | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)