diff options
| author | Stefan Roese <sr@denx.de> | 2007-01-13 08:01:31 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-01-13 08:01:31 +0100 |
| commit | 44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd (patch) | |
| tree | 9eee07aed4b22b114a2527ab24594df4b1e3d451 /board/mcc200 | |
| parent | 95981778cff0038fd9941044d6a3eda810e33258 (diff) | |
| parent | 6abaee42621c07e81a2cd189ad4368b5e8c50280 (diff) | |
| download | u-boot-imx-44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd.zip u-boot-imx-44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd.tar.gz u-boot-imx-44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd.tar.bz2 | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr
Diffstat (limited to 'board/mcc200')
| -rw-r--r-- | board/mcc200/auto_update.c | 8 | ||||
| -rw-r--r-- | board/mcc200/mcc200.c | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/board/mcc200/auto_update.c b/board/mcc200/auto_update.c index 63e4139..f1bb721 100644 --- a/board/mcc200/auto_update.c +++ b/board/mcc200/auto_update.c @@ -121,10 +121,10 @@ struct flash_layout aufl_layout[AU_MAXFILES] = { \ #define I2C_PSOC_KEYPAD_ADDR 0x53 /* keypad mask */ -#define KEYPAD_ROW 3 -#define KEYPAD_COL 3 -#define KEYPAD_MASK_LO ((1<<(KEYPAD_COL-1+(KEYPAD_ROW*4-4)))&0xFF) -#define KEYPAD_MASK_HI ((1<<(KEYPAD_COL-1+(KEYPAD_ROW*4-4)))>>8) +#define KEYPAD_ROW 2 +#define KEYPAD_COL 2 +#define KEYPAD_MASK_LO ((1<<(KEYPAD_COL-1+(KEYPAD_ROW*3-3)))&0xFF) +#define KEYPAD_MASK_HI ((1<<(KEYPAD_COL-1+(KEYPAD_ROW*3-3)))>>8) /* externals */ extern int fat_register_device(block_dev_desc_t *, int); diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c index 67969a6..554c51d 100644 --- a/board/mcc200/mcc200.c +++ b/board/mcc200/mcc200.c @@ -228,10 +228,6 @@ int misc_init_r (void) { ulong flash_sup_end, snum; -#ifdef CONFIG_AUTO_UPDATE - /* this has priority over all else */ - do_auto_update(); -#endif /* * Adjust flash start and offset to detected values */ @@ -294,6 +290,9 @@ int misc_init_r (void) flash_info[0].sector_count = snum; } +#ifdef CONFIG_AUTO_UPDATE + do_auto_update(); +#endif return (0); } |