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

login
register
mail settings
Submitter Loïc Minier
Date March 22, 2010, 10:17 a.m.
Message ID <1269253058-8131-2-git-send-email-loic.minier@ubuntu.com>
Download mbox | patch
Permalink /patch/48276/
State Accepted
Delegated to: Stefan Bader
Headers show

Comments

Loïc Minier - March 22, 2010, 10:17 a.m.
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@ubuntu.com>
---
 debian.master/config/config.common.ubuntu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Loïc Minier - March 22, 2010, 10:26 a.m.
On Mon, Mar 22, 2010, Loïc Minier wrote:
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> -CONFIG_CMDLINE="root=1f03 mem=32M"
> +CONFIG_CMDLINE=""

 NB: arch/x86 only uses CONFIG_CMDLINE if CONFIG_CMDLINE_BOOL is set
 while arch/arm doesn't have any such concept; since our comon.ubuntu
 config has CONFIG_CMDLINE_BOOL unset, this only affects ARM.
Amit Kucheria - March 23, 2010, 9:09 a.m.
On 10 Mar 22, Loïc Minier wrote:
> 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@ubuntu.com>
Acked-by: Amit Kucheria <amit.kucheria@canonical.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
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Stefan Bader - March 23, 2010, 9:22 a.m.
Ok, so for x86 the setting had no effect as it depends on the CMDLINE_BOOL to be
set and for the ports there is config.common.ports. So the change here has only
effect on the armel build.

Loïc Minier wrote:
> 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@ubuntu.com>
Acked-by: Stefan Bader <stefan.bader@canonical.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

Patch

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