From c9efa65a5aa83adb24cef57a9c7025cfaf75e941 Mon Sep 17 00:00:00 2001 From: Zhang Jiejing Date: Wed, 15 Feb 2012 16:40:33 +0800 Subject: ENGR00174536-1 booti: add booti command support. Support booti command which can boot from a boot.img boot.img is a zImage + ramdisk.img + bootargs + boot addr which include these info can be used to avoid mis match between kernel and ramdisk, also can avoid commit to chagne default bootargs. For example: > booti mmc1 command will read the boot.img from 1M offset, and then parser the bootargs and ramdisk then do the boot from that zImage. > booti mmc1 recovery will going to read the recovery's partition no and offset and boot from recovery image. this recovery image also a zImage + ramdisk bootargs: if uboot have define a env var 'bootargs', booti command will use this bootargs as kernel cmdline if you want use boot.img 's bootargs, just type: > setenv bootargs in uboot to clear the bootargs in uboot env. our default uboot env will be NULL in config file. also, android use boot.img to support OTA. Signed-off-by: Zhang Jiejing --- board/freescale/common/recovery.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'board/freescale/common') diff --git a/board/freescale/common/recovery.c b/board/freescale/common/recovery.c index 16e0be479ba..e63a1d40d58 100644 --- a/board/freescale/common/recovery.c +++ b/board/freescale/common/recovery.c @@ -1,7 +1,7 @@ /* * Freescale Android Recovery mode checking routing * - * Copyright (C) 2010 Freescale Semiconductor, Inc. + * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -83,7 +83,6 @@ void setup_recovery_env(void) int bootdev = get_boot_device(); boot_cmd = supported_reco_envs[bootdev].cmd; - boot_args = supported_reco_envs[bootdev].args; if (boot_cmd == NULL) { printf("Unsupported bootup device for recovery\n"); @@ -92,13 +91,6 @@ void setup_recovery_env(void) printf("setup env for recovery..\n"); - env = getenv("bootargs_android_recovery"); - /* Set env to recovery mode */ - /* Only set recovery env when these env not exist, give user a - * chance to change their recovery env */ - if (!env) - setenv("bootargs_android_recovery", boot_args); - env = getenv("bootcmd_android_recovery"); if (!env) setenv("bootcmd_android_recovery", boot_cmd); -- cgit v1.2.3