OpenCoreMisc: Move DisableWatchDog to Misc -> Debug

Docs/Configuration.tex

@@ -1335,6 +1335,14 @@ behaviour that does not go to any other sections
 
 \begin{enumerate}
 
+\item
+  \texttt{DisableWatchDog}\\
+  \textbf{Type}: \texttt{plist\ boolean}\\
+  \textbf{Default value}: \texttt{NO}\\
+  \textbf{Description}: Select firmwares may not succeed in quickly booting
+  the operating system, especially in debug mode, which results in watch dog
+  timer aborting the process. This option turns off watch dog timer.
+
 \item
   \texttt{DisplayDelay}\\
   \textbf{Type}: \texttt{plist\ integer}\\
@@ -2514,17 +2522,6 @@ build -a X64 -b RELEASE -t XCODE5 -p IntelFrameworkModulePkg/IntelFrameworkModul
 \subsection{Quirks Properties}\label{uefiquirkprops}
 
 \begin{enumerate}
-\item
-  \texttt{DisableWatchDog}\\
-  \textbf{Type}: \texttt{plist\ boolean}\\
-  \textbf{Default value}: \texttt{NO}\\
-  \textbf{Description}: Select firmwares may not succeed in quickly booting
-  the operating system, which results in watch dog timer aborting the process.
-  This option turns off watch dog timer.
-
-  \emph{Note}: This option is believed to be unnecessary on modern firmwares,
-  yet may be safer to turn on as system performance across the boots is not
-  constant.
 
 \item
   \texttt{IgnoreInvalidFlexRatio}\\

Docs/Sample.plist

@@ -396,6 +396,8 @@
 		</dict>
 		<key>Debug</key>
 		<dict>
+			<key>DisableWatchDog</key>
+			<false/>
 			<key>DisplayDelay</key>
 			<integer>0</integer>
 			<key>DisplayLevel</key>
@@ -588,8 +590,6 @@
 		</dict>
 		<key>Quirks</key>
 		<dict>
-			<key>DisableWatchDog</key>
-			<false/>
 			<key>IgnoreInvalidFlexRatio</key>
 			<false/>
 			<key>IgnoreTextInGraphics</key>

Docs/SampleSimple.plist

@@ -396,6 +396,8 @@
 		</dict>
 		<key>Debug</key>
 		<dict>
+			<key>DisableWatchDog</key>
+			<false/>
 			<key>DisplayDelay</key>
 			<integer>0</integer>
 			<key>DisplayLevel</key>
@@ -487,8 +489,6 @@
 		</dict>
 		<key>Quirks</key>
 		<dict>
-			<key>DisableWatchDog</key>
-			<false/>
 			<key>IgnoreInvalidFlexRatio</key>
 			<false/>
 			<key>IgnoreTextInGraphics</key>

Platform/OpenCore/OpenCoreMisc.c

@@ -119,6 +119,13 @@ OcMiscEarlyInit (
     return EFI_SECURITY_VIOLATION; ///< Should be unreachable.
   }
 
+  if (Config->Misc.Debug.DisableWatchDog) {
+    //
+    // boot.efi kills watchdog only in FV2 UI.
+    //
+    gBS->SetWatchdogTimer (0, 0, 0, NULL);
+  }
+
   OcConfigureLogProtocol (
     Config->Misc.Debug.Target,
     Config->Misc.Debug.DisplayDelay,

Platform/OpenCore/OpenCoreUefi.c

@@ -243,13 +243,6 @@ OcLoadUefiSupport (
   IN OC_CPU_INFO         *CpuInfo
   )
 {
-  if (Config->Uefi.Quirks.DisableWatchDog) {
-    //
-    // boot.efi kills watchdog only in FV2 UI.
-    //
-    gBS->SetWatchdogTimer (0, 0, 0, NULL);
-  }
-
   if (Config->Uefi.Quirks.IgnoreInvalidFlexRatio) {
     OcCpuCorrectFlexRatio (CpuInfo);
   }