diff options
Diffstat (limited to 'lib_blackfin')
| -rw-r--r-- | lib_blackfin/Makefile | 2 | ||||
| -rw-r--r-- | lib_blackfin/bf533_string.c | 198 | ||||
| -rw-r--r-- | lib_blackfin/board.c | 39 | ||||
| -rw-r--r-- | lib_blackfin/bootm.c | 77 | ||||
| -rw-r--r-- | lib_blackfin/string.c | 203 |
5 files changed, 232 insertions, 287 deletions
diff --git a/lib_blackfin/Makefile b/lib_blackfin/Makefile index dfaed6d..b53cdd6 100644 --- a/lib_blackfin/Makefile +++ b/lib_blackfin/Makefile @@ -34,12 +34,12 @@ SOBJS-y += memcpy.o SOBJS-y += memmove.o SOBJS-y += memset.o -COBJS-y += bf533_string.o COBJS-y += board.o COBJS-y += bootm.o COBJS-y += cache.o COBJS-y += muldi3.o COBJS-y += post.o +COBJS-y += string.o COBJS-y += tests.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) diff --git a/lib_blackfin/bf533_string.c b/lib_blackfin/bf533_string.c deleted file mode 100644 index 9ceeeef..0000000 --- a/lib_blackfin/bf533_string.c +++ /dev/null @@ -1,198 +0,0 @@ -/* - * U-boot - bf533_string.c Contains library routines. - * - * Copyright (c) 2005-2007 Analog Devices Inc. - * - * (C) Copyright 2000-2004 - * 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., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include <common.h> -#include <config.h> -#include <asm/blackfin.h> -#include <asm/io.h> -#include "cache.h" -#include <asm/mach-common/bits/dma.h> - -char *strcpy(char *dest, const char *src) -{ - char *xdest = dest; - char temp = 0; - - __asm__ __volatile__ - ("1:\t%2 = B [%1++] (Z);\n\t" - "B [%0++] = %2;\n\t" - "CC = %2;\n\t" - "if cc jump 1b (bp);\n":"=a"(dest), "=a"(src), "=d"(temp) - :"0"(dest), "1"(src), "2"(temp):"memory"); - - return xdest; -} - -char *strncpy(char *dest, const char *src, size_t n) -{ - char *xdest = dest; - char temp = 0; - - if (n == 0) - return xdest; - - __asm__ __volatile__ - ("1:\t%3 = B [%1++] (Z);\n\t" - "B [%0++] = %3;\n\t" - "CC = %3;\n\t" - "if ! cc jump 2f;\n\t" - "%2 += -1;\n\t" - "CC = %2 == 0;\n\t" - "if ! cc jump 1b (bp);\n" - "2:\n":"=a"(dest), "=a"(src), "=da"(n), "=d"(temp) - :"0"(dest), "1"(src), "2"(n), "3"(temp) - :"memory"); - - return xdest; -} - -int strcmp(const char *cs, const char *ct) -{ - char __res1, __res2; - - __asm__("1:\t%2 = B[%0++] (Z);\n\t" /* get *cs */ - "%3 = B[%1++] (Z);\n\t" /* get *ct */ - "CC = %2 == %3;\n\t" /* compare a byte */ - "if ! cc jump 2f;\n\t" /* not equal, break out */ - "CC = %2;\n\t" /* at end of cs? */ - "if cc jump 1b (bp);\n\t" /* no, keep going */ - "jump.s 3f;\n" /* strings are equal */ - "2:\t%2 = %2 - %3;\n" /* *cs - *ct */ - "3:\n": "=a"(cs), "=a"(ct), "=d"(__res1), "=d"(__res2) - : "0"(cs), "1"(ct)); - - return __res1; -} - -int strncmp(const char *cs, const char *ct, size_t count) -{ - char __res1, __res2; - - if (!count) - return 0; - - __asm__("1:\t%3 = B[%0++] (Z);\n\t" /* get *cs */ - "%4 = B[%1++] (Z);\n\t" /* get *ct */ - "CC = %3 == %4;\n\t" /* compare a byte */ - "if ! cc jump 3f;\n\t" /* not equal, break out */ - "CC = %3;\n\t" /* at end of cs? */ - "if ! cc jump 4f;\n\t" /* yes, all done */ - "%2 += -1;\n\t" /* no, adjust count */ - "CC = %2 == 0;\n\t" "if ! cc jump 1b;\n" /* more to do, keep going */ - "2:\t%3 = 0;\n\t" /* strings are equal */ - "jump.s 4f;\n" "3:\t%3 = %3 - %4;\n" /* *cs - *ct */ - "4:": "=a"(cs), "=a"(ct), "=da"(count), "=d"(__res1), - "=d"(__res2) - : "0"(cs), "1"(ct), "2"(count)); - - return __res1; -} - -#ifndef pMDMA_D0_IRQ_STATUS -# define pMDMA_D0_IRQ_STATUS pMDMA1_D0_IRQ_STATUS -# define pMDMA_D0_START_ADDR pMDMA1_D0_START_ADDR -# define pMDMA_D0_X_COUNT pMDMA1_D0_X_COUNT -# define pMDMA_D0_X_MODIFY pMDMA1_D0_X_MODIFY -# define pMDMA_D0_CONFIG pMDMA1_D0_CONFIG -# define pMDMA_S0_IRQ_STATUS pMDMA1_S0_IRQ_STATUS -# define pMDMA_S0_START_ADDR pMDMA1_S0_START_ADDR -# define pMDMA_S0_X_COUNT pMDMA1_S0_X_COUNT -# define pMDMA_S0_X_MODIFY pMDMA1_S0_X_MODIFY -# define pMDMA_S0_CONFIG pMDMA1_S0_CONFIG -#endif - -static void *dma_memcpy(void *dest, const void *src, size_t count) -{ - *pMDMA_D0_IRQ_STATUS = DMA_DONE | DMA_ERR; - - /* Copy sram functions from sdram to sram */ - /* Setup destination start address */ - *pMDMA_D0_START_ADDR = (volatile void **)dest; - /* Setup destination xcount */ - *pMDMA_D0_X_COUNT = count; - /* Setup destination xmodify */ - *pMDMA_D0_X_MODIFY = 1; - - /* Setup Source start address */ - *pMDMA_S0_START_ADDR = (volatile void **)src; - /* Setup Source xcount */ - *pMDMA_S0_X_COUNT = count; - /* Setup Source xmodify */ - *pMDMA_S0_X_MODIFY = 1; - - /* Enable source DMA */ - *pMDMA_S0_CONFIG = (DMAEN); - SSYNC(); - - *pMDMA_D0_CONFIG = (WNR | DMAEN); - - while (*pMDMA_D0_IRQ_STATUS & DMA_RUN) { - *pMDMA_D0_IRQ_STATUS |= (DMA_DONE | DMA_ERR); - } - *pMDMA_D0_IRQ_STATUS |= (DMA_DONE | DMA_ERR); - - dest += count; - src += count; - return dest; -} - -/* - * memcpy - Copy one area of memory to another - * @dest: Where to copy to - * @src: Where to copy from - * @count: The size of the area. - * - * You should not use this function to access IO space, use memcpy_toio() - * or memcpy_fromio() instead. - */ -extern void *memcpy_ASM(void *dest, const void *src, size_t count); -void *memcpy(void *dest, const void *src, size_t count) -{ - char *tmp = (char *) dest, *s = (char *) src; - - if (dcache_status()) { - blackfin_dcache_flush_range(src, src+count); - } - /* L1_INST_SRAM can only be accessed via dma */ - if ((tmp >= (char *)L1_INST_SRAM) && (tmp < (char *)L1_INST_SRAM_END)) { - /* L1 is the destination */ - dma_memcpy(dest,src,count); - } else if ((s >= (char *)L1_INST_SRAM) && (s < (char *)L1_INST_SRAM_END)) { - /* L1 is the source */ - dma_memcpy(dest,src,count); - - if (icache_status()) { - blackfin_icache_flush_range(dest, dest+count); - } - if (dcache_status()) { - blackfin_dcache_invalidate_range(dest, dest+count); - } - } else { - memcpy_ASM(dest,src,count); - } - return dest; -} diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c index 2a5a2fc..140ec07 100644 --- a/lib_blackfin/board.c +++ b/lib_blackfin/board.c @@ -37,7 +37,7 @@ #include <asm/cplb.h> #include "../drivers/net/smc91111.h" -#if defined(CONFIG_BF537)&&defined(CONFIG_POST) +#if defined(CONFIG_POST) #include <post.h> int post_flag; #endif @@ -192,21 +192,8 @@ void init_cplbtables(void) } j++; } -#if defined(CONFIG_BF561) - /* MAC space */ - icplb_table[j][0] = 0x2C000000; - icplb_table[j][1] = SDRAM_INON_CHBL; - j++; - /* Async Memory space */ - for (i = 0; i < 3; i++) { - icplb_table[j][0] = 0x20000000 + i * 4 * 1024 * 1024; - icplb_table[j][1] = SDRAM_INON_CHBL; - j++; - } -#else icplb_table[j][0] = 0x20000000; icplb_table[j][1] = SDRAM_INON_CHBL; -#endif j = 0; dcplb_table[j][0] = 0xFF800000; dcplb_table[j][1] = L1_DMEMORY; @@ -223,22 +210,8 @@ void init_cplbtables(void) j++; } -#if defined(CONFIG_BF561) - /* MAC space */ - dcplb_table[j][0] = 0x2C000000; - dcplb_table[j][1] = SDRAM_EBIU; - j++; - - /* Flash space */ - for (i = 0; i < 3; i++) { - dcplb_table[j][0] = 0x20000000 + i * 4 * 1024 * 1024; - dcplb_table[j][1] = SDRAM_EBIU; - j++; - } -#else dcplb_table[j][0] = 0x20000000; dcplb_table[j][1] = SDRAM_EBIU; -#endif } /* @@ -275,7 +248,7 @@ void board_init_f(ulong bootflag) memset((void *)bd, 0, sizeof(bd_t)); /* Initialize */ - init_IRQ(); + irq_init(); env_init(); /* initialize environment */ init_baudrate(); /* initialze baudrate settings */ serial_init(); /* serial communications setup */ @@ -304,7 +277,7 @@ void board_init_f(ulong bootflag) get_vco() / 1000000, get_cclk() / 1000000, get_sclk() / 1000000); printf("SDRAM: "); print_size(initdram(0), "\n"); -#if defined(CONFIG_BF537)&&defined(CONFIG_POST) +#if defined(CONFIG_POST) post_init_f(); post_bootmode_init(); post_run(NULL, POST_ROM | post_bootmode_get(0)); @@ -333,12 +306,12 @@ void board_init_r(gd_t * id, ulong dest_addr) gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ bd = gd->bd; -#if defined(CONFIG_BF537) && defined(CONFIG_POST) +#if defined(CONFIG_POST) post_output_backlog(); post_reloc(); #endif -#if (CONFIG_STAMP || CONFIG_BF537 || CONFIG_EZKIT561) && !defined(CFG_NO_FLASH) +#if !defined(CFG_NO_FLASH) /* There are some other pointer constants we must deal with */ /* configure available FLASH banks */ size = flash_init(); @@ -434,7 +407,7 @@ void board_init_r(gd_t * id, ulong dest_addr) display_global_data(); #endif -#if defined(CONFIG_BF537) && defined(CONFIG_POST) +#if defined(CONFIG_POST) if (post_flag) post_run(NULL, POST_RAM | post_bootmode_get(0)); #endif diff --git a/lib_blackfin/bootm.c b/lib_blackfin/bootm.c index 1ea80f4..bea11ed 100644 --- a/lib_blackfin/bootm.c +++ b/lib_blackfin/bootm.c @@ -1,52 +1,39 @@ /* - * U-boot - bf533_linux.c + * U-boot - bootm.c - misc boot helper functions * - * Copyright (c) 2005-2007 Analog Devices Inc. + * Copyright (c) 2005-2008 Analog Devices Inc. * * (C) Copyright 2000-2004 * 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., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ -/* Dummy functions, currently not in Use */ - #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> -#include <asm/byteorder.h> +#include <asm/blackfin.h> -#define LINUX_MAX_ENVS 256 -#define LINUX_MAX_ARGS 256 - -#define CMD_LINE_ADDR 0xFF900000 /* L1 scratchpad */ +extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); #ifdef SHARED_RESOURCES extern void swap_to(int device_id); #endif -extern void flush_instruction_cache(void); -extern void flush_data_cache(void); -static char *make_command_line(void); +static char *make_command_line(void) +{ + char *dest = (char *)CMD_LINE_ADDR; + char *bootargs = getenv("bootargs"); + + if (bootargs == NULL) + return NULL; + + strncpy(dest, bootargs, 0x1000); + dest[0xfff] = 0; + return dest; +} -void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], +void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], bootm_headers_t *images) { int (*appl) (char *cmdline); @@ -54,7 +41,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], ulong ep = 0; if (!images->autostart) - return ; + return; #ifdef SHARED_RESOURCES swap_to(FLASH); @@ -80,33 +67,13 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], printf("Starting Kernel at = %x\n", appl); cmdline = make_command_line(); - if (icache_status()) { - flush_instruction_cache(); - icache_disable(); - } - if (dcache_status()) { - flush_data_cache(); - dcache_disable(); - } + icache_disable(); + dcache_disable(); (*appl) (cmdline); /* does not return */ return; -error: + error: if (images->autostart) do_reset (cmdtp, flag, argc, argv); - return; -} - -char *make_command_line(void) -{ - char *dest = (char *)CMD_LINE_ADDR; - char *bootargs; - - if ((bootargs = getenv("bootargs")) == NULL) - return NULL; - - strncpy(dest, bootargs, 0x1000); - dest[0xfff] = 0; - return dest; } diff --git a/lib_blackfin/string.c b/lib_blackfin/string.c new file mode 100644 index 0000000..6887c93 --- /dev/null +++ b/lib_blackfin/string.c @@ -0,0 +1,203 @@ +/* + * U-boot - string.c Contains library routines. + * + * Copyright (c) 2005-2007 Analog Devices Inc. + * + * (C) Copyright 2000-2004 + * 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., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include <common.h> +#include <config.h> +#include <asm/blackfin.h> +#include <asm/io.h> +#include <asm/mach-common/bits/dma.h> + +char *strcpy(char *dest, const char *src) +{ + char *xdest = dest; + char temp = 0; + + __asm__ __volatile__ ( + "1:\t%2 = B [%1++] (Z);\n\t" + "B [%0++] = %2;\n\t" + "CC = %2;\n\t" + "if cc jump 1b (bp);\n" + : "=a"(dest), "=a"(src), "=d"(temp) + : "0"(dest), "1"(src), "2"(temp) + : "memory"); + + return xdest; +} + +char *strncpy(char *dest, const char *src, size_t n) +{ + char *xdest = dest; + char temp = 0; + + if (n == 0) + return xdest; + + __asm__ __volatile__ ( + "1:\t%3 = B [%1++] (Z);\n\t" + "B [%0++] = %3;\n\t" + "CC = %3;\n\t" + "if ! cc jump 2f;\n\t" + "%2 += -1;\n\t" + "CC = %2 == 0;\n\t" + "if ! cc jump 1b (bp);\n" + "2:\n" + : "=a"(dest), "=a"(src), "=da"(n), "=d"(temp) + : "0"(dest), "1"(src), "2"(n), "3"(temp) + : "memory"); + + return xdest; +} + +int strcmp(const char *cs, const char *ct) +{ + char __res1, __res2; + + __asm__ ( + "1:\t%2 = B[%0++] (Z);\n\t" /* get *cs */ + "%3 = B[%1++] (Z);\n\t" /* get *ct */ + "CC = %2 == %3;\n\t" /* compare a byte */ + "if ! cc jump 2f;\n\t" /* not equal, break out */ + "CC = %2;\n\t" /* at end of cs? */ + "if cc jump 1b (bp);\n\t" /* no, keep going */ + "jump.s 3f;\n" /* strings are equal */ + "2:\t%2 = %2 - %3;\n" /* *cs - *ct */ + "3:\n" + : "=a"(cs), "=a"(ct), "=d"(__res1), "=d"(__res2) + : "0"(cs), "1"(ct)); + + return __res1; +} + +int strncmp(const char *cs, const char *ct, size_t count) +{ + char __res1, __res2; + + if (!count) + return 0; + + __asm__( + "1:\t%3 = B[%0++] (Z);\n\t" /* get *cs */ + "%4 = B[%1++] (Z);\n\t" /* get *ct */ + "CC = %3 == %4;\n\t" /* compare a byte */ + "if ! cc jump 3f;\n\t" /* not equal, break out */ + "CC = %3;\n\t" /* at end of cs? */ + "if ! cc jump 4f;\n\t" /* yes, all done */ + "%2 += -1;\n\t" /* no, adjust count */ + "CC = %2 == 0;\n\t" "if ! cc jump 1b;\n" /* more to do, keep going */ + "2:\t%3 = 0;\n\t" /* strings are equal */ + "jump.s 4f;\n" "3:\t%3 = %3 - %4;\n" /* *cs - *ct */ + "4:" + : "=a"(cs), "=a"(ct), "=da"(count), "=d"(__res1), "=d"(__res2) + : "0"(cs), "1"(ct), "2"(count)); + + return __res1; +} + +#ifdef bfin_write_MDMA1_D0_IRQ_STATUS +# define bfin_write_MDMA_D0_IRQ_STATUS bfin_write_MDMA1_D0_IRQ_STATUS +# define bfin_write_MDMA_D0_START_ADDR bfin_write_MDMA1_D0_START_ADDR +# define bfin_write_MDMA_D0_X_COUNT bfin_write_MDMA1_D0_X_COUNT +# define bfin_write_MDMA_D0_X_MODIFY bfin_write_MDMA1_D0_X_MODIFY +# define bfin_write_MDMA_D0_CONFIG bfin_write_MDMA1_D0_CONFIG +# define bfin_write_MDMA_S0_START_ADDR bfin_write_MDMA1_S0_START_ADDR +# define bfin_write_MDMA_S0_X_COUNT bfin_write_MDMA1_S0_X_COUNT +# define bfin_write_MDMA_S0_X_MODIFY bfin_write_MDMA1_S0_X_MODIFY +# define bfin_write_MDMA_S0_CONFIG bfin_write_MDMA1_S0_CONFIG +# define bfin_write_MDMA_D0_IRQ_STATUS bfin_write_MDMA1_D0_IRQ_STATUS +# define bfin_read_MDMA_D0_IRQ_STATUS bfin_read_MDMA1_D0_IRQ_STATUS +#endif +static void *dma_memcpy(void *dst, const void *src, size_t count) +{ + if (dcache_status()) + blackfin_dcache_flush_range(src, src + count); + + bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR); + + /* Copy sram functions from sdram to sram */ + /* Setup destination start address */ + bfin_write_MDMA_D0_START_ADDR(dst); + /* Setup destination xcount */ + bfin_write_MDMA_D0_X_COUNT(count); + /* Setup destination xmodify */ + bfin_write_MDMA_D0_X_MODIFY(1); + + /* Setup Source start address */ + bfin_write_MDMA_S0_START_ADDR(src); + /* Setup Source xcount */ + bfin_write_MDMA_S0_X_COUNT(count); + /* Setup Source xmodify */ + bfin_write_MDMA_S0_X_MODIFY(1); + + /* Enable source DMA */ + bfin_write_MDMA_S0_CONFIG(DMAEN); + SSYNC(); + + bfin_write_MDMA_D0_CONFIG(WNR | DMAEN); + + while (bfin_read_MDMA_D0_IRQ_STATUS() & DMA_RUN) + bfin_write_MDMA_D0_IRQ_STATUS(bfin_read_MDMA_D0_IRQ_STATUS() | DMA_DONE | DMA_ERR); + bfin_write_MDMA_D0_IRQ_STATUS(bfin_read_MDMA_D0_IRQ_STATUS() | DMA_DONE | DMA_ERR); + + if (icache_status()) + blackfin_icache_flush_range(dst, dst + count); + + if (dcache_status()) + blackfin_dcache_invalidate_range(dst, dst + count); + + return dst; +} + +/* + * memcpy - Copy one area of memory to another + * @dest: Where to copy to + * @src: Where to copy from + * @count: The size of the area. + * + * We need to have this wrapper in memcpy() as common code may call memcpy() + * to load up L1 regions. Consider loading an ELF which has sections with + * LMA's pointing to L1. The common code ELF loader will simply use memcpy() + * to move the ELF's sections into the right place. We need to catch that + * here and redirect to dma_memcpy(). + */ +extern void *memcpy_ASM(void *dst, const void *src, size_t count); +void *memcpy(void *dst, const void *src, size_t count) +{ + if (!count) + return dst; + + if (addr_bfin_on_chip_mem(dst)) { + /* L1 is the destination */ + return dma_memcpy(dst, src, count); + + } else if (addr_bfin_on_chip_mem(src)) { + /* L1 is the source */ + return dma_memcpy(dst, src, count); + + } else + /* No L1 is involved, so just call regular memcpy */ + return memcpy_ASM(dst, src, count); +} |