From 79cd1427f7f894dd41e8285874bcd6bcdcdd77c2 Mon Sep 17 00:00:00 2001
From: oyvind <oyvind@2333b21a-1c27-0410-8132-afba56cb5048>
Date: Fri, 8 Jan 2010 10:37:40 +0000
Subject: [PATCH] bootloader: Added new options to the advanced menu and
 changed some of the menu letters

Two new options reset and continue. Some of the previous menu options
have now different letters to be accessed

Signed-off-by: Laurentiu Cocanu <laurentiu.cocanu@zylin.com>

git-svn-id: http://www.ecosforge.net/ecosforge/trunk/nios2ecos@351 2333b21a-1c27-0410-8132-afba56cb5048
---
 bootloader/bootloader/bootloader.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/bootloader/bootloader/bootloader.c b/bootloader/bootloader/bootloader.c
index 1ec3339..82c9d4f 100644
--- a/bootloader/bootloader/bootloader.c
+++ b/bootloader/bootloader/bootloader.c
@@ -781,7 +781,7 @@ void menu(void)
 			flash_erase_range(macAddr, macAddrLen);
 			fprintf(ser_fp, "done\r\n");
 			goto start_menu;
-		case 'E':
+		case 'U':
 			fprintf(ser_fp, "File name: ");
 			getFileName(fileName, sizeof(fileName));
 			ymodemUpload(fileName);
@@ -798,22 +798,27 @@ void menu(void)
 			cyg_firmware_upgrade(NULL, bootloader);
 			reset();
 			break;
-		case 'R':
+		case 'E':
 			fprintf(ser_fp, "Upload and run file from RAM\r\n");
 			ymodemUpload("/ram/run");
 			runfile("/ram/run");
 			break;
+		case 'R':
+			reset();
+			break;
 		case ' ':
 			fprintf(ser_fp, "\r\nAdvanced menu:\r\n\r\n");
 			fprintf(ser_fp, "Press <F> format flash\r\n");
 			fprintf(ser_fp,
-					"Press <E> to start Ymodem upload of a file to a specified file name\r\n");
-			fprintf(ser_fp, "Press <R> run file from RAM\r\n");
-			fprintf(ser_fp, "Press <Y> to start single shot update of bootloader\r\n");
+					"Press <U> to start Ymodem upload of a file to a specified file name\r\n");
+			fprintf(ser_fp, "Press <E> execute file from RAM\r\n");
+			fprintf(ser_fp, "Press <Y> start single shot update of bootloader\r\n");
 			fprintf(ser_fp, "Press <P> set parameter\r\n");
 			fprintf(ser_fp, "Press <D> show parameter\r\n");
 			fprintf(ser_fp, "Press <B> set 115200 serial speed\r\n");
 			fprintf(ser_fp, "Press <X> erase MAC address\r\n");
+			fprintf(ser_fp, "Press <R> reset\r\n");
+			fprintf(ser_fp, "Press <C> continue\r\n");
 			waiting = 0;
 			goto waitMoreChar;
 
-- 
2.11.4.GIT