diff options
Diffstat (limited to 'arch/blackfin')
34 files changed, 44 insertions, 44 deletions
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 6199fed6f3..dbb90814f9 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -13,7 +13,7 @@ CFLAGS += -D__blackfin__ KALLSYMS += --symbol-prefix=_ ifndef CONFIG_BFIN_BOOT_BYPASS -all: uboot.ldr +all: barebox.ldr endif archprepare: maketools @@ -36,7 +36,7 @@ endif common-y += $(BOARD) common-y += arch/blackfin/lib/ $(CPU) -lds-y += $(BOARD)/u-boot.lds +lds-y += $(BOARD)/barebox.lds ifdef CONFIG_BFIN_BOOT_FLASH16 FLASHBITS :=-B 16 @@ -46,7 +46,7 @@ endif ifneq ($(cpu-y),) ifndef CONFIG_BFIN_BOOT_BYPASS -uboot.ldr: uboot +barebox.ldr: barebox rm -f $@ $(CROSS_COMPILE)ldr -T $(cpu-y) -c $(FLASHBITS) -i $(CPU)/init_sdram.o $@ $< endif diff --git a/arch/blackfin/configs/ipe337_defconfig b/arch/blackfin/configs/ipe337_defconfig index 447270453b..16bf2c2852 100644 --- a/arch/blackfin/configs/ipe337_defconfig +++ b/arch/blackfin/configs/ipe337_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc5-git +# barebox version: 2.0.0-rc5-git # Thu Jul 3 10:25:25 2008 # CONFIG_BLACKFIN=y @@ -35,7 +35,7 @@ CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x400000 # CONFIG_BROKEN is not set # CONFIG_EXPERIMENTAL is not set -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_CMDLINE_EDITING=y # CONFIG_AUTO_COMPLETE is not set diff --git a/arch/blackfin/cpu-bf561/start.S b/arch/blackfin/cpu-bf561/start.S index 81efff09b6..434536248c 100644 --- a/arch/blackfin/cpu-bf561/start.S +++ b/arch/blackfin/cpu-bf561/start.S @@ -1,5 +1,5 @@ /* - * U-boot - start.S Startup file of u-boot for BF533/BF561 + * barebox - start.S Startup file of barebox for BF533/BF561 * * Copyright (c) 2005 blackfin.uclinux.org * @@ -333,8 +333,8 @@ _clear_bss_skip: [p0] = r0; #endif - p0.l = _start_uboot; - p0.h = _start_uboot; + p0.l = _start_barebox; + p0.h = _start_barebox; jump (p0); reset_start: diff --git a/arch/blackfin/include/asm/u-boot.h b/arch/blackfin/include/asm/barebox.h index ec39338039..2fcf31ce93 100644 --- a/arch/blackfin/include/asm/u-boot.h +++ b/arch/blackfin/include/asm/barebox.h @@ -1,5 +1,5 @@ /* - * U-boot - u-boot.h Structure declarations for board specific data + * barebox - barebox.h Structure declarations for board specific data * * Copyright (c) 2005 blackfin.uclinux.org * @@ -25,8 +25,8 @@ * MA 02111-1307 USA */ -#ifndef _U_BOOT_H_ -#define _U_BOOT_H_ 1 +#ifndef _BAREBOX_H_ +#define _BAREBOX_H_ 1 typedef struct bd_info { int bi_baudrate; /* serial console baudrate */ @@ -44,4 +44,4 @@ typedef struct bd_info { #define bi_env_data bi_env->data #define bi_env_crc bi_env->crc -#endif /* _U_BOOT_H_ */ +#endif /* _BAREBOX_H_ */ diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h index 39410de4e6..cdcb2f8e5d 100644 --- a/arch/blackfin/include/asm/bitops.h +++ b/arch/blackfin/include/asm/bitops.h @@ -1,5 +1,5 @@ /* - * U-boot - bitops.h Routines for bit operations + * barebox - bitops.h Routines for bit operations * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/blackfin.h b/arch/blackfin/include/asm/blackfin.h index f2d1e65be7..8349d207db 100644 --- a/arch/blackfin/include/asm/blackfin.h +++ b/arch/blackfin/include/asm/blackfin.h @@ -1,5 +1,5 @@ /* - * U-boot - blackfin.h + * barebox - blackfin.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/blackfin_defs.h b/arch/blackfin/include/asm/blackfin_defs.h index 2190215971..5d0b5094b4 100644 --- a/arch/blackfin/include/asm/blackfin_defs.h +++ b/arch/blackfin/include/asm/blackfin_defs.h @@ -1,5 +1,5 @@ /* - * U-boot - blackfin_defs.h + * barebox - blackfin_defs.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/byteorder.h b/arch/blackfin/include/asm/byteorder.h index 3b4df4e134..1ba7a51d19 100644 --- a/arch/blackfin/include/asm/byteorder.h +++ b/arch/blackfin/include/asm/byteorder.h @@ -1,5 +1,5 @@ /* - * U-boot - byteorder.h + * barebox - byteorder.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/cpu.h b/arch/blackfin/include/asm/cpu.h index 586e3cf181..a7c86642d8 100644 --- a/arch/blackfin/include/asm/cpu.h +++ b/arch/blackfin/include/asm/cpu.h @@ -1,6 +1,6 @@ /* - * U-boot - cpu.h + * barebox - cpu.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/current.h b/arch/blackfin/include/asm/current.h index 108c2792a0..f8bb7bbe32 100644 --- a/arch/blackfin/include/asm/current.h +++ b/arch/blackfin/include/asm/current.h @@ -1,5 +1,5 @@ /* - * U-boot - current.h + * barebox - current.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/entry.h b/arch/blackfin/include/asm/entry.h index f031c86d76..eadef45825 100644 --- a/arch/blackfin/include/asm/entry.h +++ b/arch/blackfin/include/asm/entry.h @@ -1,5 +1,5 @@ /* - * U-boot - entry.h Routines for context saving and restoring + * barebox - entry.h Routines for context saving and restoring * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/hw_irq.h b/arch/blackfin/include/asm/hw_irq.h index 690b6f3030..cd20832883 100644 --- a/arch/blackfin/include/asm/hw_irq.h +++ b/arch/blackfin/include/asm/hw_irq.h @@ -1,5 +1,5 @@ /* - * U-boot - hw_irq.h + * barebox - hw_irq.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/io.h b/arch/blackfin/include/asm/io.h index 0a8551218a..8a24dd642a 100644 --- a/arch/blackfin/include/asm/io.h +++ b/arch/blackfin/include/asm/io.h @@ -1,5 +1,5 @@ /* - * U-boot - io.h IO routines + * barebox - io.h IO routines * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/linkage.h b/arch/blackfin/include/asm/linkage.h index 7a3166037c..5fb1db4000 100644 --- a/arch/blackfin/include/asm/linkage.h +++ b/arch/blackfin/include/asm/linkage.h @@ -1,5 +1,5 @@ /* - * U-boot - linkage.h + * barebox - linkage.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/mem_init.h b/arch/blackfin/include/asm/mem_init.h index 1a13d908e0..8b0f30df5a 100644 --- a/arch/blackfin/include/asm/mem_init.h +++ b/arch/blackfin/include/asm/mem_init.h @@ -1,5 +1,5 @@ /* - * U-boot - mem_init.h Header file for memory initialization + * barebox - mem_init.h Header file for memory initialization * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/page.h b/arch/blackfin/include/asm/page.h index bf90cd56c6..b51e6d1c46 100644 --- a/arch/blackfin/include/asm/page.h +++ b/arch/blackfin/include/asm/page.h @@ -1,5 +1,5 @@ /* - * U-boot - page.h + * barebox - page.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/page_offset.h b/arch/blackfin/include/asm/page_offset.h index 1b9ee01982..72fb6fa3d3 100644 --- a/arch/blackfin/include/asm/page_offset.h +++ b/arch/blackfin/include/asm/page_offset.h @@ -1,5 +1,5 @@ /* - * U-boot - page_offset.h + * barebox - page_offset.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/posix_types.h b/arch/blackfin/include/asm/posix_types.h index f1f2b5ffc2..98397ca5f7 100644 --- a/arch/blackfin/include/asm/posix_types.h +++ b/arch/blackfin/include/asm/posix_types.h @@ -1,5 +1,5 @@ /* - * U-boot - posix_types.h + * barebox - posix_types.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/processor.h b/arch/blackfin/include/asm/processor.h index 7095e95626..a5acd08654 100644 --- a/arch/blackfin/include/asm/processor.h +++ b/arch/blackfin/include/asm/processor.h @@ -1,5 +1,5 @@ /* - * U-boot - processor.h + * barebox - processor.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/ptrace.h b/arch/blackfin/include/asm/ptrace.h index afd57773ac..a2f53c9eb0 100644 --- a/arch/blackfin/include/asm/ptrace.h +++ b/arch/blackfin/include/asm/ptrace.h @@ -1,5 +1,5 @@ /* - * U-boot - ptrace.h + * barebox - ptrace.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/segment.h b/arch/blackfin/include/asm/segment.h index 9e6d817fc7..fd47cf647a 100644 --- a/arch/blackfin/include/asm/segment.h +++ b/arch/blackfin/include/asm/segment.h @@ -1,5 +1,5 @@ /* - * U-boot - segment.h + * barebox - segment.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/setup.h b/arch/blackfin/include/asm/setup.h index 440aaf9d9c..99e4850cc2 100644 --- a/arch/blackfin/include/asm/setup.h +++ b/arch/blackfin/include/asm/setup.h @@ -1,5 +1,5 @@ /* - * U-boot - setup.h + * barebox - setup.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/string.h b/arch/blackfin/include/asm/string.h index 883009ae0d..5141a5c6f1 100644 --- a/arch/blackfin/include/asm/string.h +++ b/arch/blackfin/include/asm/string.h @@ -1,5 +1,5 @@ /* - * U-boot - string.h String functions + * barebox - string.h String functions * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/system.h b/arch/blackfin/include/asm/system.h index d84b6365bc..59a381e495 100644 --- a/arch/blackfin/include/asm/system.h +++ b/arch/blackfin/include/asm/system.h @@ -1,5 +1,5 @@ /* - * U-boot - system.h + * barebox - system.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/traps.h b/arch/blackfin/include/asm/traps.h index b1dde4aba4..893233f2df 100644 --- a/arch/blackfin/include/asm/traps.h +++ b/arch/blackfin/include/asm/traps.h @@ -1,5 +1,5 @@ /* - * U-boot - traps.h + * barebox - traps.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/include/asm/types.h b/arch/blackfin/include/asm/types.h index 6058908e25..e548f63165 100644 --- a/arch/blackfin/include/asm/types.h +++ b/arch/blackfin/include/asm/types.h @@ -1,5 +1,5 @@ /* - * U-boot - types.h + * barebox - types.h * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/lib/bf533_string.c b/arch/blackfin/lib/bf533_string.c index c8b1a3a983..752055696d 100644 --- a/arch/blackfin/lib/bf533_string.c +++ b/arch/blackfin/lib/bf533_string.c @@ -1,5 +1,5 @@ /* - * U-boot - bf533_string.c Contains library routines. + * barebox - bf533_string.c Contains library routines. * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/lib/blackfin_linux.c b/arch/blackfin/lib/blackfin_linux.c index fdd0091e95..ce5f3a54c2 100644 --- a/arch/blackfin/lib/blackfin_linux.c +++ b/arch/blackfin/lib/blackfin_linux.c @@ -1,5 +1,5 @@ /* - * U-boot - blackfin_linux.c + * barebox - blackfin_linux.c * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index f8451cdbf8..9853ed2ce1 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -1,5 +1,5 @@ /* - * U-boot - board.c First C file to be called contains init routines + * barebox - board.c First C file to be called contains init routines * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/lib/cpu.c b/arch/blackfin/lib/cpu.c index 41a6ad4334..e81fa9a6d0 100644 --- a/arch/blackfin/lib/cpu.c +++ b/arch/blackfin/lib/cpu.c @@ -1,5 +1,5 @@ /* - * U-boot - cpu.c CPU specific functions + * barebox - cpu.c CPU specific functions * * Copyright (c) 2005 blackfin.uclinux.org * @@ -71,9 +71,9 @@ void icache_enable(void) I0 = (unsigned int *)ICPLB_ADDR0; I1 = (unsigned int *)ICPLB_DATA0; - /* We only setup instruction caching for U-Boot itself. + /* We only setup instruction caching for barebox itself. * This has the nice side effect that we trigger an - * exception when U-Boot goes crazy. + * exception when barebox goes crazy. */ *I0++ = TEXT_BASE & ~((1 << 20) - 1); *I1++ = PAGE_SIZE_1MB | CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | CPLB_LOCK; diff --git a/arch/blackfin/lib/interrupt.S b/arch/blackfin/lib/interrupt.S index 820a33cc7d..82ea53d2dd 100644 --- a/arch/blackfin/lib/interrupt.S +++ b/arch/blackfin/lib/interrupt.S @@ -1,5 +1,5 @@ /* - * U-boot - interrupt.S Processing of interrupts and exception handling + * barebox - interrupt.S Processing of interrupts and exception handling * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/lib/muldi3.c b/arch/blackfin/lib/muldi3.c index 3924fd9d23..594878c190 100644 --- a/arch/blackfin/lib/muldi3.c +++ b/arch/blackfin/lib/muldi3.c @@ -1,5 +1,5 @@ /* - * U-boot - muldi3.c contains routines for mult and div + * barebox - muldi3.c contains routines for mult and div * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/lib/traps.c b/arch/blackfin/lib/traps.c index fcda7861a3..ce479b9d1b 100644 --- a/arch/blackfin/lib/traps.c +++ b/arch/blackfin/lib/traps.c @@ -1,5 +1,5 @@ /* - * U-boot - traps.c Routines related to interrupts and exceptions + * barebox - traps.c Routines related to interrupts and exceptions * * Copyright (c) 2005 blackfin.uclinux.org * diff --git a/arch/blackfin/mach-bf.dox b/arch/blackfin/mach-bf.dox index d40595779f..4b3a3c12ea 100644 --- a/arch/blackfin/mach-bf.dox +++ b/arch/blackfin/mach-bf.dox @@ -1,5 +1,5 @@ /* This document is intended to provide the developer with information - * how to integrate a new CPU (MACH) into this part of the U-Boot tree + * how to integrate a new CPU (MACH) into this part of the barebox tree */ /** @page dev_bf_mach Blackfin based CPU (MACH) into the tree |