From ef152c3b768e8e579b5ce7646ffd39d8434f4812 Mon Sep 17 00:00:00 2001 From: Terry Lv Date: Mon, 18 Jan 2010 16:37:44 +0800 Subject: ENGR00120208: Change recovery mode boot_cmd strategy The new strategy will be: bootargs_android_recovery and bootcmd_android_recovery will be checked. If they exists, their values will be used by bootargs_android and bootcmd_android, or the default vaules will be used. Signed-off-by: Terry Lv --- board/freescale/mx51_bbg/mx51_bbg.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'board/freescale/mx51_bbg') diff --git a/board/freescale/mx51_bbg/mx51_bbg.c b/board/freescale/mx51_bbg/mx51_bbg.c index e5ac369..b9a4292 100644 --- a/board/freescale/mx51_bbg/mx51_bbg.c +++ b/board/freescale/mx51_bbg/mx51_bbg.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007, Guennadi Liakhovetski * - * (C) Copyright 2009 Freescale Semiconductor, Inc. + * (C) Copyright 2009-2010 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -806,12 +806,16 @@ inline int switch_to_recovery_mode(void) env = getenv("bootargs_android_recovery"); /* Set env to recovery mode */ if (!env) - setenv("bootargs_android_recovery", boot_args); + setenv("bootargs_android", boot_args); + else + setenv("bootargs_android", env); + env = getenv("bootcmd_android_recovery"); if (!env) - setenv("bootcmd_android_recovery", boot_cmd); - setenv("bootcmd", "run bootcmd_android_recovery"); - + setenv("bootcmd_android", boot_cmd); + else + setenv("bootcmd_android", env); + setenv("bootcmd", "run bootcmd_android"); return 0; } -- cgit v1.1