diff --git a/misc/config_tools/data/generic_board/generic_board.xml b/misc/config_tools/data/generic_board/generic_board.xml index 32b3e8b0b..20252d47e 100644 --- a/misc/config_tools/data/generic_board/generic_board.xml +++ b/misc/config_tools/data/generic_board/generic_board.xml @@ -1,142 +1,97 @@ BIOS Information - Vendor: Intel Corporation - Version: TGLIFUI1.R00.3333.A04.2009091208 - Release Date: 09/09/2020 + Vendor: Intel Corp. + Version: TNTGL357.0042.2020.1221.1743 + Release Date: 12/21/2020 + BIOS Revision: 5.19 Base Board Information Manufacturer: Intel Corporation - Product Name: TigerLake U DDR4 SODIMM RVP - Version: 1 + Product Name: NUC11TNBi5 + Version: M11904-403 00:00.0 Host bridge: Intel Corporation Device 9a14 (rev 01) 00:02.0 VGA compatible controller: Intel Corporation Device 9a49 (rev 01) - Region 0: Memory at 607c000000 (64-bit, non-prefetchable) [size=16M] + Region 0: Memory at 603c000000 (64-bit, non-prefetchable) [size=16M] Region 2: Memory at 4000000000 (64-bit, prefetchable) [size=256M] - Region 0: Memory at 0000000000000000 (64-bit, non-prefetchable) - Region 2: Memory at 0000000000000000 (64-bit, prefetchable) - 00:04.0 Signal processing controller: Intel Corporation Device 9a03 (rev 01) - Region 0: Memory at 607d480000 (64-bit, non-prefetchable) [size=128K] + Region 0: Memory at 0000004010000000 (64-bit, non-prefetchable) + Region 2: Memory at 0000004020000000 (64-bit, prefetchable) 00:06.0 PCI bridge: Intel Corporation Device 9a09 (rev 01) - 00:07.0 PCI bridge: Intel Corporation Device 9a23 (rev 01) - 00:07.1 PCI bridge: Intel Corporation Device 9a25 (rev 01) + 00:07.0 PCI bridge: Intel Corporation Device 9a25 (rev 01) 00:07.2 PCI bridge: Intel Corporation Device 9a27 (rev 01) - 00:07.3 PCI bridge: Intel Corporation Device 9a29 (rev 01) 00:08.0 System peripheral: Intel Corporation Device 9a11 (rev 01) - Region 0: Memory at 607d4f3000 (64-bit, non-prefetchable) [disabled] [size=4K] - 00:0a.0 Signal processing controller: Intel Corporation Device 9a0d (rev 01) - Region 0: Memory at 607d4d0000 (64-bit, non-prefetchable) [size=32K] + Region 0: Memory at 603d1b3000 (64-bit, non-prefetchable) [disabled] [size=4K] 00:0d.0 USB controller: Intel Corporation Device 9a13 (rev 01) - Region 0: Memory at 607d4c0000 (64-bit, non-prefetchable) [size=64K] - 00:0d.1 USB controller: Intel Corporation Device 9a15 (rev 01) - Region 0: Memory at 607d200000 (64-bit, non-prefetchable) [disabled] [size=2M] - Region 2: Memory at 607d4f2000 (64-bit, non-prefetchable) [disabled] [size=4K] + Region 0: Memory at 603d190000 (64-bit, non-prefetchable) [size=64K] 00:0d.2 USB controller: Intel Corporation Device 9a1b (rev 01) - Region 0: Memory at 607d440000 (64-bit, non-prefetchable) [size=256K] - Region 2: Memory at 607d4f1000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at 603d140000 (64-bit, non-prefetchable) [disabled] [size=256K] + Region 2: Memory at 603d1b2000 (64-bit, non-prefetchable) [disabled] [size=4K] 00:0d.3 USB controller: Intel Corporation Device 9a1d (rev 01) - Region 0: Memory at 607d400000 (64-bit, non-prefetchable) [size=256K] - Region 2: Memory at 607d4f0000 (64-bit, non-prefetchable) [size=4K] - 00:10.0 Serial bus controller [0c80]: Intel Corporation Device a0d8 (rev 20) - Region 0: Memory at 4010000000 (64-bit, non-prefetchable) [size=4K] - 00:10.5 Host bridge: Intel Corporation Device a0af (rev 20) - 00:12.0 Serial controller: Intel Corporation Device a0fc (rev 20) - Region 0: Memory at 607d4b0000 (64-bit, non-prefetchable) [size=64K] + Region 0: Memory at 603d100000 (64-bit, non-prefetchable) [disabled] [size=256K] + Region 2: Memory at 603d1b1000 (64-bit, non-prefetchable) [disabled] [size=4K] 00:14.0 USB controller: Intel Corporation Device a0ed (rev 20) - Region 0: Memory at 607d4a0000 (64-bit, non-prefetchable) [size=64K] - 00:14.1 USB controller: Intel Corporation Device a0ee (rev 20) - Region 0: Memory at 607d000000 (64-bit, non-prefetchable) [disabled] [size=2M] - Region 2: Memory at 607d4ee000 (64-bit, non-prefetchable) [disabled] [size=4K] + Region 0: Memory at 603d180000 (64-bit, non-prefetchable) [size=64K] 00:14.2 RAM memory: Intel Corporation Device a0ef (rev 20) - Region 0: Memory at 607d4dc000 (64-bit, non-prefetchable) [disabled] [size=16K] - Region 2: Memory at 607d4ed000 (64-bit, non-prefetchable) [disabled] [size=4K] + Region 0: Memory at 603d1a8000 (64-bit, non-prefetchable) [disabled] [size=16K] + Region 2: Memory at 603d1b0000 (64-bit, non-prefetchable) [disabled] [size=4K] 00:14.3 Network controller: Intel Corporation Device a0f0 (rev 20) - Region 0: Memory at 607d4d8000 (64-bit, non-prefetchable) [size=16K] + Region 0: Memory at 603d1a4000 (64-bit, non-prefetchable) [size=16K] 00:15.0 Serial bus controller [0c80]: Intel Corporation Device a0e8 (rev 20) - Region 0: Memory at 4010001000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at 4017000000 (64-bit, non-prefetchable) [size=4K] 00:15.1 Serial bus controller [0c80]: Intel Corporation Device a0e9 (rev 20) - Region 0: Memory at 4010002000 (64-bit, non-prefetchable) [size=4K] - 00:15.2 Serial bus controller [0c80]: Intel Corporation Device a0ea (rev 20) - Region 0: Memory at 4010003000 (64-bit, non-prefetchable) [size=4K] - 00:15.3 Serial bus controller [0c80]: Intel Corporation Device a0eb (rev 20) - Region 0: Memory at 4010004000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at 4017001000 (64-bit, non-prefetchable) [size=4K] 00:16.0 Communication controller: Intel Corporation Device a0e0 (rev 20) - Region 0: Memory at 607d4e8000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at 603d1ad000 (64-bit, non-prefetchable) [size=4K] 00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20) - Region 0: Memory at 86420000 (32-bit, non-prefetchable) [size=8K] - Region 1: Memory at 86424000 (32-bit, non-prefetchable) [size=256] - Region 5: Memory at 86423000 (32-bit, non-prefetchable) [size=2K] - 00:19.0 Serial bus controller [0c80]: Intel Corporation Device a0c5 (rev 20) - Region 0: Memory at 4010005000 (64-bit, non-prefetchable) [size=4K] - 00:19.1 Serial bus controller [0c80]: Intel Corporation Device a0c6 (rev 20) - Region 0: Memory at 4010006000 (64-bit, non-prefetchable) [size=4K] - 00:1c.0 PCI bridge: Intel Corporation Device a0bc (rev 20) - 00:1e.0 Communication controller: Intel Corporation Device a0a8 (rev 20) - Region 0: Memory at 4010007000 (64-bit, non-prefetchable) [size=4K] - 00:1e.3 Serial bus controller [0c80]: Intel Corporation Device a0ab (rev 20) - Region 0: Memory at 4010008000 (64-bit, non-prefetchable) [size=4K] - 00:1e.4 Ethernet controller: Intel Corporation Device a0ac (rev 20) - Region 0: Memory at 607d4e0000 (64-bit, non-prefetchable) [disabled] [size=8K] - Region 2: Memory at 607d4e3000 (64-bit, non-prefetchable) [disabled] [size=4K] - 00:1f.0 ISA bridge: Intel Corporation Device a088 (rev 20) + Region 0: Memory at 6a500000 (32-bit, non-prefetchable) [size=8K] + Region 1: Memory at 6a503000 (32-bit, non-prefetchable) [size=256] + Region 5: Memory at 6a502000 (32-bit, non-prefetchable) [size=2K] + 00:1d.0 PCI bridge: Intel Corporation Device a0b1 (rev 20) + 00:1f.0 ISA bridge: Intel Corporation Device a082 (rev 20) + 00:1f.3 Audio device: Intel Corporation Device a0c8 (rev 20) + Region 0: Memory at 603d1a0000 (64-bit, non-prefetchable) [size=16K] + Region 4: Memory at 603d000000 (64-bit, non-prefetchable) [size=1M] 00:1f.4 SMBus: Intel Corporation Device a0a3 (rev 20) - Region 0: Memory at 607d4e2000 (64-bit, non-prefetchable) [size=256] + Region 0: Memory at 603d1ac000 (64-bit, non-prefetchable) [size=256] 00:1f.5 Serial bus controller [0c80]: Intel Corporation Device a0a4 (rev 20) Region 0: Memory at 4f800000 (32-bit, non-prefetchable) [size=4K] - 00:1f.6 Ethernet controller: Intel Corporation Device 15fc (rev 20) - Region 0: Memory at 86400000 (32-bit, non-prefetchable) [size=128K] - 01:00.0 Non-Volatile memory controller: Intel Corporation Device f1a5 (rev 03) - Region 0: Memory at 86300000 (64-bit, non-prefetchable) [size=16K] - aa:00.0 Non-Volatile memory controller: Silicon Motion, Inc. Device 2263 (rev 03) - Region 0: Memory at 86200000 (64-bit, non-prefetchable) [size=16K] + 01:00.0 Non-Volatile memory controller: Silicon Motion, Inc. Device 2263 (rev 03) + Region 0: Memory at 6a400000 (64-bit, non-prefetchable) [size=16K] + 58:00.0 Ethernet controller: Intel Corporation Device 15f2 (rev 03) + Region 0: Memory at 6a200000 (32-bit, non-prefetchable) [size=1M] + Region 3: Memory at 6a300000 (32-bit, non-prefetchable) [size=16K] 00:00.0 0600: 8086:9a14 (rev 01) 00:02.0 0300: 8086:9a49 (rev 01) - 00:04.0 1180: 8086:9a03 (rev 01) 00:06.0 0604: 8086:9a09 (rev 01) - 00:07.0 0604: 8086:9a23 (rev 01) - 00:07.1 0604: 8086:9a25 (rev 01) + 00:07.0 0604: 8086:9a25 (rev 01) 00:07.2 0604: 8086:9a27 (rev 01) - 00:07.3 0604: 8086:9a29 (rev 01) 00:08.0 0880: 8086:9a11 (rev 01) - 00:0a.0 1180: 8086:9a0d (rev 01) 00:0d.0 0c03: 8086:9a13 (rev 01) - 00:0d.1 0c03: 8086:9a15 (rev 01) 00:0d.2 0c03: 8086:9a1b (rev 01) 00:0d.3 0c03: 8086:9a1d (rev 01) - 00:10.0 0c80: 8086:a0d8 (rev 20) - 00:10.5 0600: 8086:a0af (rev 20) - 00:12.0 0700: 8086:a0fc (rev 20) 00:14.0 0c03: 8086:a0ed (rev 20) - 00:14.1 0c03: 8086:a0ee (rev 20) 00:14.2 0500: 8086:a0ef (rev 20) 00:14.3 0280: 8086:a0f0 (rev 20) 00:15.0 0c80: 8086:a0e8 (rev 20) 00:15.1 0c80: 8086:a0e9 (rev 20) - 00:15.2 0c80: 8086:a0ea (rev 20) - 00:15.3 0c80: 8086:a0eb (rev 20) 00:16.0 0780: 8086:a0e0 (rev 20) 00:17.0 0106: 8086:a0d3 (rev 20) - 00:19.0 0c80: 8086:a0c5 (rev 20) - 00:19.1 0c80: 8086:a0c6 (rev 20) - 00:1c.0 0604: 8086:a0bc (rev 20) - 00:1e.0 0780: 8086:a0a8 (rev 20) - 00:1e.3 0c80: 8086:a0ab (rev 20) - 00:1e.4 0200: 8086:a0ac (rev 20) - 00:1f.0 0601: 8086:a088 (rev 20) + 00:1d.0 0604: 8086:a0b1 (rev 20) + 00:1f.0 0601: 8086:a082 (rev 20) + 00:1f.3 0403: 8086:a0c8 (rev 20) 00:1f.4 0c05: 8086:a0a3 (rev 20) 00:1f.5 0c80: 8086:a0a4 (rev 20) - 00:1f.6 0200: 8086:15fc (rev 20) - 01:00.0 0108: 8086:f1a5 (rev 03) - aa:00.0 0108: 126f:2263 (rev 03) + 01:00.0 0108: 126f:2263 (rev 03) + 58:00.0 0200: 8086:15f2 (rev 03) - #define WAKE_VECTOR_32 0x3FF6300CUL - #define WAKE_VECTOR_64 0x3FF63018UL + #define WAKE_VECTOR_32 0x40CD800CUL + #define WAKE_VECTOR_64 0x40CD8018UL #define RESET_REGISTER_ADDRESS 0xCF9UL @@ -176,7 +131,7 @@ #define S5_PKG_RESERVED 0x0U - #define DRHD_COUNT 6U + #define DRHD_COUNT 4U #define DRHD0_DEV_CNT 0x1U #define DRHD0_SEGMENT 0x0U @@ -191,7 +146,7 @@ #define DRHD1_DEV_CNT 0x1U #define DRHD1_SEGMENT 0x0U #define DRHD1_FLAGS 0x0U - #define DRHD1_REG_BASE 0xFED84000UL + #define DRHD1_REG_BASE 0xFED85000UL #define DRHD1_IGNORE false #define DRHD1_DEVSCOPE0_TYPE 0x2U #define DRHD1_DEVSCOPE0_ID 0x0U @@ -201,56 +156,53 @@ #define DRHD2_DEV_CNT 0x1U #define DRHD2_SEGMENT 0x0U #define DRHD2_FLAGS 0x0U - #define DRHD2_REG_BASE 0xFED85000UL + #define DRHD2_REG_BASE 0xFED86000UL #define DRHD2_IGNORE false #define DRHD2_DEVSCOPE0_TYPE 0x2U #define DRHD2_DEVSCOPE0_ID 0x0U #define DRHD2_DEVSCOPE0_BUS 0x0U - #define DRHD2_DEVSCOPE0_PATH 0x39U + #define DRHD2_DEVSCOPE0_PATH 0x3aU - #define DRHD3_DEV_CNT 0x1U + #define DRHD3_DEV_CNT 0x2U #define DRHD3_SEGMENT 0x0U - #define DRHD3_FLAGS 0x0U - #define DRHD3_REG_BASE 0xFED86000UL + #define DRHD3_FLAGS 0x1U + #define DRHD3_REG_BASE 0xFED91000UL #define DRHD3_IGNORE false - #define DRHD3_DEVSCOPE0_TYPE 0x2U - #define DRHD3_DEVSCOPE0_ID 0x0U + #define DRHD3_DEVSCOPE0_TYPE 0x3U + #define DRHD3_DEVSCOPE0_ID 0x2U #define DRHD3_DEVSCOPE0_BUS 0x0U - #define DRHD3_DEVSCOPE0_PATH 0x3aU - - #define DRHD4_DEV_CNT 0x1U - #define DRHD4_SEGMENT 0x0U - #define DRHD4_FLAGS 0x0U - #define DRHD4_REG_BASE 0xFED87000UL - #define DRHD4_IGNORE false - #define DRHD4_DEVSCOPE0_TYPE 0x2U - #define DRHD4_DEVSCOPE0_ID 0x0U - #define DRHD4_DEVSCOPE0_BUS 0x0U - #define DRHD4_DEVSCOPE0_PATH 0x3bU - - #define DRHD5_DEV_CNT 0x2U - #define DRHD5_SEGMENT 0x0U - #define DRHD5_FLAGS 0x1U - #define DRHD5_REG_BASE 0xFED91000UL - #define DRHD5_IGNORE false - #define DRHD5_DEVSCOPE0_TYPE 0x3U - #define DRHD5_DEVSCOPE0_ID 0x2U - #define DRHD5_DEVSCOPE0_BUS 0x0U - #define DRHD5_DEVSCOPE0_PATH 0xf7U - #define DRHD5_DEVSCOPE1_TYPE 0x4U - #define DRHD5_DEVSCOPE1_ID 0x0U - #define DRHD5_DEVSCOPE1_BUS 0x0U - #define DRHD5_DEVSCOPE1_PATH 0xf6U + #define DRHD3_DEVSCOPE0_PATH 0xf7U + #define DRHD3_DEVSCOPE1_TYPE 0x4U + #define DRHD3_DEVSCOPE1_ID 0x0U + #define DRHD3_DEVSCOPE1_BUS 0x0U + #define DRHD3_DEVSCOPE1_PATH 0xf6U - "11th Gen Intel(R) Core(TM) i7-1185GRE @ 2.80GHz" + "11th Gen Intel(R) Core(TM) i5-1135G7 @ 2.40GHz" - {{SPACE_FFixedHW, 0x00U, 0x00U, 0x00U, 0x00UL}, 0x01U, 0x00U, 0x00U}, /* C1 */ + {{SPACE_FFixedHW, 0x00U, 0x00U, 0x00U, 0x00UL}, 0x01U, 0x01U, 0x00U}, /* C1 */ + {{SPACE_SYSTEM_IO, 0x08U, 0x00U, 0x00U, 0x1816UL}, 0x02U, 0xFDU, 0x00U}, /* C2 */ + {{SPACE_SYSTEM_IO, 0x08U, 0x00U, 0x00U, 0x1819UL}, 0x03U, 0x418U, 0x00U}, /* C3 */ - /* Px data is not available */ + {0x961UL, 0x00UL, 0x0AUL, 0x0AUL, 0x002A00UL, 0x002A00UL}, /* P0 */ + {0x960UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001800UL, 0x001800UL}, /* P1 */ + {0x8FCUL, 0x00UL, 0x0AUL, 0x0AUL, 0x001700UL, 0x001700UL}, /* P2 */ + {0x834UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001500UL, 0x001500UL}, /* P3 */ + {0x7D0UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001400UL, 0x001400UL}, /* P4 */ + {0x708UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001200UL, 0x001200UL}, /* P5 */ + {0x6A4UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001100UL, 0x001100UL}, /* P6 */ + {0x5DCUL, 0x00UL, 0x0AUL, 0x0AUL, 0x000F00UL, 0x000F00UL}, /* P7 */ + {0x578UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000E00UL, 0x000E00UL}, /* P8 */ + {0x514UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000D00UL, 0x000D00UL}, /* P9 */ + {0x44CUL, 0x00UL, 0x0AUL, 0x0AUL, 0x000B00UL, 0x000B00UL}, /* P10 */ + {0x384UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000900UL, 0x000900UL}, /* P11 */ + {0x320UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000800UL, 0x000800UL}, /* P12 */ + {0x2BCUL, 0x00UL, 0x0AUL, 0x0AUL, 0x000700UL, 0x000700UL}, /* P13 */ + {0x1F4UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000500UL, 0x000500UL}, /* P14 */ + {0x190UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000400UL, 0x000400UL}, /* P15 */ /* PCI mmcfg base of MCFG */ @@ -269,178 +221,131 @@ 00001000-0009efff : System RAM 0009f000-000fffff : Reserved 000a0000-000bffff : PCI Bus 0000:00 - 000f0000-000fffff : System ROM - 00100000-34431fff : System RAM - 34432000-34432fff : Reserved - 34433000-36a7efff : System RAM - 36a7f000-36a7ffff : Reserved - 36a80000-38eecfff : System RAM - 38eed000-38f19fff : Reserved - 38f1a000-391b1fff : System RAM - 391b2000-391b2fff : Reserved - 391b3000-3cd3cfff : System RAM - 3cd3d000-3ff10fff : Reserved - 3ff11000-3ffb2fff : ACPI Non-volatile Storage - 3ff5b000-3ff5bfff : USBC000:00 - 3ffb3000-4007efff : ACPI Tables - 4007f000-4007ffff : System RAM - 40080000-40087fff : Reserved - 40088000-46bfffff : System RAM - 46c00000-4f7fffff : Reserved - 4b800000-4f7fffff : Graphics Stolen Memory + 000e0000-000e3fff : PCI Bus 0000:00 + 000e4000-000e7fff : PCI Bus 0000:00 + 000e8000-000ebfff : PCI Bus 0000:00 + 000ec000-000effff : PCI Bus 0000:00 + 000f0000-000fffff : PCI Bus 0000:00 + 000f0000-000fffff : System ROM + 00100000-2f7cefff : System RAM + 2f7cf000-2f86dfff : Reserved + 2f86e000-33e6afff : System RAM + 33e6b000-33e6bfff : Reserved + 33e6c000-38136fff : System RAM + 38137000-40b51fff : Reserved + 40b52000-40c1dfff : ACPI Tables + 40c1e000-40cdbfff : ACPI Non-volatile Storage + 40cdc000-417fefff : Reserved + 417ff000-417fffff : System RAM + 41800000-47ffffff : Reserved + 48e00000-4f7fffff : Reserved 4f800000-bfffffff : PCI Bus 0000:00 4f800000-4f800fff : 0000:00:1f.5 - 50000000-5c1fffff : PCI Bus 0000:80 - 5e000000-6a1fffff : PCI Bus 0000:56 - 6c000000-781fffff : PCI Bus 0000:2c - 7a000000-861fffff : PCI Bus 0000:02 - 86200000-862fffff : PCI Bus 0000:aa - 86200000-86203fff : 0000:aa:00.0 - 86200000-86203fff : nvme - 86300000-863fffff : PCI Bus 0000:01 - 86300000-86303fff : 0000:01:00.0 - 86300000-86303fff : nvme - 86400000-8641ffff : 0000:00:1f.6 - 86400000-8641ffff : e1000e - 86420000-86421fff : 0000:00:17.0 - 86420000-86421fff : ahci - 86423000-864237ff : 0000:00:17.0 - 86423000-864237ff : ahci - 86424000-864240ff : 0000:00:17.0 - 86424000-864240ff : ahci + 50000000-5c1fffff : PCI Bus 0000:2d + 5e000000-6a1fffff : PCI Bus 0000:02 + 6a200000-6a3fffff : PCI Bus 0000:58 + 6a200000-6a2fffff : 0000:58:00.0 + 6a200000-6a2fffff : igc + 6a300000-6a303fff : 0000:58:00.0 + 6a300000-6a303fff : igc + 6a400000-6a4fffff : PCI Bus 0000:01 + 6a400000-6a403fff : 0000:01:00.0 + 6a400000-6a403fff : nvme + 6a500000-6a501fff : 0000:00:17.0 + 6a500000-6a501fff : ahci + 6a502000-6a5027ff : 0000:00:17.0 + 6a502000-6a5027ff : ahci + 6a503000-6a5030ff : 0000:00:17.0 + 6a503000-6a5030ff : ahci c0000000-cfffffff : PCI MMCONFIG 0000 [bus 00-ff] - c0000000-cfffffff : pnp 00:05 - fd000000-fd68ffff : pnp 00:06 + c0000000-cfffffff : Reserved + fd000000-fd68ffff : pnp 00:05 fd690000-fd69ffff : INT34C5:00 - fd690000-fd69ffff : INT34C5:00 INT34C5:00 fd6a0000-fd6affff : INT34C5:00 - fd6a0000-fd6affff : INT34C5:00 INT34C5:00 - fd6b0000-fd6cffff : pnp 00:06 + fd6b0000-fd6cffff : pnp 00:05 fd6d0000-fd6dffff : INT34C5:00 - fd6d0000-fd6dffff : INT34C5:00 INT34C5:00 fd6e0000-fd6effff : INT34C5:00 - fd6e0000-fd6effff : INT34C5:00 INT34C5:00 - fd6f0000-fdffffff : pnp 00:06 - fe001210-fe001247 : INTC1023:00 - fe001310-fe001347 : INTC1024:00 - fe04c000-fe04ffff : pnp 00:06 - fe050000-fe0affff : pnp 00:06 - fe0d0000-fe0fffff : pnp 00:06 - fe200000-fe7fffff : pnp 00:06 - fec00000-fec003ff : IOAPIC 0 - fed00000-fed003ff : HPET 0 - fed00000-fed003ff : PNP0103:00 + fd6f0000-fdffffff : pnp 00:05 + fe000000-fe010fff : Reserved + fe04c000-fe04ffff : pnp 00:05 + fe050000-fe0affff : pnp 00:05 + fe0d0000-fe0fffff : pnp 00:05 + fe200000-fe7fffff : pnp 00:05 + fec00000-fec00fff : Reserved + fec00000-fec003ff : IOAPIC 0 + fed00000-fed00fff : Reserved + fed00000-fed003ff : HPET 0 + fed00000-fed003ff : PNP0103:00 fed20000-fed7ffff : Reserved - fed40000-fed44fff : INTC6000:00 - fed84000-fed84fff : dmar1 - fed85000-fed85fff : dmar2 - fed86000-fed86fff : dmar3 - fed87000-fed87fff : dmar4 + fed40000-fed44fff : MSFT0101:00 + fed40000-fed44fff : MSFT0101:00 + fed85000-fed85fff : dmar1 + fed86000-fed86fff : dmar2 fed90000-fed90fff : dmar0 - fed91000-fed91fff : dmar5 - feda0000-feda0fff : pnp 00:05 - feda1000-feda1fff : pnp 00:05 - fedc0000-fedc7fff : pnp 00:05 - fee00000-feefffff : pnp 00:05 - fee00000-fee00fff : Local APIC - ff400000-ffffffff : Reserved - 100000000-4907fffff : System RAM - 2f1800000-2f24010d6 : Kernel code - 2f2600000-2f2924fff : Kernel rodata - 2f2a00000-2f2ba09bf : Kernel data - 2f30b0000-2f31fffff : Kernel bss - 490800000-493ffffff : RAM buffer + fed91000-fed91fff : dmar3 + feda0000-feda0fff : pnp 00:04 + feda1000-feda1fff : pnp 00:04 + fedc0000-fedc7fff : pnp 00:04 + fee00000-fee00fff : Local APIC + fee00000-fee00fff : Reserved + ff000000-ffffffff : Reserved + ff000000-ffffffff : pnp 00:05 + 100000000-3b07fffff : System RAM + 2f3c00000-2f4a00ed0 : Kernel code + 2f4a00ed1-2f545353f : Kernel data + 2f571d000-2f5bfffff : Kernel bss + 3b0800000-3b3ffffff : RAM buffer 4000000000-7fffffffff : PCI Bus 0000:00 4000000000-400fffffff : 0000:00:02.0 - 4010000000-4010000fff : 0000:00:10.0 - 4010000000-40100001ff : lpss_dev - 4010000000-40100001ff : i2c_designware.0 lpss_dev - 4010000200-40100002ff : lpss_priv - 4010001000-4010001fff : 0000:00:15.0 - 4010001000-40100011ff : lpss_dev - 4010001000-40100011ff : i2c_designware.1 lpss_dev - 4010001200-40100012ff : lpss_priv - 4010001800-4010001fff : idma64.1 - 4010002000-4010002fff : 0000:00:15.1 - 4010002000-40100021ff : lpss_dev - 4010002000-40100021ff : i2c_designware.2 lpss_dev - 4010002200-40100022ff : lpss_priv - 4010002800-4010002fff : idma64.2 - 4010003000-4010003fff : 0000:00:15.2 - 4010003000-40100031ff : lpss_dev - 4010003000-40100031ff : i2c_designware.3 lpss_dev - 4010003200-40100032ff : lpss_priv - 4010003800-4010003fff : idma64.3 - 4010004000-4010004fff : 0000:00:15.3 - 4010004000-40100041ff : lpss_dev - 4010004000-40100041ff : i2c_designware.4 lpss_dev - 4010004200-40100042ff : lpss_priv - 4010004800-4010004fff : idma64.4 - 4010005000-4010005fff : 0000:00:19.0 - 4010005000-40100051ff : lpss_dev - 4010005000-40100051ff : i2c_designware.5 lpss_dev - 4010005200-40100052ff : lpss_priv - 4010005800-4010005fff : idma64.5 - 4010006000-4010006fff : 0000:00:19.1 - 4010006000-40100061ff : lpss_dev - 4010006000-40100061ff : i2c_designware.6 lpss_dev - 4010006200-40100062ff : lpss_priv - 4010006800-4010006fff : idma64.6 - 4010007000-4010007fff : 0000:00:1e.0 - 4010007000-40100071ff : lpss_dev - 4010007200-40100072ff : lpss_priv - 4010007800-4010007fff : idma64.7 - 4010008000-4010008fff : 0000:00:1e.3 - 4010008000-40100081ff : lpss_dev - 4010008000-40100081ff : pxa2xx-spi.8 lpss_dev - 4010008200-40100082ff : lpss_priv - 4010008800-4010008fff : idma64.8 - 6000000000-601bffffff : PCI Bus 0000:02 - 6020000000-603bffffff : PCI Bus 0000:2c - 6040000000-605bffffff : PCI Bus 0000:56 - 6060000000-607bffffff : PCI Bus 0000:80 - 607c000000-607cffffff : 0000:00:02.0 - 607d000000-607d1fffff : 0000:00:14.1 - 607d200000-607d3fffff : 0000:00:0d.1 - 607d400000-607d43ffff : 0000:00:0d.3 - 607d440000-607d47ffff : 0000:00:0d.2 - 607d480000-607d49ffff : 0000:00:04.0 - 607d4a0000-607d4affff : 0000:00:14.0 - 607d4a0000-607d4affff : xhci-hcd - 607d4b0000-607d4bffff : 0000:00:12.0 - 607d4c0000-607d4cffff : 0000:00:0d.0 - 607d4c0000-607d4cffff : xhci-hcd - 607d4d0000-607d4d7fff : 0000:00:0a.0 - 607d4d8000-607d4dbfff : 0000:00:14.3 - 607d4d8000-607d4dbfff : iwlwifi - 607d4dc000-607d4dffff : 0000:00:14.2 - 607d4e0000-607d4e1fff : 0000:00:1e.4 - 607d4e2000-607d4e20ff : 0000:00:1f.4 - 607d4e3000-607d4e3fff : 0000:00:1e.4 - 607d4e8000-607d4e8fff : 0000:00:16.0 - 607d4e8000-607d4e8fff : mei_me - 607d4ed000-607d4edfff : 0000:00:14.2 - 607d4ee000-607d4eefff : 0000:00:14.1 - 607d4f0000-607d4f0fff : 0000:00:0d.3 - 607d4f1000-607d4f1fff : 0000:00:0d.2 - 607d4f2000-607d4f2fff : 0000:00:0d.1 - 607d4f3000-607d4f3fff : 0000:00:08.0 + 4000000000-40007e8fff : efifb + 4010000000-4016ffffff : 0000:00:02.0 + 4017000000-4017000fff : 0000:00:15.0 + 4017000000-40170001ff : lpss_dev + 4017000000-40170001ff : i2c_designware.0 lpss_dev + 4017000200-40170002ff : lpss_priv + 4017000800-4017000fff : idma64.0 + 4017000800-4017000fff : idma64.0 idma64.0 + 4017001000-4017001fff : 0000:00:15.1 + 4017001000-40170011ff : lpss_dev + 4017001000-40170011ff : i2c_designware.1 lpss_dev + 4017001200-40170012ff : lpss_priv + 4017001800-4017001fff : idma64.1 + 4017001800-4017001fff : idma64.1 idma64.1 + 4020000000-40ffffffff : 0000:00:02.0 + 6000000000-601bffffff : PCI Bus 0000:2d + 6020000000-603bffffff : PCI Bus 0000:02 + 603c000000-603cffffff : 0000:00:02.0 + 603d000000-603d0fffff : 0000:00:1f.3 + 603d100000-603d13ffff : 0000:00:0d.3 + 603d140000-603d17ffff : 0000:00:0d.2 + 603d180000-603d18ffff : 0000:00:14.0 + 603d180000-603d18ffff : xhci-hcd + 603d190000-603d19ffff : 0000:00:0d.0 + 603d190000-603d19ffff : xhci-hcd + 603d1a0000-603d1a3fff : 0000:00:1f.3 + 603d1a4000-603d1a7fff : 0000:00:14.3 + 603d1a4000-603d1a7fff : iwlwifi + 603d1a8000-603d1abfff : 0000:00:14.2 + 603d1ac000-603d1ac0ff : 0000:00:1f.4 + 603d1ad000-603d1adfff : 0000:00:16.0 + 603d1ad000-603d1adfff : mei_me + 603d1b0000-603d1b0fff : 0000:00:14.2 + 603d1b1000-603d1b1fff : 0000:00:0d.3 + 603d1b2000-603d1b2fff : 0000:00:0d.2 + 603d1b3000-603d1b3fff : 0000:00:08.0 /dev/nvme0n1p3: TYPE="ext4" - /dev/nvme1n1p2: TYPE="ext4" /dev/sda3: TYPE="ext4" - /dev/sdb2: TYPE="ext4" - /dev/sdb3: TYPE="ext4" seri:/dev/ttyS0 type:portio base:0x3F8 irq:4 - 3, 5, 6, 7, 10, 11, 12, 13, 15 + 3, 5, 6, 7, 10, 11, 12, 13, 14, 15 - 15688452 kB + 11884896 kB 0, 1, 2, 3 @@ -449,7 +354,7 @@ 16 - + 0x6 0x8c Reserved @@ -460,7 +365,6 @@ - @@ -543,7 +447,6 @@ - @@ -822,15 +725,15 @@ - 12582912 + 8388608 64 - 12 + 8 16384 1 1 0 0 - 1 + 0 1 0x0 @@ -842,21 +745,23 @@ - - - - - - + + + 0x8086 0x9a14 0x8086 - 0x7270 + 0x3002 0x060000 + + + + + @@ -864,14 +769,15 @@ 0x8086 0x9a49 0x8086 - 0x2212 + 0x3002 0x030000 - + + 1 @@ -880,28 +786,20 @@ - - 0x8086 - 0x9a03 - 0x8086 - 0x7270 - 0x118000 - - - - - 0x8086 0x9a09 0x060400 - + - + + 1 + + @@ -910,16 +808,28 @@ - - 0x8086 - 0xf1a5 - 0x8086 - 0x390a + + 0x126f + 0x2263 + 0x126f + 0x2263 0x010802 - + + + 8 + + + + - + + 16 + 1 + 0x1000000 + 1 + 0x0 + @@ -927,222 +837,156 @@ - + 0x8086 - 0x9a23 + 0x9a25 0x060400 - + - + + 1 + - - 0x8086 - 0x9a25 - 0x060400 - - - - - - - - - - 0x8086 0x9a27 0x060400 - - - - - - - - - - - - 0x8086 - 0x9a29 - 0x060400 - + - + + 1 + - + 0x8086 0x9a11 0x8086 - 0x7270 + 0x3002 0x088000 - - + + + 1 + - - 0x8086 - 0x9a0d - 0x8086 - 0x7270 - 0x118000 - - - - - - - 0x8086 0x9a13 0x0000 0x0000 0x0c0330 - + - - 8 - + 8 + - - 0x8086 - 0x9a15 - 0x8086 - 0x7270 - 0x0c03fe - - - - - 0x8086 0x9a1b - 0x0000 - 0x0000 + 0x2222 + 0x1111 0x0c0340 - - + + + 1 - + + 16 + 4 + 0xfa20000 + 0 + 0x2000000 + 0x8086 0x9a1d - 0x0000 - 0x0000 + 0x2222 + 0x1111 0x0c0340 - - + + + 1 - - - - 0x8086 - 0xa0d8 - 0x8086 - 0x7270 - 0x0c8000 - - - - - - 0x8086 - 0xa0af - 0x8086 - 0x7270 - 0x060000 - - - - 0x8086 - 0xa0fc - 0x8086 - 0x7270 - 0x070000 - - - + + 16 + 4 + 0xfa20000 + 0 + 0x2000000 + 0x8086 0xa0ed - 0x0000 - 0x0000 + 0x8086 + 0x3002 0x0c0330 - + - - 8 - + 8 + - - 0x8086 - 0xa0ee - 0x8086 - 0x7270 - 0x0c03fe - - - - - 0x8086 0xa0ef - 0x8086 - 0x7270 + 0x0000 + 0x0000 0x050000 - - + + 0x8086 0xa0f0 0x8086 - 0x0070 + 0x0074 0x028000 - + + 1 - + + 16 + 1 + 0x10000000 + 1 + 0x0 + @@ -1150,7 +994,7 @@ 0x8086 0xa0e8 0x8086 - 0x7270 + 0x3002 0x0c8000 @@ -1160,27 +1004,7 @@ 0x8086 0xa0e9 0x8086 - 0x7270 - 0x0c8000 - - - - - - 0x8086 - 0xa0ea - 0x8086 - 0x7270 - 0x0c8000 - - - - - - 0x8086 - 0xa0eb - 0x8086 - 0x7270 + 0x3002 0x0c8000 @@ -1190,11 +1014,12 @@ 0x8086 0xa0e0 0x8086 - 0x7270 + 0x3002 0x078000 - + + 1 @@ -1203,152 +1028,107 @@ 0x8086 0xa0d3 0x8086 - 0x7270 + 0x3002 0x010601 - - - - - - + + + + + + + 1 + - + 0x8086 - 0xa0c5 - 0x8086 - 0x7270 - 0x0c8000 - - - - - - 0x8086 - 0xa0c6 - 0x8086 - 0x7270 - 0x0c8000 - - - - - - 0x8086 - 0xa0bc + 0xa0b1 0x060400 - + - + + 1 + + - - - 0x126f - 0x2263 - 0x126f - 0x2263 - 0x010802 - + + + 0x8086 + 0x15f2 + 0x8086 + 0x3002 + 0x020000 + + - - 8 - + 1 + + 5 + 7 + 0x30000 + 1 + 0x0 + - - + + - + 0x8086 - 0xa0a8 + 0xa082 0x8086 - 0x7270 - 0x078000 - - - + 0x3002 + 0x060100 - + 0x8086 - 0xa0ab + 0xa0c8 0x8086 - 0x7270 - 0x0c8000 - - - - - - 0x8086 - 0xa0ac - 0x8086 - 0x7270 - 0x020000 - - + 0x3002 + 0x040300 + + - - 32 - + 1 - - - - - 0x8086 - 0xa088 - 0x8086 - 0x7270 - 0x060100 0x8086 0xa0a3 0x8086 - 0x7270 + 0x3002 0x0c0500 - + 0x8086 0xa0a4 0x8086 - 0x7270 + 0x3002 0x0c8000 - - 0x8086 - 0x15fc - 0x8086 - 0x0000 - 0x020000 - - - - - - diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index 33ab9d076..c216f89ea 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -1,227 +1,252 @@ - - - - n - /dev/ttyS0 - 5 - 5 - 3 - 7 - 0x40000 - - - y - SCHED_BVT - y - y - n - - n - n - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0 - - n - y - n - y - n - n - - n - - - - - 0x2000 - - - 0x00010000 - 0x400000000 - - - 0x100 - 256 - 1 - 96 - 120 - 256 - - 16 - - - 0x00000010 - - - - SAFETY_VM - ACRN PRE-LAUNCHED VM0 - - 0 - - - 3 - - - - - 0 - - - 0 - 0 - - - 0x100000000 - 0x20000000 - 0x0 - 0x0 - - - Zephyr - KERNEL_ZEPHYR - Zephyr_RawImage - - - 0x8000 - 0x8000 - - - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - - - - - n - n - - - - SOS_VM - ACRN SOS VM - - 0 - - - 0 - 1 - 2 - - - 0 - 0 - 0 - - - 0 - - - ACRN Service OS - KERNEL_BZIMAGE - Linux_bzImage - - SOS_VM_BOOTARGS - - - VUART_LEGACY_PIO - SOS_COM1_BASE - SOS_COM1_IRQ - - - VUART_LEGACY_PIO - SOS_COM2_BASE - SOS_COM2_IRQ - 0 - 1 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - - - - - /dev/sda3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + + + n + /dev/ttyS0 + 5 + 5 + 3 + 7 + 0x40000 + + + y + SCHED_BVT + y + y + n + + n + n + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + + n + y + n + y + n + n + + n + + + + + 0x2000 + + + 0x00010000 + 0x400000000 + + + 0x100 + 256 + 1 + 96 + 120 + 256 + + 16 + + + 0x00000010 + + + + SAFETY_VM + ACRN PRE-LAUNCHED VM0 + + 0 + + + 3 + + + + 0 + + + 0 + 0 + + + 0x100000000 + 0x20000000 + 0x0 + 0x0 + + + Zephyr + KERNEL_ZEPHYR + Zephyr_RawImage + + + 0x8000 + 0x8000 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 1 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + + + + n + n + + + + SOS_VM + ACRN SOS VM + + 0 + + + 0 + 1 + 2 + + + 0 + 0 + 0 + + + 0 + + + ACRN Service OS + KERNEL_BZIMAGE + Linux_bzImage + + SOS_VM_BOOTARGS + + + VUART_LEGACY_PIO + SOS_COM1_BASE + SOS_COM1_IRQ + + + VUART_LEGACY_PIO + SOS_COM2_BASE + SOS_COM2_IRQ + 0 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + + + + /dev/nvme0n1p3 + rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1 swiotlb=131072 - - - - POST_STD_VM - - 0 - - - 2 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - n - + + + + POST_STD_VM + + 0 + + + 2 + + + 0 + + + 0 + 0 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 0 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + n + + + POST_STD_VM + + 0 + + + 2 + + + 0 + + + 0 + 0 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 0 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + n + diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2uos.xml b/misc/config_tools/data/generic_board/hybrid_launch_2uos.xml new file mode 100644 index 000000000..5238af70a --- /dev/null +++ b/misc/config_tools/data/generic_board/hybrid_launch_2uos.xml @@ -0,0 +1,87 @@ + + + WINDOWS + no + 4096 + gvtd + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + + + + + + + + + + + + + WaaG + + ./win10-ltsc.img + + + + + YOCTO + no + 512 + + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + @stdio:stdio_port + YaaG + + ./YaaG.img + + + diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml deleted file mode 100644 index 9dd2c5d28..000000000 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ /dev/null @@ -1,264 +0,0 @@ - - - - - n - /dev/ttyS0 - 5 - 5 - 3 - 7 - 0x40000 - - - y - SCHED_BVT - y - y - n - - n - n - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0 - - n - y - n - y - n - n - - y - hv:/shm_region_0, 2, 0:2 - - - - 0x2000 - - - 0x00010000 - 0x400000000 - - - 0x100 - 256 - 1 - 96 - 120 - 256 - - 16 - - - 0x00000010 - - - - - PRE_RT_VM - ACRN PRE-LAUNCHED VM0 - - GUEST_FLAG_LAPIC_PASSTHROUGH - GUEST_FLAG_RT - - - 2 - 3 - - - 0 - 0 - - - 0 - 0 - - - 0x100000000 - 0x40000000 - 0x0 - 0x0 - - - PREEMPT-RT - KERNEL_BZIMAGE - RT_bzImage - - rw rootwait root=/dev/sda3 no_ipi_broadcast=1 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel consoleblank=0 tsc=reliable clocksource=tsc x2apic_phys processor.max_cstate=0 intel_idle.max_cstate=0 intel_pstate=disable mce=ignore_ce audit=0 isolcpus=nohz,domain,1 nohz_full=1 rcu_nocbs=1 nosoftlockup idle=poll irqaffinity=0 reboot=acpi - - - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - - 00:17.0 SATA controller: Intel Corporation Device 4b63 - 00:1d.2 Ethernet controller: Intel Corporation Device 4bb0 - - - y - - - - SOS_VM - ACRN SOS VM - - 0 - - - 0 - 1 - - - 0 - 0 - - - 0 - - - ACRN Service OS - KERNEL_BZIMAGE - Linux_bzImage - - SOS_VM_BOOTARGS - - - VUART_LEGACY_PIO - SOS_COM1_BASE - SOS_COM1_IRQ - - - VUART_LEGACY_PIO - SOS_COM2_BASE - SOS_COM2_IRQ - 0 - 1 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 0 - 1 - - - - - - /dev/nvme0n1p3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 swiotlb=131072 - - - - - POST_STD_VM - - 0 - - - 0 - 1 - - - 0 - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 0 - 1 - - n - - - POST_STD_VM - - 0 - - - 1 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - n - - diff --git a/misc/config_tools/data/generic_board/industry.xml b/misc/config_tools/data/generic_board/industry.xml index a7a8d0de1..1b60f95b6 100644 --- a/misc/config_tools/data/generic_board/industry.xml +++ b/misc/config_tools/data/generic_board/industry.xml @@ -1,392 +1,382 @@ - - - - n - /dev/ttyS3 - 5 - 5 - 3 - 7 - 0x40000 - - - y - SCHED_BVT - y - y - n - - y - n - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0 - - n - y - n - y - n - n - - n - - - - - 0x2000 - - - 0x00010000 - 0x400000000 - - - 0x100 - 256 - 1 - 96 - 120 - 256 - - 16 - - - 0x00000010 - - - - SOS_VM - ACRN SOS VM - - 0 - - - 0 - - - 0 - 0x20000000 - - - ACRN Service OS - KERNEL_BZIMAGE - Linux_bzImage - - SOS_VM_BOOTARGS - - - VUART_LEGACY_PIO - SOS_COM1_BASE - SOS_COM1_IRQ - - - VUART_LEGACY_PIO - SOS_COM2_BASE - SOS_COM2_IRQ - 2 - 1 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - - - - - /dev/nvme0n1p3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + + + n + /dev/ttyS0 + 5 + 5 + 3 + 7 + 0x40000 + + + y + SCHED_BVT + y + y + n + + n + y + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + + n + y + n + y + n + n + + n + + + + + 0x2000 + + + 0x00010000 + 0x400000000 + + + 0x100 + 256 + 1 + 96 + 120 + 256 + + 16 + + + 0x00000010 + + + + SOS_VM + ACRN SOS VM + + 0 + + + 0 + + + 0 + 0x20000000 + + + ACRN Service OS + KERNEL_BZIMAGE + Linux_bzImage + + SOS_VM_BOOTARGS + + + VUART_LEGACY_PIO + SOS_COM1_BASE + SOS_COM1_IRQ + + + VUART_LEGACY_PIO + SOS_COM2_BASE + SOS_COM2_IRQ + 2 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + + + + /dev/nvme0n1p3 + rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1 swiotlb=131072 - - - - POST_STD_VM - - 0 - - - 0 - 1 - - - 0 - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - n - - - POST_RT_VM - - 0 - - - 2 - 3 - - - 0 - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - n + + + + POST_STD_VM + + 0 + + + 0 + 1 + + + 0 + 0 + + + 0 + 0 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + n + + + POST_RT_VM + + GUEST_FLAG_LAPIC_PASSTHROUGH + GUEST_FLAG_RT + + + 2 + 3 + + + 0 + 0 + + + 0 + 0 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 0 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + n POST_STD_VM - 0 + 0 - 0 - 1 + 0 + 1 - 0 - 0 + 0 + 0 - 0 - 0 + 0 + 0 - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 1 - INVALID_PCI_BASE + INVALID_PCI_BASE - INVALID_PCI_BASE - 1 - 1 + INVALID_PCI_BASE + 1 + 1 n POST_STD_VM - 0 + 0 - 0 - 1 + 0 + 1 - 0 - 0 + 0 + 0 - 0 - 0 + 0 + 0 - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 1 - INVALID_PCI_BASE + INVALID_PCI_BASE - INVALID_PCI_BASE - 1 - 1 + INVALID_PCI_BASE + 1 + 1 n POST_STD_VM - 0 + 0 - 0 - 1 + 0 + 1 - 0 - 0 + 0 + 0 - 0 - 0 + 0 + 0 - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 1 - INVALID_PCI_BASE + INVALID_PCI_BASE - INVALID_PCI_BASE - 1 - 1 + INVALID_PCI_BASE + 1 + 1 n POST_STD_VM - 0 + 0 - 0 - 1 + 0 + 1 - 0 - 0 + 0 + 0 - 0 - 0 + 0 + 0 - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 1 - INVALID_PCI_BASE + INVALID_PCI_BASE - INVALID_PCI_BASE - 1 - 1 + INVALID_PCI_BASE + 1 + 1 n KATA_VM - 0 - 1 + 0 + 1 - 0 - 0 + 0 + 0 - 0 - 0 + 0 + 0 - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ + VUART_LEGACY_PIO + INVALID_COM_BASE + COM1_IRQ - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 0 - INVALID_PCI_BASE + INVALID_PCI_BASE - INVALID_PCI_BASE - 1 - 1 + INVALID_PCI_BASE + 1 + 1 n diff --git a/misc/config_tools/data/generic_board/industry_launch_2uos.xml b/misc/config_tools/data/generic_board/industry_launch_2uos.xml deleted file mode 100644 index 7f3406b75..000000000 --- a/misc/config_tools/data/generic_board/industry_launch_2uos.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - WINDOWS - no - 4096 - gvtd - ovmf - Enable - - n - n - - - - - - - - Disable - - - - - - - - - - - - - - - - - - - - WaaG - - ./win10-ltsc.img - - - - - - PREEMPT-RT LINUX - Hard RT - 1024 - - ovmf - Disable - - n - n - - - - - - - - Disable - - - - - - - - - - - - - - - - - - - - - - - @stdio:stdio_port - - - diff --git a/misc/config_tools/data/generic_board/industry_launch_6uos.xml b/misc/config_tools/data/generic_board/industry_launch_6uos.xml new file mode 100644 index 000000000..64cee6dea --- /dev/null +++ b/misc/config_tools/data/generic_board/industry_launch_6uos.xml @@ -0,0 +1,257 @@ + + + WINDOWS + no + 4096 + gvtd + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + + + + + + + + + + + + + WaaG + + ./win10-ltsc.img + + + + + + PREEMPT-RT LINUX + Hard RT + 1024 + + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + + + + + + + + 00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20) + + + + + + + + @stdio:stdio_port + + + + YOCTO + no + 512 + + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + @stdio:stdio_port + YaaG3 + + ./YaaG.img + + + + YOCTO + no + 512 + + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + @stdio:stdio_port + YaaG4 + + ./YaaG.img + + + + YOCTO + no + 512 + + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + @stdio:stdio_port + YaaG5 + + ./YaaG.img + + + + YOCTO + no + 512 + + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + @stdio:stdio_port + YaaG6 + + ./YaaG.img + + + diff --git a/misc/config_tools/data/generic_board/logical_partition.xml b/misc/config_tools/data/generic_board/logical_partition.xml index cb80f6e67..e1f8e9824 100644 --- a/misc/config_tools/data/generic_board/logical_partition.xml +++ b/misc/config_tools/data/generic_board/logical_partition.xml @@ -1,195 +1,184 @@ - - - - n - /dev/ttyS0 - 5 - 5 - 3 - 7 - 0x40000 - - - y - SCHED_BVT - y - y - n - - n - n - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0xfff - 0 - - n - y - n - y - n - n - - n - - - - - 0x2000 - - - 0x00010000 - 0x400000000 - - - 0x100 - 256 - 1 - 96 - 120 - 64 - - 16 - - - 0x00000010 - - - - PRE_STD_VM - ACRN PRE-LAUNCHED VM0 - - 0 - - - 0 - 2 - - - 0 - 0 - - - 0 - 0 - - - 0x100000000 - 0x20000000 - 0x0 - 0x0 - - - YOCTO - KERNEL_BZIMAGE - Linux_bzImage - - - rw rootwait root=/dev/sda3 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable reboot=acpi + + + n + /dev/ttyS0 + 5 + 5 + 3 + 7 + 0x40000 + + + y + SCHED_BVT + y + y + n + + n + n + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + + n + y + n + y + n + n + + n + + + + + 0x2000 + + + 0x00010000 + 0x400000000 + + + 0x100 + 256 + 1 + 96 + 120 + 64 + 64 + 16 + + + 0x00000010 + + + + PRE_STD_VM + ACRN PRE-LAUNCHED VM0 + + 0 + + + 0 + 2 + + + 0 + 0 + + + 0 + 0 + + + 0x100000000 + 0x20000000 + 0x0 + 0x0 + + + YOCTO + KERNEL_BZIMAGE + Linux_bzImage + + rw rootwait root=/dev/sda3 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable reboot=acpi - - - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - - - - - - n - - - - PRE_STD_VM - ACRN PRE-LAUNCHED VM1 - - 0 - - - 1 - 3 - - - 0 - 0 - - - 0 - 0 - - - 0x120000000 - 0x20000000 - 0x0 - 0x0 - - - YOCTO - KERNEL_BZIMAGE - Linux_bzImage - - - rw rootwait root=/dev/sda3 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 1 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + 00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20) + 58:00.0 Ethernet controller: Intel Corporation Device 15f2 (rev 03) + + + + n + + + + PRE_STD_VM + ACRN PRE-LAUNCHED VM1 + + 0 + + + 1 + 3 + + + 0 + 0 + + + 0 + 0 + + + 0x120000000 + 0x20000000 + 0x0 + 0x0 + + + YOCTO + KERNEL_BZIMAGE + Linux_bzImage + + rw rootwait root=/dev/sda2 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable reboot=acpi - - - VUART_LEGACY_PIO - COM1_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - - - - - - n - - + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 0 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + 00:14.0 USB controller: Intel Corporation Device a0ed (rev 20) + + + + n + +