X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=arch%2Fmips%2Flib%2Fbootm.c;h=71bb0d2a199b28512828640352ec547b67cf6ff9;hp=608c1a78db895fd2f9432788712126d2976be3cf;hb=cd2e46cb38d5aeada2b2c2f881cdc6baa672dc09;hpb=fedab338f3459315cb69627fcf46032ec8df1753 diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 608c1a78db..71bb0d2a19 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -2,23 +2,7 @@ * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * 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 @@ -33,96 +17,89 @@ DECLARE_GLOBAL_DATA_PTR; #define LINUX_MAX_ENVS 256 #define LINUX_MAX_ARGS 256 +#if defined(CONFIG_MALTA) +#define mips_boot_malta 1 +#else +#define mips_boot_malta 0 +#endif + static int linux_argc; static char **linux_argv; +static char *linux_argp; static char **linux_env; static char *linux_env_p; static int linux_env_idx; -static void linux_params_init(ulong start, char *commandline); -static void linux_env_set(char *env_name, char *env_val); - -int do_bootm_linux(int flag, int argc, char * const argv[], - bootm_headers_t *images) +static ulong arch_get_sp(void) { - void (*theKernel) (int, char **, char **, int *); - char *commandline = getenv("bootargs"); - char env_buf[12]; - char *cp; - - if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) - return 1; + ulong ret; - /* find kernel entry point */ - theKernel = (void (*)(int, char **, char **, int *))images->ep; - - bootstage_mark(BOOTSTAGE_ID_RUN_OS); - -#ifdef DEBUG - printf("## Transferring control to Linux (at address %08lx) ...\n", - (ulong) theKernel); -#endif + __asm__ __volatile__("move %0, $sp" : "=r"(ret) : ); - linux_params_init(UNCACHED_SDRAM(gd->bd->bi_boot_params), commandline); - -#ifdef CONFIG_MEMSIZE_IN_BYTES - sprintf(env_buf, "%lu", (ulong)gd->ram_size); - debug("## Giving linux memsize in bytes, %lu\n", (ulong)gd->ram_size); -#else - sprintf(env_buf, "%lu", (ulong)(gd->ram_size >> 20)); - debug("## Giving linux memsize in MB, %lu\n", - (ulong)(gd->ram_size >> 20)); -#endif /* CONFIG_MEMSIZE_IN_BYTES */ - - linux_env_set("memsize", env_buf); + return ret; +} - sprintf(env_buf, "0x%08X", (uint) UNCACHED_SDRAM(images->rd_start)); - linux_env_set("initrd_start", env_buf); +void arch_lmb_reserve(struct lmb *lmb) +{ + ulong sp; - sprintf(env_buf, "0x%X", (uint) (images->rd_end - images->rd_start)); - linux_env_set("initrd_size", env_buf); + sp = arch_get_sp(); + debug("## Current stack ends at 0x%08lx\n", sp); - sprintf(env_buf, "0x%08X", (uint) (gd->bd->bi_flashstart)); - linux_env_set("flash_start", env_buf); + /* adjust sp by 4K to be safe */ + sp -= 4096; + lmb_reserve(lmb, sp, CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp); +} - sprintf(env_buf, "0x%X", (uint) (gd->bd->bi_flashsize)); - linux_env_set("flash_size", env_buf); +static void linux_cmdline_init(void) +{ + linux_argc = 1; + linux_argv = (char **)UNCACHED_SDRAM(gd->bd->bi_boot_params); + linux_argv[0] = 0; + linux_argp = (char *)(linux_argv + LINUX_MAX_ARGS); +} - cp = getenv("ethaddr"); - if (cp) - linux_env_set("ethaddr", cp); +static void linux_cmdline_set(const char *value, size_t len) +{ + linux_argv[linux_argc] = linux_argp; + memcpy(linux_argp, value, len); + linux_argp[len] = 0; - cp = getenv("eth1addr"); - if (cp) - linux_env_set("eth1addr", cp); + linux_argp += len + 1; + linux_argc++; +} - /* we assume that the kernel is in place */ - printf("\nStarting kernel ...\n\n"); +static void linux_cmdline_dump(void) +{ + int i; - theKernel(linux_argc, linux_argv, linux_env, 0); + debug("## cmdline argv at 0x%p, argp at 0x%p\n", + linux_argv, linux_argp); - /* does not return */ - return 1; + for (i = 1; i < linux_argc; i++) + debug(" arg %03d: %s\n", i, linux_argv[i]); } -static void linux_params_init(ulong start, char *line) +static void boot_cmdline_linux(bootm_headers_t *images) { - char *next, *quote, *argp; + const char *bootargs, *next, *quote; - linux_argc = 1; - linux_argv = (char **) start; - linux_argv[0] = 0; - argp = (char *) (linux_argv + LINUX_MAX_ARGS); + linux_cmdline_init(); - next = line; + bootargs = getenv("bootargs"); + if (!bootargs) + return; - while (line && *line && linux_argc < LINUX_MAX_ARGS) { - quote = strchr(line, '"'); - next = strchr(line, ' '); + next = bootargs; + + while (bootargs && *bootargs && linux_argc < LINUX_MAX_ARGS) { + quote = strchr(bootargs, '"'); + next = strchr(bootargs, ' '); while (next && quote && quote < next) { - /* we found a left quote before the next blank + /* + * we found a left quote before the next blank * now we have to find the matching right quote */ next = strchr(quote + 1, '"'); @@ -133,28 +110,28 @@ static void linux_params_init(ulong start, char *line) } if (!next) - next = line + strlen(line); - - linux_argv[linux_argc] = argp; - memcpy(argp, line, next - line); - argp[next - line] = 0; + next = bootargs + strlen(bootargs); - argp += next - line + 1; - linux_argc++; + linux_cmdline_set(bootargs, next - bootargs); if (*next) next++; - line = next; + bootargs = next; } - linux_env = (char **) (((ulong) argp + 15) & ~15); + linux_cmdline_dump(); +} + +static void linux_env_init(void) +{ + linux_env = (char **)(((ulong) linux_argp + 15) & ~15); linux_env[0] = 0; - linux_env_p = (char *) (linux_env + LINUX_MAX_ENVS); + linux_env_p = (char *)(linux_env + LINUX_MAX_ENVS); linux_env_idx = 0; } -static void linux_env_set(char *env_name, char *env_val) +static void linux_env_set(const char *env_name, const char *env_val) { if (linux_env_idx < LINUX_MAX_ENVS - 1) { linux_env[linux_env_idx] = linux_env_p; @@ -162,8 +139,12 @@ static void linux_env_set(char *env_name, char *env_val) strcpy(linux_env_p, env_name); linux_env_p += strlen(env_name); - strcpy(linux_env_p, "="); - linux_env_p += 1; + if (mips_boot_malta) { + linux_env_p++; + linux_env[++linux_env_idx] = linux_env_p; + } else { + *linux_env_p++ = '='; + } strcpy(linux_env_p, env_val); linux_env_p += strlen(env_val); @@ -172,3 +153,100 @@ static void linux_env_set(char *env_name, char *env_val) linux_env[++linux_env_idx] = 0; } } + +static void boot_prep_linux(bootm_headers_t *images) +{ + char env_buf[12]; + const char *cp; + ulong rd_start, rd_size; + +#ifdef CONFIG_MEMSIZE_IN_BYTES + sprintf(env_buf, "%lu", (ulong)gd->ram_size); + debug("## Giving linux memsize in bytes, %lu\n", (ulong)gd->ram_size); +#else + sprintf(env_buf, "%lu", (ulong)(gd->ram_size >> 20)); + debug("## Giving linux memsize in MB, %lu\n", + (ulong)(gd->ram_size >> 20)); +#endif /* CONFIG_MEMSIZE_IN_BYTES */ + + rd_start = UNCACHED_SDRAM(images->initrd_start); + rd_size = images->initrd_end - images->initrd_start; + + linux_env_init(); + + linux_env_set("memsize", env_buf); + + sprintf(env_buf, "0x%08lX", rd_start); + linux_env_set("initrd_start", env_buf); + + sprintf(env_buf, "0x%lX", rd_size); + linux_env_set("initrd_size", env_buf); + + sprintf(env_buf, "0x%08X", (uint) (gd->bd->bi_flashstart)); + linux_env_set("flash_start", env_buf); + + sprintf(env_buf, "0x%X", (uint) (gd->bd->bi_flashsize)); + linux_env_set("flash_size", env_buf); + + cp = getenv("ethaddr"); + if (cp) + linux_env_set("ethaddr", cp); + + cp = getenv("eth1addr"); + if (cp) + linux_env_set("eth1addr", cp); + + if (mips_boot_malta) { + sprintf(env_buf, "%un8r", gd->baudrate); + linux_env_set("modetty0", env_buf); + } +} + +static void boot_jump_linux(bootm_headers_t *images) +{ + typedef void __noreturn (*kernel_entry_t)(int, ulong, ulong, ulong); + kernel_entry_t kernel = (kernel_entry_t) images->ep; + ulong linux_extra = 0; + + debug("## Transferring control to Linux (at address %p) ...\n", kernel); + + bootstage_mark(BOOTSTAGE_ID_RUN_OS); + + if (mips_boot_malta) + linux_extra = gd->ram_size; + + /* we assume that the kernel is in place */ + printf("\nStarting kernel ...\n\n"); + + kernel(linux_argc, (ulong)linux_argv, (ulong)linux_env, linux_extra); +} + +int do_bootm_linux(int flag, int argc, char * const argv[], + bootm_headers_t *images) +{ + /* No need for those on MIPS */ + if (flag & BOOTM_STATE_OS_BD_T) + return -1; + + if (flag & BOOTM_STATE_OS_CMDLINE) { + boot_cmdline_linux(images); + return 0; + } + + if (flag & BOOTM_STATE_OS_PREP) { + boot_prep_linux(images); + return 0; + } + + if (flag & BOOTM_STATE_OS_GO) { + boot_jump_linux(images); + return 0; + } + + boot_cmdline_linux(images); + boot_prep_linux(images); + boot_jump_linux(images); + + /* does not return */ + return 1; +}