ARM: rockchip: add support bootloader charge

diff --git a/arch/arm/mach-rockchip/common.c b/arch/arm/mach-rockchip/common.c
index acd5ee725991878967268036747e7c37ebc337a9..a41565adbacc4c1dd2fe1e74968cd800be614a94 100755 (executable)
--- a/arch/arm/mach-rockchip/common.c
+++ b/arch/arm/mach-rockchip/common.c
@@ -214,6 +214,7 @@ static inline const char *boot_flag_name(u32 flag)
        case BOOT_WIPEALL: return "WIPEALL";
        case BOOT_CHECKIMG: return "CHECKIMG";
        case BOOT_FASTBOOT: return "FASTBOOT";
+       case BOOT_CHARGING: return "CHARGING";
        default: return "";
        }
 }
@@ -253,8 +254,10 @@ void rockchip_restart_get_boot_mode(const char *cmd, u32 *flag, u32 *mode)
                        *flag = SYS_LOADER_REBOOT_FLAG + BOOT_LOADER;
                else if(!strcmp(cmd, "recovery"))
                        *flag = SYS_LOADER_REBOOT_FLAG + BOOT_RECOVER;
-               else if (!strcmp(cmd, "charge"))
+               else if (!strcmp(cmd, "charge")) {
+                       *flag = SYS_LOADER_REBOOT_FLAG + BOOT_CHARGING;
                        *mode = BOOT_MODE_CHARGE;
+               }
        } else {
                if (is_panic)
                        *mode = BOOT_MODE_PANIC;

diff --git a/arch/arm/mach-rockchip/loader.h b/arch/arm/mach-rockchip/loader.h
index 9eaa790f710db9614d8bad2d1395c6ab5e87da99..bf2cd47320e4f3e5b21d5bf5be4447f19399c90a 100644 (file)
--- a/arch/arm/mach-rockchip/loader.h
+++ b/arch/arm/mach-rockchip/loader.h
@@ -14,7 +14,9 @@ enum {
     BOOT_WIPEDATA,   /* enter recover and wipe data. */
     BOOT_WIPEALL,    /* enter recover and wipe all data. */
     BOOT_CHECKIMG,   /* check firmware img with backup part(in loader mode)*/
-    BOOT_FASTBOOT,   /* enter fast boot mode (not support now) */
+    BOOT_FASTBOOT,   /* enter fast boot mode */
+    BOOT_SECUREBOOT_DISABLE,
+    BOOT_CHARGING,   /* enter charge mode */
     BOOT_MAX         /* MAX VALID BOOT TYPE.*/
 };