--- hatari/src/gui-sdl/dlgSystem.c	2019/04/09 08:49:43	1.1.1.9
+++ hatari/src/gui-sdl/dlgSystem.c	2019/04/09 08:53:29	1.1.1.12
@@ -1,8 +1,8 @@
 /*
   Hatari - dlgSystem.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
   
   This file contains 2 system panels :
     - 1 for the old uae CPU
@@ -41,10 +41,11 @@ const char DlgSystem_fileid[] = "Hatari
 #define DLGSYS_BLITTER  25
 #define DLGSYS_RTC      26
 #define DLGSYS_TIMERD   27
+#define DLGSYS_FASTBOOT 28
 
 static SGOBJ systemdlg[] =
 {
-	{ SGBOX, 0, 0, 0,0, 36,24, NULL },
+	{ SGBOX, 0, 0, 0,0, 36,25, NULL },
 	{ SGTEXT, 0, 0, 11,1, 14,1, "System options" },
 
 	{ SGBOX, 0, 0, 2,3, 16,9, NULL },
@@ -77,8 +78,9 @@ static SGOBJ systemdlg[] =
 	{ SGCHECKBOX, 0, 0, 2,18, 20,1, "Blitter emulation" },
 	{ SGCHECKBOX, 0, 0, 2,19, 27,1, "Real time clock emulation" },
 	{ SGCHECKBOX, 0, 0, 2,20, 15,1, "Patch Timer-D" },
+	{ SGCHECKBOX, 0, 0, 2,21, 27,1, "Patch TOS for faster boot" },
 
-	{ SGBUTTON, SG_DEFAULT, 0, 8,22, 20,1, "Back to main menu" },
+	{ SGBUTTON, SG_DEFAULT, 0, 8,23, 20,1, "Back to main menu" },
 	{ -1, 0, 0, 0,0, 0,0, NULL }
 };
 
@@ -153,6 +155,11 @@ void Dialog_SystemDlg(void)
 	else
 		systemdlg[DLGSYS_TIMERD].state &= ~SG_SELECTED;
 
+	if (ConfigureParams.System.bFastBoot)
+		systemdlg[DLGSYS_FASTBOOT].state |= SG_SELECTED;
+	else
+		systemdlg[DLGSYS_FASTBOOT].state &= ~SG_SELECTED;
+
 	/* Show the dialog: */
 	SDLGui_DoDialog(systemdlg, NULL);
 
@@ -194,6 +201,7 @@ void Dialog_SystemDlg(void)
 	ConfigureParams.System.bBlitter = (systemdlg[DLGSYS_BLITTER].state & SG_SELECTED);
 	ConfigureParams.System.bRealTimeClock = (systemdlg[DLGSYS_RTC].state & SG_SELECTED);
 	ConfigureParams.System.bPatchTimerD = (systemdlg[DLGSYS_TIMERD].state & SG_SELECTED);
+	ConfigureParams.System.bFastBoot = (systemdlg[DLGSYS_FASTBOOT].state & SG_SELECTED);
 }
 
 /* The new WinUae cpu "System" dialog: */
@@ -252,15 +260,15 @@ static SGOBJ systemdlg[] =
 
 	{ SGBOX, 0, 0, 32,3, 12,9, NULL },
 	{ SGTEXT, 0, 0, 33,3, 15,1, "CPU clock" },
-	{ SGRADIOBUT, 0, 0, 33,5, 3,1, " 8 Mhz" },
-	{ SGRADIOBUT, 0, 0, 33,6, 4,1, "16 Mhz" },
-	{ SGRADIOBUT, 0, 0, 33,7, 4,1, "32 Mhz" },
+	{ SGRADIOBUT, 0, 0, 33,5, 8,1, " 8 Mhz" },
+	{ SGRADIOBUT, 0, 0, 33,6, 8,1, "16 Mhz" },
+	{ SGRADIOBUT, 0, 0, 33,7, 8,1, "32 Mhz" },
 
 	{ SGBOX, 0, 0, 46,3, 12,9, NULL },
 	{ SGTEXT, 0, 0, 47,3, 11,1, "Falcon DSP" },
-	{ SGRADIOBUT, 0, 0, 47,5, 5,1, "None" },
+	{ SGRADIOBUT, 0, 0, 47,5, 6,1, "None" },
 	{ SGRADIOBUT, 0, 0, 47,6, 7,1, "Dummy" },
-	{ SGRADIOBUT, 0, 0, 47,7, 4,1, "Full" },
+	{ SGRADIOBUT, 0, 0, 47,7, 6,1, "Full" },
 
 	{ SGBOX, 0, 0, 2,13, 28,9, NULL },
 	{ SGTEXT, 0, 0, 3,13, 11,1, "CPU Pamameters" },
@@ -274,11 +282,11 @@ static SGOBJ systemdlg[] =
 
 	{ SGBOX, 0, 0, 32,13, 26,9, NULL },
 	{ SGTEXT, 0, 0, 33,13, 11,1, "FPU" },
-	{ SGRADIOBUT, 0, 0, 33,15, 5,1, "None" },
+	{ SGRADIOBUT, 0, 0, 33,15, 6,1, "None" },
 	{ SGRADIOBUT, 0, 0, 33,16, 7,1, "68881" },
-	{ SGRADIOBUT, 0, 0, 33,17, 4,1, "68882" },
-	{ SGRADIOBUT, 0, 0, 33,18, 4,1, "CPU internal" },
-	{ SGCHECKBOX, 0, 0, 33,20, 4,1, "More compatible, slower" },
+	{ SGRADIOBUT, 0, 0, 33,17, 7,1, "68882" },
+	{ SGRADIOBUT, 0, 0, 33,18, 14,1, "CPU internal" },
+	{ SGCHECKBOX, 0, 0, 33,20, 25,1, "More compatible, slower" },
 
 	{ SGBUTTON, SG_DEFAULT, 0, 21,23, 20,1, "Back to main menu" },
 	{ -1, 0, 0, 0,0, 0,0, NULL }
@@ -358,7 +366,7 @@ void Dialog_SystemDlg(void)
 	else
 		systemdlg[DLGSYS_TIMERD].state &= ~SG_SELECTED;
 
-	/* Adress space 24 bits */
+	/* Address space 24 bits */
 	if (ConfigureParams.System.bAddressSpace24)
 		systemdlg[DLGSYS_24BITS].state |= SG_SELECTED;
 	else