From 7e5c2865d71406a0eb34f7648e0cdb036d321590 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 1 Jun 2020 15:10:32 +0800 Subject: [PATCH] acrn-config: update native board information Update mrb ttys, up2 iomem and ehl-crb-b information. Tracked-On: #4862 Signed-off-by: Wei Liu Acked-by: Victor Sun --- misc/acrn-config/xmls/board-xmls/apl-mrb.xml | 2 +- misc/acrn-config/xmls/board-xmls/apl-up2.xml | 10 ---------- misc/acrn-config/xmls/board-xmls/ehl-crb-b.xml | 4 ++-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/misc/acrn-config/xmls/board-xmls/apl-mrb.xml b/misc/acrn-config/xmls/board-xmls/apl-mrb.xml index 1ad5310d8..c5f1abd51 100644 --- a/misc/acrn-config/xmls/board-xmls/apl-mrb.xml +++ b/misc/acrn-config/xmls/board-xmls/apl-mrb.xml @@ -495,7 +495,7 @@ seri:/dev/ttyS0 type:mmio base:0xB3640000 irq:4 bdf:"00:18.0" seri:/dev/ttyS2 type:mmio base:0x80E00000 irq:6 bdf:"00:18.2" - seri:/dev/ttyS3 type:mmio base:0xB363A000 irq:7 bdf:"00:18.2" + seri:/dev/ttyS3 type:mmio base:0xB363A000 irq:7 bdf:"00:18.3" diff --git a/misc/acrn-config/xmls/board-xmls/apl-up2.xml b/misc/acrn-config/xmls/board-xmls/apl-up2.xml index 62966433e..a9adf80e9 100644 --- a/misc/acrn-config/xmls/board-xmls/apl-up2.xml +++ b/misc/acrn-config/xmls/board-xmls/apl-up2.xml @@ -307,16 +307,6 @@ 8152a200-8152a2ff : lpss_priv 8152a800-8152afff : idma64.12 8152a800-8152afff : idma64.12 - 8152b000-8152bfff : 0000:00:18.3 - 8152c000-8152cfff : 0000:00:18.3 - 8152c000-8152c1ff : lpss_dev - 8152c000-8152c01f : serial - 8152c200-8152c2ff : lpss_priv - 8152d000-8152dfff : 0000:00:18.2 - 8152e000-8152efff : 0000:00:18.2 - 8152e000-8152e1ff : lpss_dev - 8152e000-8152e01f : serial - 8152e200-8152e2ff : lpss_priv 8152f000-8152ffff : 0000:00:18.1 81530000-81530fff : 0000:00:18.1 81530000-815301ff : lpss_dev diff --git a/misc/acrn-config/xmls/board-xmls/ehl-crb-b.xml b/misc/acrn-config/xmls/board-xmls/ehl-crb-b.xml index c0131c2f8..4490116fb 100644 --- a/misc/acrn-config/xmls/board-xmls/ehl-crb-b.xml +++ b/misc/acrn-config/xmls/board-xmls/ehl-crb-b.xml @@ -349,8 +349,8 @@ - seri:/dev/ttyS0 type:mmio base:0xFE040000 irq:17 bdf:"00:10.1" - seri:/dev/ttyS1 type:mmio base:0x6FC09000 irq:16 bdf:"00:10.0" + seri:/dev/ttyS0 type:mmio base:0xFE040000 irq:17 + seri:/dev/ttyS1 type:mmio base:0x6FC09000 irq:16 bdf:"00:1e.0"