[PATCH 2/2] UBUNTU: [Config] armel: Reset default command-line

Loïc Minier loic.minier at ubuntu.com
Mon Mar 22 10:17:38 UTC 2010


Reset default command-line to empty; it was set to boot from /dev/rom3
with 32 MB of RAM, but this flavour is for use im QEMU which doesn't
emulate the ROM devices and passes memory size via an ATAG already --
setting mem=32m in the default kernel cmdline required an explicit
mem=256m on the QEMU cmdline to override.

Signed-off-by: Loïc Minier <loic.minier at ubuntu.com>
---
 debian.master/config/config.common.ubuntu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bc2185e..f36b54f 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -541,7 +541,7 @@ CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_CLS_U32_MARK=y
 # CONFIG_CLS_U32_PERF is not set
-CONFIG_CMDLINE="root=1f03 mem=32M"
+CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_CNIC=m
 CONFIG_CODA_FS=m
-- 
1.7.0





More information about the kernel-team mailing list