diff options
| author | Tom Rini <[email protected]> | 2020-08-14 15:48:56 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-08-14 15:48:56 -0400 |
| commit | c0192950dfcd82035a928de32c24335f3d2c0f7a (patch) | |
| tree | 0836caec6551ce8b277714c95e7bf0003ab64311 /common | |
| parent | fe5c777df26dab302cbb26d5f05655e27b714987 (diff) | |
| parent | 698383fe8ea3a755f93e9e9446a5560e040c6b56 (diff) | |
Merge branch '2020-08-14-assorted-updates'
- Xen guest and some paravirt driver support.
- Aspeed SoC updates
- Broadcom IPROC PCIe RC driver
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c index d48d2bb8a04..9b2fec701a5 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -49,6 +49,7 @@ #include <nand.h> #include <of_live.h> #include <onenand_uboot.h> +#include <pvblock.h> #include <scsi.h> #include <serial.h> #include <status_led.h> @@ -56,6 +57,9 @@ #include <timer.h> #include <trace.h> #include <watchdog.h> +#ifdef CONFIG_XEN +#include <xen.h> +#endif #ifdef CONFIG_ADDR_MAP #include <asm/mmu.h> #endif @@ -465,6 +469,23 @@ 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) +{ + puts("PVBLOCK: "); + pvblock_init(); + return 0; +} +#endif + /* * Tell if it's OK to load the environment early in boot. * @@ -762,6 +783,12 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_MMC initr_mmc, #endif +#ifdef CONFIG_XEN + initr_xen, +#endif +#ifdef CONFIG_PVBLOCK + initr_pvblock, +#endif initr_env, #ifdef CONFIG_SYS_BOOTPARAMS_LEN initr_malloc_bootparams, |