Re: [microblaze-uclinux] [PATCH] microblaze: Drop CMDLINE_FORCE

["Steven J. Magnani" <steve@xxxxxxxxxxxxxxx>]

On Wed, 2009-05-20 at 21:33 +0200, Michal Simek wrote: 
> 
> Steven.J.Magnani@xxxxxxxxxxxxxxxxxx wrote:
> > This patch is relative to 2.6.30-rc6.
> 
> Please do not write this comment to commit message.
> I think that could be able to add it under --- all that message
> won't be add with git-am which I used.

I will try to remember but this conflicts with the instructions in
SubmittingPatches. Since there are so many potential versions of setup.c
flying about it seemed best to be specific.

> 
> > 
> > CMDLINE_FORCE functionality is now provided within prom.c
> > based on the #definition of CONFIG_CMDLINE, so this Kconfig
> > parameter can be dropped.
> 
> There are 4 levels of passing command line to kernel - from the lowest to the highest priority.
> 1. via r5 reg from bootloader
> 2. from kernel menuconfig (CMDLINE)
> 3. from dts file
> 4. from kernel menuconfig (CMDLINE) + CMDLINE_FORCE
> 
> Your patches described choice 3 and removed choice 4.
> I hope that all choices still work as I tested them in past.
> 
> If is any reason why I should remove that choice please write it.

Having the FORCE logic in setup_arch() is too late for early parameters
to be parsed from CMDLINE, as parse_early_param() is invoked via
machine_early_init(). If FORCE is supposed to make CMDLINE win when both
dts bootargs and CMDLINE are specified I can see keeping it around, but
you should probably do something to address the early param issue.

It would be nice if this hierarchy were documented somewhere as it's not
obvious to the casual observer.

--Steve

> 
> Michal
> 
> > 
> > Signed-off-by: Steven J. Magnani <steve@xxxxxxxxxxxxxxx>
> > ---
> > diff -uprN a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
> > --- a/arch/microblaze/Kconfig	2009-05-20 13:21:13.000000000 -0500
> > +++ b/arch/microblaze/Kconfig	2009-05-20 13:23:45.000000000 -0500
> > @@ -94,14 +94,6 @@ config CMDLINE
> >  	  supply some command-line options at build time by entering them
> >  	  here.
> >  
> > -config CMDLINE_FORCE
> > -	bool "Force default kernel command string"
> > -	depends on CMDLINE_BOOL
> > -	default n
> > -	help
> > -	  Set this to have arguments from the default kernel command string
> > -	  override those passed by the boot loader.
> > -
> >  config OF
> >  	def_bool y
> >  
> > diff -uprN a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
> > --- a/arch/microblaze/kernel/setup.c	2009-05-20 13:21:27.000000000 -0500
> > +++ b/arch/microblaze/kernel/setup.c	2009-05-20 13:23:28.000000000 -0500
> > @@ -42,10 +42,6 @@ char cmd_line[COMMAND_LINE_SIZE];
> >  
> >  void __init setup_arch(char **cmdline_p)
> >  {
> > -#ifdef CONFIG_CMDLINE_FORCE
> > -	strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
> > -	strlcpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
> > -#endif
> >  	*cmdline_p = cmd_line;
> >  
> >  	console_verbose();
> > 
> > ___________________________
> > microblaze-uclinux mailing list
> > microblaze-uclinux@xxxxxxxxxxxxxx
> > Project Home Page : http://www.itee.uq.edu.au/~jwilliams/mblaze-uclinux
> > Mailing List Archive : http://www.itee.uq.edu.au/~listarch/microblaze-uclinux/
> > 
> > 
> 


___________________________
microblaze-uclinux mailing list
microblaze-uclinux@xxxxxxxxxxxxxx
Project Home Page : http://www.itee.uq.edu.au/~jwilliams/mblaze-uclinux
Mailing List Archive : http://www.itee.uq.edu.au/~listarch/microblaze-uclinux/