Re: [U-Boot] [RFC PATCH 3/4] x86: Allow cmdline setup in setup_zimage() to be optional

Hi Simon,

On Sun, Jan 13, 2013 at 4:48 AM, Simon Glass sjg@chromium.org wrote:

If we are passing this using the device tree then we may not want to set this up here. TBD.

Signed-off-by: Simon Glass sjg@chromium.org

arch/x86/lib/zimage.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 8819afd..9fc450a 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -269,18 +269,21 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, hdr->loadflags |= HEAP_FLAG; }

•   if (bootproto >= 0x0202) {
  

•           hdr->cmd_line_ptr = (uintptr_t)cmd_line;
  

•   } else if (bootproto >= 0x0200) {
  

•           setup_base->screen_info.cl_magic = COMMAND_LINE_MAGIC;
  

•           setup_base->screen_info.cl_offset =
  

•                   (uintptr_t)cmd_line - (uintptr_t)setup_base;
  

•   if (cmd_line) {
  

•           if (bootproto >= 0x0202) {
  

•                   hdr->cmd_line_ptr = (uintptr_t)cmd_line;
  

•           } else if (bootproto >= 0x0200) {
  

To be honest, I think it would be simpler if older kernels are just completely unsupported and get rid of all this logic

Regards,

Graeme