The boot file contains functions for more than just "bootm", so rename it accordingly.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- lib_blackfin/Makefile | 2 +- lib_blackfin/boot.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ lib_blackfin/bootm.c | 56 ------------------------------------------------- 3 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 lib_blackfin/boot.c delete mode 100644 lib_blackfin/bootm.c
diff --git a/lib_blackfin/Makefile b/lib_blackfin/Makefile index 3f69770..fee0fda 100644 --- a/lib_blackfin/Makefile +++ b/lib_blackfin/Makefile @@ -37,7 +37,7 @@ SOBJS-y += memmove.o SOBJS-y += memset.o
COBJS-y += board.o -COBJS-y += bootm.o +COBJS-y += boot.o COBJS-y += cache.o COBJS-y += muldi3.o COBJS-y += post.o diff --git a/lib_blackfin/boot.c b/lib_blackfin/boot.c new file mode 100644 index 0000000..47e27de --- /dev/null +++ b/lib_blackfin/boot.c @@ -0,0 +1,56 @@ +/* + * U-boot - boot.c - misc boot helper functions + * + * Copyright (c) 2005-2008 Analog Devices Inc. + * + * (C) Copyright 2000-2004 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * Licensed under the GPL-2 or later. + */ + +#include <common.h> +#include <command.h> +#include <image.h> +#include <asm/blackfin.h> + +#ifdef SHARED_RESOURCES +extern void swap_to(int device_id); +#endif + +static char *make_command_line(void) +{ + char *dest = (char *)CONFIG_LINUX_CMDLINE_ADDR; + char *bootargs = getenv("bootargs"); + + if (bootargs == NULL) + return NULL; + + strncpy(dest, bootargs, CONFIG_LINUX_CMDLINE_SIZE); + dest[CONFIG_LINUX_CMDLINE_SIZE - 1] = 0; + return dest; +} + +int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) +{ + int (*appl) (char *cmdline); + char *cmdline; + + if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) + return 1; + +#ifdef SHARED_RESOURCES + swap_to(FLASH); +#endif + + appl = (int (*)(char *))images->ep; + + printf("Starting Kernel at = %x\n", appl); + cmdline = make_command_line(); + icache_disable(); + dcache_disable(); + (*appl) (cmdline); + /* does not return */ + + return 1; +} diff --git a/lib_blackfin/bootm.c b/lib_blackfin/bootm.c deleted file mode 100644 index 2954ce6..0000000 --- a/lib_blackfin/bootm.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * U-boot - bootm.c - misc boot helper functions - * - * Copyright (c) 2005-2008 Analog Devices Inc. - * - * (C) Copyright 2000-2004 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * Licensed under the GPL-2 or later. - */ - -#include <common.h> -#include <command.h> -#include <image.h> -#include <asm/blackfin.h> - -#ifdef SHARED_RESOURCES -extern void swap_to(int device_id); -#endif - -static char *make_command_line(void) -{ - char *dest = (char *)CONFIG_LINUX_CMDLINE_ADDR; - char *bootargs = getenv("bootargs"); - - if (bootargs == NULL) - return NULL; - - strncpy(dest, bootargs, CONFIG_LINUX_CMDLINE_SIZE); - dest[CONFIG_LINUX_CMDLINE_SIZE - 1] = 0; - return dest; -} - -int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) -{ - int (*appl) (char *cmdline); - char *cmdline; - - if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) - return 1; - -#ifdef SHARED_RESOURCES - swap_to(FLASH); -#endif - - appl = (int (*)(char *))images->ep; - - printf("Starting Kernel at = %x\n", appl); - cmdline = make_command_line(); - icache_disable(); - dcache_disable(); - (*appl) (cmdline); - /* does not return */ - - return 1; -}