| Message ID | dbbe4501557edf266bddfceb9209be8d31db71c9.1421311988.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Michal, On 15 January 2015 at 01:53, Michal Simek <michal.simek@xilinx.com> wrote: > Fake option is enabled only when CONFIG_TRACE is > enabled in common/bootm.c:do_boot_states(). > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > common/cmd_bootm.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c > index 67233600b157..48199bfff3ed 100644 > --- a/common/cmd_bootm.c > +++ b/common/cmd_bootm.c > @@ -185,6 +185,9 @@ static char bootm_help_text[] = > "\tcmdline - OS specific command line processing/setup\n" > "\tbdt - OS specific bd_t processing\n" > "\tprep - OS specific prep before relocation or go\n" > +#if defined(CONFIG_TRACE) > + "\tfake - OS specific fake start without go\n" > +#endif nit: I think it should be 'OS-specific' > "\tgo - start OS"; > #endif Regards, Simon
On 01/15/2015 03:25 PM, Simon Glass wrote: > Hi Michal, > > On 15 January 2015 at 01:53, Michal Simek <michal.simek@xilinx.com> wrote: >> Fake option is enabled only when CONFIG_TRACE is >> enabled in common/bootm.c:do_boot_states(). >> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com> >> --- >> >> common/cmd_bootm.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c >> index 67233600b157..48199bfff3ed 100644 >> --- a/common/cmd_bootm.c >> +++ b/common/cmd_bootm.c >> @@ -185,6 +185,9 @@ static char bootm_help_text[] = >> "\tcmdline - OS specific command line processing/setup\n" >> "\tbdt - OS specific bd_t processing\n" >> "\tprep - OS specific prep before relocation or go\n" >> +#if defined(CONFIG_TRACE) >> + "\tfake - OS specific fake start without go\n" >> +#endif > > nit: I think it should be 'OS-specific' Just following what it is written above but follow-up cleanup patch can be submitted. Thanks, Michal
On 15 January 2015 at 07:55, Michal Simek <monstr@monstr.eu> wrote: > On 01/15/2015 03:25 PM, Simon Glass wrote: >> Hi Michal, >> >> On 15 January 2015 at 01:53, Michal Simek <michal.simek@xilinx.com> wrote: >>> Fake option is enabled only when CONFIG_TRACE is >>> enabled in common/bootm.c:do_boot_states(). >>> >>> Signed-off-by: Michal Simek <michal.simek@xilinx.com> >>> --- >>> >>> common/cmd_bootm.c | 3 +++ >>> 1 file changed, 3 insertions(+) >>> >>> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c >>> index 67233600b157..48199bfff3ed 100644 >>> --- a/common/cmd_bootm.c >>> +++ b/common/cmd_bootm.c >>> @@ -185,6 +185,9 @@ static char bootm_help_text[] = >>> "\tcmdline - OS specific command line processing/setup\n" >>> "\tbdt - OS specific bd_t processing\n" >>> "\tprep - OS specific prep before relocation or go\n" >>> +#if defined(CONFIG_TRACE) >>> + "\tfake - OS specific fake start without go\n" >>> +#endif >> >> nit: I think it should be 'OS-specific' > > Just following what it is written above but follow-up cleanup patch > can be submitted. OK. Reviewed-by: Simon Glass <sjg@chromium.org>
Hi Tom, On 01/15/2015 03:57 PM, Simon Glass wrote: > On 15 January 2015 at 07:55, Michal Simek <monstr@monstr.eu> wrote: >> On 01/15/2015 03:25 PM, Simon Glass wrote: >>> Hi Michal, >>> >>> On 15 January 2015 at 01:53, Michal Simek <michal.simek@xilinx.com> wrote: >>>> Fake option is enabled only when CONFIG_TRACE is >>>> enabled in common/bootm.c:do_boot_states(). >>>> >>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com> >>>> --- >>>> >>>> common/cmd_bootm.c | 3 +++ >>>> 1 file changed, 3 insertions(+) >>>> >>>> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c >>>> index 67233600b157..48199bfff3ed 100644 >>>> --- a/common/cmd_bootm.c >>>> +++ b/common/cmd_bootm.c >>>> @@ -185,6 +185,9 @@ static char bootm_help_text[] = >>>> "\tcmdline - OS specific command line processing/setup\n" >>>> "\tbdt - OS specific bd_t processing\n" >>>> "\tprep - OS specific prep before relocation or go\n" >>>> +#if defined(CONFIG_TRACE) >>>> + "\tfake - OS specific fake start without go\n" >>>> +#endif >>> >>> nit: I think it should be 'OS-specific' >> >> Just following what it is written above but follow-up cleanup patch >> can be submitted. > > OK. > > Reviewed-by: Simon Glass <sjg@chromium.org> > Can you please apply this patch? Thanks, Michal
On Thu, Jan 15, 2015 at 09:53:13AM +0100, Michal Simek wrote: > Fake option is enabled only when CONFIG_TRACE is > enabled in common/bootm.c:do_boot_states(). > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 67233600b157..48199bfff3ed 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -185,6 +185,9 @@ static char bootm_help_text[] = "\tcmdline - OS specific command line processing/setup\n" "\tbdt - OS specific bd_t processing\n" "\tprep - OS specific prep before relocation or go\n" +#if defined(CONFIG_TRACE) + "\tfake - OS specific fake start without go\n" +#endif "\tgo - start OS"; #endif
Fake option is enabled only when CONFIG_TRACE is enabled in common/bootm.c:do_boot_states(). Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- common/cmd_bootm.c | 3 +++ 1 file changed, 3 insertions(+) -- 1.8.2.3