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 b04e6ad..9b2fec7 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -11,12 +11,16 @@
 
 #include <common.h>
 #include <api.h>
+#include <bootstage.h>
 #include <cpu_func.h>
 #include <exports.h>
+#include <flash.h>
 #include <hang.h>
 #include <image.h>
 #include <irq_func.h>
+#include <log.h>
 #include <net.h>
+#include <asm/cache.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
@@ -45,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>
@@ -52,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
@@ -183,12 +191,6 @@ static int initr_reloc_global_data(void)
        return 0;
 }
 
-static int initr_serial(void)
-{
-       serial_initialize();
-       return 0;
-}
-
 #if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS)
 static int initr_trap(void)
 {
@@ -229,6 +231,15 @@ static int initr_unlock_ram_in_cache(void)
 }
 #endif
 
+#ifdef CONFIG_PCI_ENDPOINT
+static int initr_pci_ep(void)
+{
+       pci_ep_init();
+
+       return 0;
+}
+#endif
+
 #ifdef CONFIG_PCI
 static int initr_pci(void)
 {
@@ -310,9 +321,9 @@ static int initr_dm(void)
 #ifdef CONFIG_TIMER
        gd->timer = NULL;
 #endif
-       bootstage_start(BOOTSTATE_ID_ACCUM_DM_R, "dm_r");
+       bootstage_start(BOOTSTAGE_ID_ACCUM_DM_R, "dm_r");
        ret = dm_init_and_scan(false);
-       bootstage_accum(BOOTSTATE_ID_ACCUM_DM_R);
+       bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_R);
        if (ret)
                return ret;
 
@@ -354,8 +365,8 @@ static int initr_announce(void)
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
 static int initr_manual_reloc_cmdtable(void)
 {
-       fixup_cmdtable(ll_entry_start(cmd_tbl_t, cmd),
-                      ll_entry_count(cmd_tbl_t, cmd));
+       fixup_cmdtable(ll_entry_start(struct cmd_tbl, cmd),
+                      ll_entry_count(struct cmd_tbl, cmd));
        return 0;
 }
 #endif
@@ -377,7 +388,7 @@ __weak int is_flash_available(void)
 static int initr_flash(void)
 {
        ulong flash_size = 0;
-       bd_t *bd = gd->bd;
+       struct bd_info *bd = gd->bd;
 
        if (!is_flash_available())
                return 0;
@@ -458,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.
  *
@@ -529,25 +557,11 @@ static int initr_api(void)
 #ifdef CONFIG_CMD_NET
 static int initr_ethaddr(void)
 {
-       bd_t *bd = gd->bd;
+       struct bd_info *bd = gd->bd;
 
        /* kept around for legacy kernels only ... ignore the next section */
        eth_env_get_enetaddr("ethaddr", bd->bi_enetaddr);
-#ifdef CONFIG_HAS_ETH1
-       eth_env_get_enetaddr("eth1addr", bd->bi_enet1addr);
-#endif
-#ifdef CONFIG_HAS_ETH2
-       eth_env_get_enetaddr("eth2addr", bd->bi_enet2addr);
-#endif
-#ifdef CONFIG_HAS_ETH3
-       eth_env_get_enetaddr("eth3addr", bd->bi_enet3addr);
-#endif
-#ifdef CONFIG_HAS_ETH4
-       eth_env_get_enetaddr("eth4addr", bd->bi_enet4addr);
-#endif
-#ifdef CONFIG_HAS_ETH5
-       eth_env_get_enetaddr("eth5addr", bd->bi_enet5addr);
-#endif
+
        return 0;
 }
 #endif /* CONFIG_CMD_NET */
@@ -715,12 +729,15 @@ static init_fnc_t init_sequence_r[] = {
 #endif
        initr_dm_devices,
        stdio_init_tables,
-       initr_serial,
+       serial_initialize,
        initr_announce,
 #if CONFIG_IS_ENABLED(WDT)
        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
@@ -766,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,
@@ -826,6 +849,9 @@ static init_fnc_t init_sequence_r[] = {
 #ifdef CONFIG_BITBANGMII
        initr_bbmii,
 #endif
+#ifdef CONFIG_PCI_ENDPOINT
+       initr_pci_ep,
+#endif
 #ifdef CONFIG_CMD_NET
        INIT_FUNC_WATCHDOG_RESET
        initr_net,
@@ -852,9 +878,6 @@ static init_fnc_t init_sequence_r[] = {
 #if defined(CONFIG_PRAM)
        initr_mem,
 #endif
-#if defined(CONFIG_M68K) && defined(CONFIG_BLOCK_CACHE)
-       blkcache_init,
-#endif
        run_main_loop,
 };