Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / configs / h87i.c

diff --git a/configs/h87i.c b/configs/h87i.c
index 9b36702fe22065a783b1fc7b6941c46de0077300..f281a34bed82d369a5b77d3eff04bc31ebb4a5d4 100644 (file)
--- a/configs/h87i.c
+++ b/configs/h87i.c
@@ -32,13 +32,22 @@ struct {
                        .phys_start = 0x3b000000,
                        .size = 0x4000000,
                },
+               .debug_console = {
+                       .phys_start = 0xe010,
+               },
                .platform_info.x86 = {
                        .mmconfig_base = 0xf8000000,
                        .mmconfig_end_bus = 0x3f,
                        .pm_timer_address = 0x1808,
-                       .iommu_base = {
-                               0xfed90000,
-                               0xfed91000,
+                       .iommu_units = {
+                               {
+                                       .base = 0xfed90000,
+                                       .size = 0x1000,
+                               },
+                               {
+                                       .base = 0xfed91000,
+                                       .size = 0x1000,
+                               },
                        },
                },
                .interrupt_limit = 256,
@@ -119,7 +128,9 @@ struct {
                /* IOAPIC */ {
                        .address = 0xfec00000,
                        .id = 0x1f0f8,
-                       .pin_bitmap = 0xffffff,
+                       .pin_bitmap = {
+                               0xffffff
+                       },
                },
        },