On 2017-01-19 21:11, Ralf Ramsauer wrote: > for all existing system configuration. Activate it in the root cell > template as well. > > Signed-off-by: Ralf Ramsauer <[email protected]> > --- > configs/amd-seattle.c | 3 ++- > configs/bananapi.c | 3 ++- > configs/f2a88xm-hd3.c | 3 ++- > configs/foundation-v8.c | 3 ++- > configs/imb-a180.c | 3 ++- > configs/jetson-tk1.c | 3 ++- > configs/jetson-tx1.c | 3 ++- > configs/orangepi0.c | 3 ++- > configs/qemu-vm.c | 3 ++- > configs/vexpress.c | 3 ++- > configs/zynqmp-zcu102.c | 3 ++- > tools/root-cell-config.c.tmpl | 3 ++- > 12 files changed, 24 insertions(+), 12 deletions(-) > > diff --git a/configs/amd-seattle.c b/configs/amd-seattle.c > index 66e3fdcd82..81bc620813 100644 > --- a/configs/amd-seattle.c > +++ b/configs/amd-seattle.c > @@ -33,7 +33,8 @@ struct { > .address = 0xe1010000, > .size = 0x1000, > .flags = JAILHOUSE_CON1_TYPE_PL011 | > - JAILHOUSE_CON1_FLAG_MMIO, > + JAILHOUSE_CON1_FLAG_MMIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info = { > .pci_mmconfig_base = 0xf0000000, > diff --git a/configs/bananapi.c b/configs/bananapi.c > index 484d808ac3..f289a3e3ef 100644 > --- a/configs/bananapi.c > +++ b/configs/bananapi.c > @@ -38,7 +38,8 @@ struct { > /* .gate_nr = 16 */ > /* .divider = 0x0d, */ > .flags = JAILHOUSE_CON1_TYPE_8250 | > - JAILHOUSE_CON1_FLAG_MMIO, > + JAILHOUSE_CON1_FLAG_MMIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info = { > .pci_mmconfig_base = 0x2000000, > diff --git a/configs/f2a88xm-hd3.c b/configs/f2a88xm-hd3.c > index 62a9117b99..33973bcf2b 100644 > --- a/configs/f2a88xm-hd3.c > +++ b/configs/f2a88xm-hd3.c > @@ -42,7 +42,8 @@ struct { > .address = 0x3f8, > /* .divider = 0x1, */ > .flags = JAILHOUSE_CON1_TYPE_UART_X86 | > - JAILHOUSE_CON1_FLAG_PIO, > + JAILHOUSE_CON1_FLAG_PIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info = { > .pci_mmconfig_base = 0xe0000000, > diff --git a/configs/foundation-v8.c b/configs/foundation-v8.c > index c4112004d9..56e4816d38 100644 > --- a/configs/foundation-v8.c > +++ b/configs/foundation-v8.c > @@ -32,7 +32,8 @@ struct { > .address = 0x1c090000, > .size = 0x1000, > .flags = JAILHOUSE_CON1_TYPE_PL011 | > - JAILHOUSE_CON1_FLAG_MMIO, > + JAILHOUSE_CON1_FLAG_MMIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info.arm = { > #ifdef CONFIG_ARM_GIC_V3 > diff --git a/configs/imb-a180.c b/configs/imb-a180.c > index fa36d791d3..a6b9012ce5 100644 > --- a/configs/imb-a180.c > +++ b/configs/imb-a180.c > @@ -41,7 +41,8 @@ struct { > .address = 0x3f8, > /* .divider = 0x1, */ > .flags = JAILHOUSE_CON1_TYPE_UART_X86 | > - JAILHOUSE_CON1_FLAG_PIO, > + JAILHOUSE_CON1_FLAG_PIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info = { > .pci_mmconfig_base = 0xe0000000, > diff --git a/configs/jetson-tk1.c b/configs/jetson-tk1.c > index d6713405bf..2cdb492423 100644 > --- a/configs/jetson-tk1.c > +++ b/configs/jetson-tk1.c > @@ -41,7 +41,8 @@ struct { > /* .gate_nr = (65 % 32), */ > /* .divider = 0xdd, */ > .flags = JAILHOUSE_CON1_TYPE_8250 | > - JAILHOUSE_CON1_FLAG_MMIO, > + JAILHOUSE_CON1_FLAG_MMIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info = { > .pci_mmconfig_base = 0x48000000, > diff --git a/configs/jetson-tx1.c b/configs/jetson-tx1.c > index af1f55775b..f47ebfd4aa 100644 > --- a/configs/jetson-tx1.c > +++ b/configs/jetson-tx1.c > @@ -35,7 +35,8 @@ struct { > .address = 0x70006000, > .size = 0x0040, > .flags = JAILHOUSE_CON1_TYPE_8250 | > - JAILHOUSE_CON1_FLAG_MMIO, > + JAILHOUSE_CON1_FLAG_MMIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info.arm = { > .gicd_base = 0x50041000, > diff --git a/configs/orangepi0.c b/configs/orangepi0.c > index 14f1a0e0dd..ae1da18601 100644 > --- a/configs/orangepi0.c > +++ b/configs/orangepi0.c > @@ -35,7 +35,8 @@ struct { > .address = 0x01c28000, > .size = 0x1000, > .flags = JAILHOUSE_CON1_TYPE_8250 | > - JAILHOUSE_CON1_FLAG_MMIO, > + JAILHOUSE_CON1_FLAG_MMIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info = { > .pci_mmconfig_base = 0x2000000, > diff --git a/configs/qemu-vm.c b/configs/qemu-vm.c > index 0ce34eeab6..f091834e3c 100644 > --- a/configs/qemu-vm.c > +++ b/configs/qemu-vm.c > @@ -41,7 +41,8 @@ struct { > .address = 0x3f8, > /* .divider = 0x1, */ > .flags = JAILHOUSE_CON1_TYPE_UART_X86 | > - JAILHOUSE_CON1_FLAG_PIO, > + JAILHOUSE_CON1_FLAG_PIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info = { > .pci_mmconfig_base = 0xb0000000, > diff --git a/configs/vexpress.c b/configs/vexpress.c > index 61c99b9b73..065db65600 100644 > --- a/configs/vexpress.c > +++ b/configs/vexpress.c > @@ -32,7 +32,8 @@ struct { > .address = 0x1c090000, > .size = 0x1000, > .flags = JAILHOUSE_CON1_TYPE_PL011 | > - JAILHOUSE_CON1_FLAG_MMIO, > + JAILHOUSE_CON1_FLAG_MMIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info.arm = { > #ifdef CONFIG_ARM_GIC_V3 > diff --git a/configs/zynqmp-zcu102.c b/configs/zynqmp-zcu102.c > index 120a73dc6d..458fc24faa 100644 > --- a/configs/zynqmp-zcu102.c > +++ b/configs/zynqmp-zcu102.c > @@ -35,7 +35,8 @@ struct { > .address = 0xff000000, > .size = 0x1000, > .flags = JAILHOUSE_CON1_TYPE_XUARTPS | > - JAILHOUSE_CON1_FLAG_MMIO, > + JAILHOUSE_CON1_FLAG_MMIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info = { > .pci_mmconfig_base = 0xfc000000, > diff --git a/tools/root-cell-config.c.tmpl b/tools/root-cell-config.c.tmpl > index 85c1834ac3..11956b742b 100644 > --- a/tools/root-cell-config.c.tmpl > +++ b/tools/root-cell-config.c.tmpl > @@ -63,7 +63,8 @@ struct { > .debug_console = { > .address = 0x3f8, > .flags = JAILHOUSE_CON1_TYPE_UART_X86 | > - JAILHOUSE_CON1_FLAG_PIO, > + JAILHOUSE_CON1_FLAG_PIO | > + JAILHOUSE_CON2_TYPE_ROOTPAGE, > }, > .platform_info = { > .pci_mmconfig_base = ${hex(mmconfig.base)}, >
The hikey root cell is missing. Jan -- 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
