]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - common/spl/spl.c
karo: merge with Ka-Ro specific tree for secure boot support
[karo-tx-uboot.git] / common / spl / spl.c
index 0d829c0f129cd519707c658b959f5f97f6a2111e..46447f4905216bb98748794d07752ea8c8121483 100644 (file)
@@ -4,25 +4,10 @@
  *
  * 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 <dm.h>
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <nand.h>
@@ -31,6 +16,7 @@
 #include <i2c.h>
 #include <image.h>
 #include <malloc.h>
+#include <dm/root.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -39,6 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
 #endif
 #ifndef CONFIG_SYS_MONITOR_LEN
+/* Unknown U-Boot size, let's assume it will not be more than 200 KB */
 #define CONFIG_SYS_MONITOR_LEN (200 * 1024)
 #endif
 
@@ -48,13 +35,6 @@ 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.
@@ -74,6 +54,25 @@ __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_set_header_raw_uboot(void)
+{
+       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";
+}
+
 void spl_parse_image_header(const struct image_header *header)
 {
        u32 header_size = sizeof(struct image_header);
@@ -98,34 +97,26 @@ void spl_parse_image_header(const struct image_header *header)
                }
                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",
-                       spl_image.name, spl_image.load_addr, spl_image.size);
+               debug("spl: payload image: %.*s load addr: 0x%x size: %d\n",
+                       (int)sizeof(spl_image.name), spl_image.name,
+                       spl_image.load_addr, spl_image.size);
        } else {
                /* Signature not found - assume u-boot.bin */
                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 = 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";
+               spl_set_header_raw_uboot();
        }
 }
 
-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
@@ -150,12 +141,25 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
        u32 boot_device;
        debug(">>spl:board_init_r()\n");
 
-#ifdef CONFIG_SYS_SPL_MALLOC_START
+#if defined(CONFIG_SYS_SPL_MALLOC_START)
        mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
                        CONFIG_SYS_SPL_MALLOC_SIZE);
+       gd->flags |= GD_FLG_FULL_MALLOC_INIT;
+#elif defined(CONFIG_SYS_MALLOC_F_LEN)
+       gd->malloc_limit = gd->malloc_base + CONFIG_SYS_MALLOC_F_LEN;
+       gd->malloc_ptr = 0;
+#endif
+#ifdef CONFIG_SPL_DM
+       dm_init_and_scan(true);
 #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();
@@ -178,7 +182,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 #endif
 #ifdef CONFIG_SPL_NAND_SUPPORT
        case BOOT_DEVICE_NAND:
-               spl_nand_load_image();
+               if (spl_nand_load_image() == 0)
+                       break;
+               /* fallthru in case of failure to activate ymodem download */
+#endif
+#ifdef CONFIG_SPL_ONENAND_SUPPORT
+       case BOOT_DEVICE_ONENAND:
+               spl_onenand_load_image();
                break;
 #endif
 #ifdef CONFIG_SPL_NOR_SUPPORT
@@ -204,9 +214,26 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
                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
+#ifdef CONFIG_SPL_USB_SUPPORT
+       case BOOT_DEVICE_USB:
+               spl_usb_load_image();
+               break;
+#endif
+#ifdef CONFIG_SPL_SATA_SUPPORT
+       case BOOT_DEVICE_SATA:
+               spl_sata_load_image();
+               break;
 #endif
        default:
-               debug("SPL: Un-supported Boot Device\n");
+#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
+               printf("SPL: Unsupported Boot Device %d\n", boot_device);
+#endif
                hang();
        }
 
@@ -223,7 +250,12 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
        default:
                debug("Unsupported OS image.. Jumping nevertheless..\n");
        }
-       jump_to_image_no_args();
+#if defined(CONFIG_SYS_MALLOC_F_LEN) && !defined(CONFIG_SYS_SPL_MALLOC_SIZE)
+       debug("SPL malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr,
+             gd->malloc_ptr / 1024);
+#endif
+
+       jump_to_image_no_args(&spl_image);
 }
 
 /*