diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/keymile/common/common.c | 5 | ||||
| -rw-r--r-- | board/keymile/common/common.h | 2 | ||||
| -rw-r--r-- | board/keymile/km82xx/km82xx.c | 9 |
3 files changed, 15 insertions, 1 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index b9aff1a84d..8de129dc83 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -354,8 +354,11 @@ static int do_checktestboot(cmd_tbl_t *cmdtp, int flag, int argc, #if defined(CONFIG_POST) testpin = post_hotkeys_pressed(); - s = getenv("test_bank"); #endif +#if defined(CONFIG_MGCOGE3NE) + testpin = get_testpin(); +#endif + s = getenv("test_bank"); /* when test_bank is not set, act as if testpin is not asserted */ testboot = (testpin != 0) && (s); if (verbose) { diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h index dcfefc46b3..c74f569a61 100644 --- a/board/keymile/common/common.h +++ b/board/keymile/common/common.h @@ -134,6 +134,8 @@ int wait_for_fpga_config(void); int fpga_reset(void); int toggle_eeprom_spi_bus(void); +int get_testpin(void); + int set_km_env(void); int fdt_set_node_and_value(void *blob, char *nodename, diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c index 03cd10c58b..cc9a7c9a8e 100644 --- a/board/keymile/km82xx/km82xx.c +++ b/board/keymile/km82xx/km82xx.c @@ -473,3 +473,12 @@ int ft_board_setup(void *blob, bd_t *bd) return 0; } #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */ + +#if defined(CONFIG_MGCOGE3NE) +int get_testpin(void) +{ + /* Testpin is Port C pin 29 - enable = low */ + int testpin = !get_pin(0x00000004, 2); + return testpin; +} +#endif |
