Merge tag 'video-for-2021.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index 53792e9..9b2fec7 100644 (file)
--- 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.
  *
@@ -714,6 +735,9 @@ static init_fnc_t init_sequence_r[] = {
        initr_watchdog,
 #endif
        INIT_FUNC_WATCHDOG_RESET
+#if defined(CONFIG_NEEDS_MANUAL_RELOC) && defined(CONFIG_BLOCK_CACHE)
+       blkcache_init,
+#endif
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
        initr_manual_reloc_cmdtable,
 #endif
@@ -759,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,
@@ -848,9 +878,6 @@ static init_fnc_t init_sequence_r[] = {
 #if defined(CONFIG_PRAM)
        initr_mem,
 #endif
-#if defined(CONFIG_NEEDS_MANUAL_RELOC) && defined(CONFIG_BLOCK_CACHE)
-       blkcache_init,
-#endif
        run_main_loop,
 };