diff options
| author | Terry Lv <r65388@freescale.com> | 2009-11-10 22:29:11 +0800 |
|---|---|---|
| committer | Terry Lv <r65388@freescale.com> | 2009-11-11 11:55:18 +0800 |
| commit | 20710100e480543d36b76845c52cdec382f2b43a (patch) | |
| tree | 240703f02b2f29379dfae9ca97df234e5d1057ce /include/asm-arm | |
| parent | 34bc4951031059ccac23bf13fe261804f075880a (diff) | |
| download | u-boot-imx-20710100e480543d36b76845c52cdec382f2b43a.zip u-boot-imx-20710100e480543d36b76845c52cdec382f2b43a.tar.gz u-boot-imx-20710100e480543d36b76845c52cdec382f2b43a.tar.bz2 | |
ENGR00118294: Misc changes for v2009.08 upgrade.
Misc changes for v2009.08 upgrade.
Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-mx51/keypad.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-mx51/mx51.h | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/asm-arm/arch-mx51/keypad.h b/include/asm-arm/arch-mx51/keypad.h index 23ae4fe..40bd908 100644 --- a/include/asm-arm/arch-mx51/keypad.h +++ b/include/asm-arm/arch-mx51/keypad.h @@ -54,7 +54,7 @@ #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_RIGHT)) && (((e) == (KDepress)))) +#define TEST_POWER_KEY_DEPRESS(k, e) (((k) == (KEY_ENTER)) && (((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)))) diff --git a/include/asm-arm/arch-mx51/mx51.h b/include/asm-arm/arch-mx51/mx51.h index ec6e60c..19097b9 100644 --- a/include/asm-arm/arch-mx51/mx51.h +++ b/include/asm-arm/arch-mx51/mx51.h @@ -399,8 +399,19 @@ #define BOARD_REV_1_0 0x0 #define BOARD_REV_2_0 0x1 +#define NAND_FLASH_BOOT 0x10000000 +#define SPI_NOR_FLASH_BOOT 0x80000000 +#define MMC_FLASH_BOOT 0x40000000 + #ifndef __ASSEMBLER__ +enum boot_device { + UNKNOWN_BOOT, + NAND_BOOT, + SPI_NOR_BOOT, + MMC_BOOT, +}; + enum mxc_clock { MXC_ARM_CLK = 0, MXC_AHB_CLK, @@ -440,6 +451,7 @@ enum mxc_peri_clocks { extern unsigned int mxc_get_clock(enum mxc_clock clk); extern unsigned int get_board_rev(void); extern int is_soc_rev(int rev); +extern enum boot_device get_boot_device(); #endif /* __ASSEMBLER__*/ |