Changeset 101191 in vbox for trunk

Timestamp:

Sep 20, 2023 12:16:40 PM (18 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

159164

Message:

Main/ConsoleImplConfigArmV8.cpp: Emit the uart FDT node only when a serial port is actually configured to avoid the UEFI hanging because it thinks there is something available, bugref:10403

File:

• trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp

@@ -534 +534 @@
             InsertConfigInteger(pCfg,  "MmioBase", 0x09000000);
 
+            vrc = RTFdtNodeAddF(hFdt, "pl011@%RX32", 0x09000000);                               VRC();
+            vrc = RTFdtNodePropertyAddStringList(hFdt, "clock-names", 2, "uartclk", "apb_pclk"); VRC();
+            vrc = RTFdtNodePropertyAddCellsU32(hFdt, "clocks", 2,
+                                               idPHandleAbpPClk, idPHandleAbpPClk);             VRC();
+            vrc = RTFdtNodePropertyAddCellsU32(hFdt, "interrupts", 3, 0x00, 0x01, 0x04);        VRC();
+            vrc = RTFdtNodePropertyAddCellsU32(hFdt, "reg", 4, 0, 0x09000000, 0, 0x1000);       VRC();
+            vrc = RTFdtNodePropertyAddStringList(hFdt, "compatible", 2,
+                                                 "arm,pl011", "arm,primecell");                 VRC();
+            vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
+
             BOOL  fServer;
             hrc = serialPort->COMGETTER(Server)(&fServer);                                  H();
@@ -549 +559 @@
             }
         }
-
-        vrc = RTFdtNodeAddF(hFdt, "pl011@%RX32", 0x09000000);                               VRC();
-        vrc = RTFdtNodePropertyAddStringList(hFdt, "clock-names", 2, "uartclk", "apb_pclk"); VRC();
-        vrc = RTFdtNodePropertyAddCellsU32(hFdt, "clocks", 2,
-                                           idPHandleAbpPClk, idPHandleAbpPClk);             VRC();
-        vrc = RTFdtNodePropertyAddCellsU32(hFdt, "interrupts", 3, 0x00, 0x01, 0x04);        VRC();
-        vrc = RTFdtNodePropertyAddCellsU32(hFdt, "reg", 4, 0, 0x09000000, 0, 0x1000);       VRC();
-        vrc = RTFdtNodePropertyAddStringList(hFdt, "compatible", 2,
-                                             "arm,pl011", "arm,primecell");                 VRC();
-        vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
 
         InsertConfigNode(pDevices, "arm-pl031-rtc", &pDev);