plat/xen: Fix Arm setup to work with new Xen console

This fixes a regression introduced in the `ukconsole`
changes. The recent updates to the Xen console drivers
removed the `prepare_console()` and `init_console()`
functions in favor of calling the same code through
the early init tab.

Signed-off-by: Thassilo Schulze <thassilo@unikraft.io>
Approved-by: Michalis Pappas <michalis@unikraft.io>
Reviewed-by: Michalis Pappas <michalis@unikraft.io>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #1490

diff --git a/plat/xen/arm/setup64.c b/plat/xen/arm/setup64.c
index 3495c8bd410afea955fdb61f1683e8bbc8635750..77c93323b10385794089e539060842a4c1f63eff 100644 (file)
--- a/plat/xen/arm/setup64.c
+++ b/plat/xen/arm/setup64.c
@@ -339,9 +339,6 @@ void _libxenplat_armentry(void *dtb_pointer, paddr_t physical_offset)
        /* Set up events. */
        init_events();
 
-       /* Do early init */
-       uk_boot_early_init(bi);
-
        /* Initialize logical boot CPU */
        r = lcpu_init(lcpu_get_bsp());
        if (unlikely(r))
@@ -358,9 +355,8 @@ void _libxenplat_armentry(void *dtb_pointer, paddr_t physical_offset)
        get_console();
        get_xenbus();
 
-       prepare_console();
-       /* Init console */
-       init_console();
+       /* Do early init */
+       uk_boot_early_init(bi);
 
        uk_boot_entry();
 }