diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2007-01-10 01:28:39 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-01-10 01:28:39 +0100 |
| commit | 787fa15860a57833e50bd30555079a9cd4e519b8 (patch) | |
| tree | ddf344513127a6ebb7505be0f87eaa00dd2885f6 /board | |
| parent | f4eb54529bb3664c3a562e488b460fe075f79d67 (diff) | |
Fix auto_update for MCC200 board.
The invocation of do_auto_update() is moved to the end of the
misc_init_r() function, after the flash mappings have been
initialized. Please find attached a patch that implements that
change.
Also correct the decoding of the keypad status. With this update, the
key that will trigger the update is Column 2, Row 2.
Diffstat (limited to 'board')
| -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 63e4139fc2..f1bb721284 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 67969a6010..554c51d93f 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); } |