Merge tag 'u-boot-imx-20200511' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / mach-imx / imx_bootaux.c

diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index 21e96f8c883c5cf86c9d0eff6e54188692110716..ec0da1164f3cb888f32a9c711683f4d8b6804a57 100644 (file)
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -12,70 +12,6 @@
 #include <linux/compiler.h>
 #include <cpu_func.h>
 
-#ifndef CONFIG_IMX8M
-const __weak struct rproc_att hostmap[] = { };
-
-static const struct rproc_att *get_host_mapping(unsigned long auxcore)
-{
-       const struct rproc_att *mmap = hostmap;
-
-       while (mmap && mmap->size) {
-               if (mmap->da <= auxcore &&
-                   mmap->da + mmap->size > auxcore)
-                       return mmap;
-               mmap++;
-       }
-
-       return NULL;
-}
-
-/*
- * A very simple elf loader, assumes the image is valid, returns the
- * entry point address.
- */
-static unsigned long load_elf_image_phdr(unsigned long addr)
-{
-       Elf32_Ehdr *ehdr; /* ELF header structure pointer */
-       Elf32_Phdr *phdr; /* Program header structure pointer */
-       int i;
-
-       ehdr = (Elf32_Ehdr *)addr;
-       phdr = (Elf32_Phdr *)(addr + ehdr->e_phoff);
-
-       /* Load each program header */
-       for (i = 0; i < ehdr->e_phnum; ++i, ++phdr) {
-               const struct rproc_att *mmap = get_host_mapping(phdr->p_paddr);
-               void *dst, *src;
-
-               if (phdr->p_type != PT_LOAD)
-                       continue;
-
-               if (!mmap) {
-                       printf("Invalid aux core address: %08x",
-                              phdr->p_paddr);
-                       return 0;
-               }
-
-               dst = (void *)(phdr->p_paddr - mmap->da) + mmap->sa;
-               src = (void *)addr + phdr->p_offset;
-
-               debug("Loading phdr %i to 0x%p (%i bytes)\n",
-                     i, dst, phdr->p_filesz);
-
-               if (phdr->p_filesz)
-                       memcpy(dst, src, phdr->p_filesz);
-               if (phdr->p_filesz != phdr->p_memsz)
-                       memset(dst + phdr->p_filesz, 0x00,
-                              phdr->p_memsz - phdr->p_filesz);
-               flush_cache((unsigned long)dst &
-                           ~(CONFIG_SYS_CACHELINE_SIZE - 1),
-                           ALIGN(phdr->p_filesz, CONFIG_SYS_CACHELINE_SIZE));
-       }
-
-       return ehdr->e_entry;
-}
-#endif
-
 int arch_auxiliary_core_up(u32 core_id, ulong addr)
 {
        ulong stack, pc;