]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - common/spl/spl.c
Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx
[karo-tx-uboot.git] / common / spl / spl.c
index 3f41014023e18a2ad2ad7638f223ef767696fe78..da31457d5f06d6ab192ffedf1ed82974d688459c 100644 (file)
@@ -4,23 +4,7 @@
  *
  * Aneesh V <aneesh@ti.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <spl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifndef CONFIG_SYS_UBOOT_START
+#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
+#endif
+#ifndef CONFIG_SYS_MONITOR_LEN
+#define CONFIG_SYS_MONITOR_LEN (200 * 1024)
+#endif
+
 u32 *boot_params_ptr = NULL;
 struct spl_image_info spl_image;
 
 /* Define board data structure */
 static bd_t bdata __attribute__ ((section(".data")));
 
-inline void hang(void)
-{
-       puts("### ERROR ### Please RESET the board ###\n");
-       for (;;)
-               ;
-}
-
 /*
  * Default function to determine if u-boot or the OS should
  * be started. This implementation always returns 1.
@@ -67,47 +51,83 @@ __weak int spl_start_uboot(void)
 }
 #endif
 
+/*
+ * Weak default function for board specific cleanup/preparation before
+ * Linux boot. Some boards/platforms might not need it, so just provide
+ * an empty stub here.
+ */
+__weak void spl_board_prepare_for_linux(void)
+{
+       /* Nothing to do! */
+}
+
 void spl_parse_image_header(const struct image_header *header)
 {
        u32 header_size = sizeof(struct image_header);
 
-       if (__be32_to_cpu(header->ih_magic) == IH_MAGIC) {
-               spl_image.size = __be32_to_cpu(header->ih_size) + header_size;
-               spl_image.entry_point = __be32_to_cpu(header->ih_load);
-               /* Load including the header */
-               spl_image.load_addr = spl_image.entry_point - header_size;
-               spl_image.os = header->ih_os;
-               spl_image.name = (const char *)&header->ih_name;
-               debug("spl: payload image: %s load addr: 0x%x size: %d\n",
-                       spl_image.name, spl_image.load_addr, spl_image.size);
+       if (image_get_magic(header) == IH_MAGIC) {
+               if (spl_image.flags & SPL_COPY_PAYLOAD_ONLY) {
+                       /*
+                        * On some system (e.g. powerpc), the load-address and
+                        * entry-point is located at address 0. We can't load
+                        * to 0-0x40. So skip header in this case.
+                        */
+                       spl_image.load_addr = image_get_load(header);
+                       spl_image.entry_point = image_get_ep(header);
+                       spl_image.size = image_get_data_size(header);
+               } else {
+                       spl_image.entry_point = image_get_load(header);
+                       /* Load including the header */
+                       spl_image.load_addr = spl_image.entry_point -
+                               header_size;
+                       spl_image.size = image_get_data_size(header) +
+                               header_size;
+               }
+               spl_image.os = image_get_os(header);
+               spl_image.name = image_get_name(header);
+               debug("spl: payload image: %.*s load addr: 0x%x size: %d\n",
+                       sizeof(spl_image.name), spl_image.name,
+                       spl_image.load_addr, spl_image.size);
        } else {
                /* Signature not found - assume u-boot.bin */
-               puts("mkimage signature not found, assuming u-boot.bin ..\n");
                debug("mkimage signature not found - ih_magic = %x\n",
                        header->ih_magic);
                /* Let's assume U-Boot will not be more than 200 KB */
-               spl_image.size = 200 * 1024;
-               spl_image.entry_point = CONFIG_SYS_TEXT_BASE;
+               spl_image.size = CONFIG_SYS_MONITOR_LEN;
+               spl_image.entry_point = CONFIG_SYS_UBOOT_START;
                spl_image.load_addr = CONFIG_SYS_TEXT_BASE;
                spl_image.os = IH_OS_U_BOOT;
                spl_image.name = "U-Boot";
        }
 }
 
-static void __noreturn jump_to_image_no_args(void)
+__weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 {
-       typedef void __noreturn (*image_entry_noargs_t)(u32 *);
+       typedef void __noreturn (*image_entry_noargs_t)(void);
+
        image_entry_noargs_t image_entry =
-                       (image_entry_noargs_t) spl_image.entry_point;
+                       (image_entry_noargs_t) spl_image->entry_point;
 
-       debug("image entry point: 0x%X\n", spl_image.entry_point);
-       /* Pass the saved boot_params from rom code */
-#if defined(CONFIG_VIRTIO) || defined(CONFIG_ZEBU)
-       image_entry = (image_entry_noargs_t)0x80100000;
-#endif
-       u32 boot_params_ptr_addr = (u32)&boot_params_ptr;
-       image_entry((u32 *)boot_params_ptr_addr);
+       debug("image entry point: 0x%X\n", spl_image->entry_point);
+       image_entry();
+}
+
+#ifdef CONFIG_SPL_RAM_DEVICE
+static void spl_ram_load_image(void)
+{
+       const struct image_header *header;
+
+       /*
+        * Get the header.  It will point to an address defined by handoff
+        * which will tell where the image located inside the flash. For
+        * now, it will temporary fixed to address pointed by U-Boot.
+        */
+       header = (struct image_header *)
+               (CONFIG_SYS_TEXT_BASE - sizeof(struct image_header));
+
+       spl_parse_image_header(header);
 }
+#endif
 
 void board_init_r(gd_t *dummy1, ulong dummy2)
 {
@@ -119,6 +139,14 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
                        CONFIG_SYS_SPL_MALLOC_SIZE);
 #endif
 
+#ifndef CONFIG_PPC
+       /*
+        * timer_init() does not exist on PPC systems. The timer is initialized
+        * and enabled (decrementer) in interrupt_init() here.
+        */
+       timer_init();
+#endif
+
 #ifdef CONFIG_SPL_BOARD_INIT
        spl_board_init();
 #endif
@@ -126,6 +154,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
        boot_device = spl_boot_device();
        debug("boot device - %d\n", boot_device);
        switch (boot_device) {
+#ifdef CONFIG_SPL_RAM_DEVICE
+       case BOOT_DEVICE_RAM:
+               spl_ram_load_image();
+               break;
+#endif
 #ifdef CONFIG_SPL_MMC_SUPPORT
        case BOOT_DEVICE_MMC1:
        case BOOT_DEVICE_MMC2:
@@ -138,6 +171,16 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
                spl_nand_load_image();
                break;
 #endif
+#ifdef CONFIG_SPL_ONENAND_SUPPORT
+       case BOOT_DEVICE_ONENAND:
+               spl_onenand_load_image();
+               break;
+#endif
+#ifdef CONFIG_SPL_NOR_SUPPORT
+       case BOOT_DEVICE_NOR:
+               spl_nor_load_image();
+               break;
+#endif
 #ifdef CONFIG_SPL_YMODEM_SUPPORT
        case BOOT_DEVICE_UART:
                spl_ymodem_load_image();
@@ -145,32 +188,42 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 #endif
 #ifdef CONFIG_SPL_SPI_SUPPORT
        case BOOT_DEVICE_SPI:
-               spi_boot();
-       break;
+               spl_spi_load_image();
+               break;
+#endif
+#ifdef CONFIG_SPL_ETH_SUPPORT
+       case BOOT_DEVICE_CPGMAC:
+#ifdef CONFIG_SPL_ETH_DEVICE
+               spl_net_load_image(CONFIG_SPL_ETH_DEVICE);
+#else
+               spl_net_load_image(NULL);
+#endif
+               break;
+#endif
+#ifdef CONFIG_SPL_USBETH_SUPPORT
+       case BOOT_DEVICE_USBETH:
+               spl_net_load_image("usb_ether");
+               break;
 #endif
        default:
-               puts("SPL: Un-supported Boot Device\n");
-               debug("Found: %d\n", boot_device);
+               debug("SPL: Un-supported Boot Device\n");
                hang();
-               break;
        }
 
        switch (spl_image.os) {
        case IH_OS_U_BOOT:
                debug("Jumping to U-Boot\n");
-               jump_to_image_no_args();
                break;
 #ifdef CONFIG_SPL_OS_BOOT
        case IH_OS_LINUX:
                debug("Jumping to Linux\n");
                spl_board_prepare_for_linux();
                jump_to_image_linux((void *)CONFIG_SYS_SPL_ARGS_ADDR);
-               break;
 #endif
        default:
-               puts("Unsupported OS image.. Jumping nevertheless..\n");
-               jump_to_image_no_args();
+               debug("Unsupported OS image.. Jumping nevertheless..\n");
        }
+       jump_to_image_no_args(&spl_image);
 }
 
 /*
@@ -180,7 +233,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 void preloader_console_init(void)
 {
        gd->bd = &bdata;
-       gd->flags |= GD_FLG_RELOC;
        gd->baudrate = CONFIG_BAUDRATE;
 
        serial_init();          /* serial communications setup */