diff options
| author | Shohei Sakamoto <sakamotos@casio.co.jp> | 2016-02-02 19:10:53 +0900 |
|---|---|---|
| committer | Shohei Sakamoto <sakamotos@casio.co.jp> | 2016-02-02 19:14:44 +0900 |
| commit | df4ecce0085de240b1ac40794739e5b7c188065b (patch) | |
| tree | ce64da44123ba2d1d3947acce185bc01b9c9e4f2 | |
| parent | 1a7cebac22b7b095cc2af8f0b4f02496ba5d9fb4 (diff) | |
| download | koi-uboot-df4ecce0085de240b1ac40794739e5b7c188065b.tar.gz | |
Restart after exiting fastboot by power key
Change-Id: I21682b1b230d986992ff2d5ff0a33eb0b0a7a119
Signed-off-by: Shohei Sakamoto <sakamotos@casio.co.jp>
| -rw-r--r-- | board/samsung/koi/koi.c | 4 | ||||
| -rw-r--r-- | common/cmd_fastboot.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/board/samsung/koi/koi.c b/board/samsung/koi/koi.c index e71ec2f69..28423e57c 100644 --- a/board/samsung/koi/koi.c +++ b/board/samsung/koi/koi.c @@ -594,14 +594,14 @@ static void show_selected(int num, int fin) if (num == 0) { run_command("lcdtextcolor 255 255 255", 0); if (fin) - run_command("lcdtext 80 70 \"EXIT FASTBOOT\"", 0); + run_command("lcdtext 60 70 \"POWKEY TO RESTART\"", 0); else run_command("lcdtext 80 70 \"FASTBOOT MODE\"", 0); if (fin) run_command("lcdtextcolor 0 0 0", 0); // erase else run_command("lcdtextcolor 80 80 80", 0); - run_command("lcdtext \"RECOVERY MODE\"", 0); + run_command("lcdtext 80 90 \"RECOVERY MODE\"", 0); } else { if (fin) run_command("lcdtextcolor 0 0 0", 0); // erase diff --git a/common/cmd_fastboot.c b/common/cmd_fastboot.c index db120bc9f..3ec7d7f40 100644 --- a/common/cmd_fastboot.c +++ b/common/cmd_fastboot.c @@ -2414,13 +2414,19 @@ int do_fastboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) current_time = get_ticks(); /* Check if the user wanted to terminate with ^C */ - if ((poll_status != FASTBOOT_OK) && (ctrlc() || exit_key())) + if ((poll_status != FASTBOOT_OK) && ctrlc()) { printf("Fastboot ended by user\n"); continue_from_disconnect = 0; break; } + if ((poll_status != FASTBOOT_OK) && exit_key()) + { + Display_Turnoff(); + do_reset (NULL, 0, 0, NULL); + } + if (fastboot_continue_autoboot) { printf("Continuing with autoboot\n"); |