patches/0081-ENGR00120208-Change-recovery-mode-boot_cmd-strategy.patch

   1 From ef152c3b768e8e579b5ce7646ffd39d8434f4812 Mon Sep 17 00:00:00 2001
   2 From: Terry Lv <r65388@freescale.com>
   3 Date: Mon, 18 Jan 2010 16:37:44 +0800
   4 Subject: [PATCH] ENGR00120208: Change recovery mode boot_cmd strategy
   5
   6 The new strategy will be:
   7 bootargs_android_recovery and bootcmd_android_recovery
   8 will be checked.
   9 If they exists, their values will be used by bootargs_android
  10 and bootcmd_android, or the default vaules will be used.
  11
  12 Signed-off-by: Terry Lv <r65388@freescale.com>
  13 ---
  14  board/freescale/mx51_3stack/mx51_3stack.c |   12 ++++++++----
  15  board/freescale/mx51_bbg/mx51_bbg.c       |   14 +++++++++-----
  16  2 files changed, 17 insertions(+), 9 deletions(-)
  17
  18 diff --git a/board/freescale/mx51_3stack/mx51_3stack.c b/board/freescale/mx51_3stack/mx51_3stack.c
  19 index e70234a..af5d3df 100644
  20 --- a/board/freescale/mx51_3stack/mx51_3stack.c
  21 +++ b/board/freescale/mx51_3stack/mx51_3stack.c
  22 @@ -703,12 +703,16 @@ static int switch_to_recovery_mode(void)
  23         env = getenv("bootargs_android_recovery");
  24         /* Set env to recovery mode */
  25         if (!env)
  26 -               setenv("bootargs_android_recovery", boot_args);
  27 +               setenv("bootargs_android", boot_args);
  28 +       else
  29 +               setenv("bootargs_android", env);
  30 +
  31         env = getenv("bootcmd_android_recovery");
  32         if (!env)
  33 -               setenv("bootcmd_android_recovery", boot_cmd);
  34 -       setenv("bootcmd", "run bootcmd_android_recovery");
  35 -
  36 +               setenv("bootcmd_android", boot_cmd);
  37 +       else
  38 +               setenv("bootcmd_android", env);
  39 +       setenv("bootcmd", "run bootcmd_android");
  40
  41         return 0;
  42  }
  43 diff --git a/board/freescale/mx51_bbg/mx51_bbg.c b/board/freescale/mx51_bbg/mx51_bbg.c
  44 index e5ac369..b9a4292 100644
  45 --- a/board/freescale/mx51_bbg/mx51_bbg.c
  46 +++ b/board/freescale/mx51_bbg/mx51_bbg.c
  47 @@ -1,7 +1,7 @@
  48  /*
  49   * Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
  50   *
  51 - * (C) Copyright 2009 Freescale Semiconductor, Inc.
  52 + * (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
  53   *
  54   * See file CREDITS for list of people who contributed to this
  55   * project.
  56 @@ -806,12 +806,16 @@ inline int switch_to_recovery_mode(void)
  57         env = getenv("bootargs_android_recovery");
  58         /* Set env to recovery mode */
  59         if (!env)
  60 -               setenv("bootargs_android_recovery", boot_args);
  61 +               setenv("bootargs_android", boot_args);
  62 +       else
  63 +               setenv("bootargs_android", env);
  64 +
  65         env = getenv("bootcmd_android_recovery");
  66         if (!env)
  67 -               setenv("bootcmd_android_recovery", boot_cmd);
  68 -       setenv("bootcmd", "run bootcmd_android_recovery");
  69 -
  70 +               setenv("bootcmd_android", boot_cmd);
  71 +       else
  72 +               setenv("bootcmd_android", env);
  73 +       setenv("bootcmd", "run bootcmd_android");
  74
  75         return 0;
  76  }
  77 --
  78 1.5.4.4
  79