diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2010-09-10 17:17:12 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2010-09-10 17:23:18 +0800 |
| commit | daae245a544d8b23dfa74c6108c35cebef81b8e7 (patch) | |
| tree | a35f6e1eb2b46e6a7431d4f071ebe5299917d093 /include/asm-arm | |
| parent | 7bbe5d7a5203a07496ec372ab55563a2e230d03e (diff) | |
| download | u-boot-imx-daae245a544d8b23dfa74c6108c35cebef81b8e7.zip u-boot-imx-daae245a544d8b23dfa74c6108c35cebef81b8e7.tar.gz u-boot-imx-daae245a544d8b23dfa74c6108c35cebef81b8e7.tar.bz2 | |
ENGR00127368 UBOOT: Make the android recovery code common for platformsrel_imx_2.6.31_10.09.00
Move the android recovery codes into common/recovery.c.
Cut the keypad detecting time. Now we only need detect
there's POWER and HOME key pressing at the time scanning
keyboard matrix. So user must hold these two keys when bootup to
enter recovery mode. This can reduce the uboot boot time with
recovery mode configured.
Later /cache file checking for recovery command should be merged
into the common/recovery.c
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-mx51/keypad.h | 10 | ||||
| -rw-r--r-- | include/asm-arm/arch-mx51/mx51.h | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/include/asm-arm/arch-mx51/keypad.h b/include/asm-arm/arch-mx51/keypad.h index 5846364..1e67547 100644 --- a/include/asm-arm/arch-mx51/keypad.h +++ b/include/asm-arm/arch-mx51/keypad.h @@ -52,14 +52,4 @@ #define KEY_MENU 139 /* Menu (show menu) */ #define KEY_BACK 158 /* AC Back */ -#if defined(CONFIG_MX51_BBG) -#define TEST_HOME_KEY_DEPRESS(k, e) (((k) == (KEY_F1)) && (((e) == (KDepress)))) -#define TEST_POWER_KEY_DEPRESS(k, e) (((k) == (KEY_F3)) && (((e) == (KDepress)))) -#elif defined(CONFIG_MX51_3DS) -#define TEST_HOME_KEY_DEPRESS(k, e) (((k) == (KEY_MENU)) && (((e) == (KDepress)))) -#define TEST_POWER_KEY_DEPRESS(k, e) (((k) == (KEY_F2)) && (((e) == (KDepress)))) -#else -# error Undefined board type! -#endif - #endif diff --git a/include/asm-arm/arch-mx51/mx51.h b/include/asm-arm/arch-mx51/mx51.h index 11aba01..816e792 100644 --- a/include/asm-arm/arch-mx51/mx51.h +++ b/include/asm-arm/arch-mx51/mx51.h @@ -441,10 +441,11 @@ #ifndef __ASSEMBLER__ enum boot_device { - UNKNOWN_BOOT, - NAND_BOOT, + UNKNOWN_BOOT = -1, + NAND_BOOT = 0, SPI_NOR_BOOT, MMC_BOOT, + END_BOOT, }; enum mxc_clock { |