From: Jan Kiszka <jan.kis...@siemens.com>
The IOMMU data structure in platform_info got relocated. Account for
that.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
recipes-jailhouse/jailhouse/files/ipc127e.c | 24 +++++++++----------
.../files/{ipc127e.c => ipc127e_0.12.c} | 0
recipes-jailhouse/jailhouse/files/nuc6cay.c | 24 +++++++++----------
.../files/{nuc6cay.c => nuc6cay_0.12.c} | 0
recipes-jailhouse/jailhouse/jailhouse_0.12.bb | 10 ++++++++
.../jailhouse/jailhouse_latest.bb | 5 ++++
6 files changed, 39 insertions(+), 24 deletions(-)
copy recipes-jailhouse/jailhouse/files/{ipc127e.c => ipc127e_0.12.c} (100%)
copy recipes-jailhouse/jailhouse/files/{nuc6cay.c => nuc6cay_0.12.c} (100%)
diff --git a/recipes-jailhouse/jailhouse/files/ipc127e.c
b/recipes-jailhouse/jailhouse/files/ipc127e.c
index 021e4ba..7486baa 100644
--- a/recipes-jailhouse/jailhouse/files/ipc127e.c
+++ b/recipes-jailhouse/jailhouse/files/ipc127e.c
@@ -63,21 +63,21 @@ struct {
.platform_info = {
.pci_mmconfig_base = 0xe0000000,
.pci_mmconfig_end_bus = 0x3f,
+ .iommu_units = {
+ {
+ .type = JAILHOUSE_IOMMU_INTEL,
+ .base = 0xfed64000,
+ .size = 0x1000,
+ },
+ {
+ .type = JAILHOUSE_IOMMU_INTEL,
+ .base = 0xfed65000,
+ .size = 0x1000,
+ },
+ },
.x86 = {
.pm_timer_address = 0x408,
.vtd_interrupt_limit = 256,
- .iommu_units = {
- {
- .type = JAILHOUSE_IOMMU_INTEL,
- .base = 0xfed64000,
- .size = 0x1000,
- },
- {
- .type = JAILHOUSE_IOMMU_INTEL,
- .base = 0xfed65000,
- .size = 0x1000,
- },
- },
},
},
.root_cell = {
diff --git a/recipes-jailhouse/jailhouse/files/ipc127e.c
b/recipes-jailhouse/jailhouse/files/ipc127e_0.12.c
similarity index 100%
copy from recipes-jailhouse/jailhouse/files/ipc127e.c
copy to recipes-jailhouse/jailhouse/files/ipc127e_0.12.c
diff --git a/recipes-jailhouse/jailhouse/files/nuc6cay.c
b/recipes-jailhouse/jailhouse/files/nuc6cay.c
index c3b489c..8fde83e 100644
--- a/recipes-jailhouse/jailhouse/files/nuc6cay.c
+++ b/recipes-jailhouse/jailhouse/files/nuc6cay.c
@@ -63,21 +63,21 @@ struct {
.platform_info = {
.pci_mmconfig_base = 0xe0000000,
.pci_mmconfig_end_bus = 0xff,
+ .iommu_units = {
+ {
+ .type = JAILHOUSE_IOMMU_INTEL,
+ .base = 0xfed64000,
+ .size = 0x1000,
+ },
+ {
+ .type = JAILHOUSE_IOMMU_INTEL,
+ .base = 0xfed65000,
+ .size = 0x1000,
+ },
+ },
.x86 = {
.pm_timer_address = 0x408,
.vtd_interrupt_limit = 256,
- .iommu_units = {
- {
- .type = JAILHOUSE_IOMMU_INTEL,
- .base = 0xfed64000,
- .size = 0x1000,
- },
- {
- .type = JAILHOUSE_IOMMU_INTEL,
- .base = 0xfed65000,
- .size = 0x1000,
- },
- },
},
},
.root_cell = {
diff --git a/recipes-jailhouse/jailhouse/files/nuc6cay.c
b/recipes-jailhouse/jailhouse/files/nuc6cay_0.12.c
similarity index 100%
copy from recipes-jailhouse/jailhouse/files/nuc6cay.c
copy to recipes-jailhouse/jailhouse/files/nuc6cay_0.12.c
diff --git a/recipes-jailhouse/jailhouse/jailhouse_0.12.bb
b/recipes-jailhouse/jailhouse/jailhouse_0.12.bb
index c0b5da3..ec0a41a 100644
--- a/recipes-jailhouse/jailhouse/jailhouse_0.12.bb
+++ b/recipes-jailhouse/jailhouse/jailhouse_0.12.bb
@@ -22,3 +22,13 @@ SRC_URI += " \
"
SRCREV = "92db71f257fabd3c08fa4b99498fa61a41ea831d"
+
+EXTRA_JAILHOUSE_CONFIGS_amd64 += " \
+ nuc6cay_0.12.c \
+ ipc127e_0.12.c \
+ "
+
+do_prepare_build_append() {
+ mv ${S}/configs/x86/nuc6cay_0.12.c ${S}/configs/x86/nuc6cay.c
+ mv ${S}/configs/x86/ipc127e_0.12.c ${S}/configs/x86/ipc127e.c
+}
diff --git a/recipes-jailhouse/jailhouse/jailhouse_latest.bb
b/recipes-jailhouse/jailhouse/jailhouse_latest.bb
index 143fa0e..b21abf7 100644
--- a/recipes-jailhouse/jailhouse/jailhouse_latest.bb
+++ b/recipes-jailhouse/jailhouse/jailhouse_latest.bb
@@ -14,6 +14,11 @@ require jailhouse.inc
SRCREV = "next"
PV = "0.9999-next"
+EXTRA_JAILHOUSE_CONFIGS_amd64 += " \
+ nuc6cay.c \
+ ipc127e.c \
+ "
+
dpkg_runbuild_prepend() {
bbplain $(printf "jailhouse-latest: Building revision %.12s\n" \
$(cat ${S}/.git/refs/heads/next))
--
2.26.2
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jailhouse-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/a15c05e5-4658-fb0c-474c-20a46f5cf178%40siemens.com.
