diff options
| author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2020-11-28 10:43:14 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-15 14:36:12 -0500 |
| commit | eb2825b79d1e029fa0b9e9ff35fe08c2eca8ca17 (patch) | |
| tree | 5cacb986de8f06b2030518ec67fed80ec6374dba | |
| parent | 42d0d4223f991062f10d8b09e9268ed4cbcf271e (diff) | |
| download | u-boot-eb2825b79d1e029fa0b9e9ff35fe08c2eca8ca17.tar.gz | |
common: board_r: Drop initr_xen wrapper
Add a return value to xen_init and use it directly in the
post-relocation init sequence, rather than using a wrapper stub.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/board_r.c | 10 | ||||
| -rw-r--r-- | drivers/xen/hypervisor.c | 4 | ||||
| -rw-r--r-- | include/xen.h | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/common/board_r.c b/common/board_r.c index 48e898b5861..a5cbbcc343f 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -428,14 +428,6 @@ static int initr_mmc(void) } #endif -#ifdef CONFIG_XEN -static int initr_xen(void) -{ - xen_init(); - return 0; -} -#endif - #ifdef CONFIG_PVBLOCK static int initr_pvblock(void) { @@ -743,7 +735,7 @@ static init_fnc_t init_sequence_r[] = { initr_mmc, #endif #ifdef CONFIG_XEN - initr_xen, + xen_init, #endif #ifdef CONFIG_PVBLOCK initr_pvblock, diff --git a/drivers/xen/hypervisor.c b/drivers/xen/hypervisor.c index 178c206f5bf..25608948323 100644 --- a/drivers/xen/hypervisor.c +++ b/drivers/xen/hypervisor.c @@ -232,7 +232,7 @@ void clear_evtchn(uint32_t port) synch_clear_bit(port, &s->evtchn_pending[0]); } -void xen_init(void) +int xen_init(void) { debug("%s\n", __func__); @@ -240,6 +240,8 @@ void xen_init(void) init_events(); init_xenbus(); init_gnttab(); + + return 0; } void xen_fini(void) diff --git a/include/xen.h b/include/xen.h index a952a2c84b8..868132156e9 100644 --- a/include/xen.h +++ b/include/xen.h @@ -11,7 +11,7 @@ * Map Xen memory pages, initialize event handler and xenbus, * setup the grant table. */ -void xen_init(void); +int xen_init(void); /** * xen_fini() - Board cleanup before Linux kernel start |