diff options
Diffstat (limited to 'arch/arm')
50 files changed, 132 insertions, 132 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a4b6c9eccf..8a8323ffe0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -57,9 +57,9 @@ source arch/arm/mach-omap/Kconfig source arch/arm/mach-s3c24xx/Kconfig config AEABI - bool "Use the ARM EABI to compile u-boot" + bool "Use the ARM EABI to compile barebox" help - This option allows for u-boot to be compiled using the latest + This option allows for barebox to be compiled using the latest ARM ABI (aka EABI). To use this you need GCC version 4.0.0 or later. diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 4f8421737e..47b002f9d9 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -82,11 +82,11 @@ CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P ifndef CONFIG_MODULES # Add cleanup flags CPPFLAGS += -fdata-sections -ffunction-sections -LDFLAGS_uboot += -static --gc-sections +LDFLAGS_barebox += -static --gc-sections endif -uboot.netx: uboot.bin - $(Q)scripts/gen_netx_image -i uboot.bin -o uboot.netx \ +barebox.netx: barebox.bin + $(Q)scripts/gen_netx_image -i barebox.bin -o barebox.netx \ --sdramctrl=$(CONFIG_NETX_SDRAM_CTRL) \ --sdramtimctrl=$(CONFIG_NETX_SDRAM_TIMING_CTRL) \ --memctrl=$(CONFIG_NETX_MEM_CTRL) \ @@ -94,7 +94,7 @@ uboot.netx: uboot.bin --cookie=$(CONFIG_NETX_COOKIE); ifeq ($(machine-y),netx) -KBUILD_IMAGE := uboot.netx +KBUILD_IMAGE := barebox.netx endif all: $(KBUILD_IMAGE) @@ -120,7 +120,7 @@ endif common-y += $(BOARD) $(MACH) common-y += arch/arm/lib/ arch/arm/cpu/ -lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/arm/lib/u-boot.lds -lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/u-boot.lds +lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/arm/lib/barebox.lds +lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/barebox.lds -CLEAN_FILES += arch/arm/include/asm/mach-types.h arch/arm/lib/u-boot.lds +CLEAN_FILES += arch/arm/include/asm/mach-types.h arch/arm/lib/barebox.lds diff --git a/arch/arm/configs/a9m2410_defconfig b/arch/arm/configs/a9m2410_defconfig index e973a30684..5cd1ac2ac0 100644 --- a/arch/arm/configs/a9m2410_defconfig +++ b/arch/arm/configs/a9m2410_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc9 +# barebox version: 2.0.0-rc9 # Wed Jul 1 14:15:55 2009 # CONFIG_ARCH_TEXT_BASE=0x31fc0000 @@ -75,7 +75,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_KALLSYMS is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=38400 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/a9m2440_defconfig b/arch/arm/configs/a9m2440_defconfig index 5e49aab316..f77bb70ccc 100644 --- a/arch/arm/configs/a9m2440_defconfig +++ b/arch/arm/configs/a9m2440_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc9 +# barebox version: 2.0.0-rc9 # Wed Jul 1 14:23:41 2009 # CONFIG_ARCH_TEXT_BASE=0x31fc0000 @@ -75,7 +75,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_KALLSYMS is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=38400 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig index f198e5a409..258b82eea9 100644 --- a/arch/arm/configs/at91sam9260ek_defconfig +++ b/arch/arm/configs/at91sam9260ek_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 # Tue Oct 21 18:24:32 2008 # CONFIG_ARCH_TEXT_BASE=0x23f00000 @@ -51,7 +51,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_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig index b1f8b30390..c81371d57d 100644 --- a/arch/arm/configs/at91sam9263ek_defconfig +++ b/arch/arm/configs/at91sam9263ek_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc10 +# barebox version: 2.0.0-rc10 # Sat Sep 26 18:45:28 2009 # CONFIG_ARCH_TEXT_BASE=0x23f00000 diff --git a/arch/arm/configs/eukrea_cpuimx27_defconfig b/arch/arm/configs/eukrea_cpuimx27_defconfig index c54c340028..0e15bc56e8 100644 --- a/arch/arm/configs/eukrea_cpuimx27_defconfig +++ b/arch/arm/configs/eukrea_cpuimx27_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc10 +# barebox version: 2.0.0-rc10 # Thu Oct 22 16:38:29 2009 # CONFIG_ARCH_TEXT_BASE=0xa0000000 @@ -84,7 +84,7 @@ CONFIG_MALLOC_SIZE=0x400000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/freescale_mx25_3stack_defconfig b/arch/arm/configs/freescale_mx25_3stack_defconfig index 62ec009d91..d9cefd417a 100644 --- a/arch/arm/configs/freescale_mx25_3stack_defconfig +++ b/arch/arm/configs/freescale_mx25_3stack_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc8 +# barebox version: 2.0.0-rc8 # Wed Apr 8 13:06:07 2009 # CONFIG_ARCH_TEXT_BASE=0x87f00000 @@ -67,7 +67,7 @@ CONFIG_MALLOC_SIZE=0x400000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 # CONFIG_LONGHELP is not set CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/freescale_mx35_3stack_defconfig b/arch/arm/configs/freescale_mx35_3stack_defconfig index 6dbea506e0..d48adf5ecf 100644 --- a/arch/arm/configs/freescale_mx35_3stack_defconfig +++ b/arch/arm/configs/freescale_mx35_3stack_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc7 +# barebox version: 2.0.0-rc7 # Mon Feb 2 16:43:49 2009 # CONFIG_ARCH_TEXT_BASE=0x87f00000 @@ -64,7 +64,7 @@ CONFIG_MALLOC_SIZE=0x400000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/mmccpu_defconfig b/arch/arm/configs/mmccpu_defconfig index af6e3cd4de..bc9bd6ac9a 100644 --- a/arch/arm/configs/mmccpu_defconfig +++ b/arch/arm/configs/mmccpu_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc8 +# barebox version: 2.0.0-rc8 # Tue May 19 09:44:44 2009 # CONFIG_ARCH_TEXT_BASE=0x23f00000 @@ -67,7 +67,7 @@ CONFIG_MALLOC_SIZE=0x400000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/mx21ads_defconfig b/arch/arm/configs/mx21ads_defconfig index 8c1a77ed12..6589ca8dba 100644 --- a/arch/arm/configs/mx21ads_defconfig +++ b/arch/arm/configs/mx21ads_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc8 +# barebox version: 2.0.0-rc8 # Tue Apr 28 08:40:15 2009 # CONFIG_ARCH_TEXT_BASE=0xc0000000 @@ -67,7 +67,7 @@ CONFIG_MALLOC_SIZE=0x400000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/mx27ads_defconfig b/arch/arm/configs/mx27ads_defconfig index 79f6e9fbf1..d40fbd2fb8 100644 --- a/arch/arm/configs/mx27ads_defconfig +++ b/arch/arm/configs/mx27ads_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 Aug 21 16:59:40 2008 # CONFIG_ARCH_TEXT_BASE=0xa0000000 @@ -53,7 +53,7 @@ CONFIG_MALLOC_SIZE=0x400000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/netx_nxdb500_defconfig b/arch/arm/configs/netx_nxdb500_defconfig index b84f6a39cc..531533307d 100644 --- a/arch/arm/configs/netx_nxdb500_defconfig +++ b/arch/arm/configs/netx_nxdb500_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 09:34:20 2008 # CONFIG_ARCH_TEXT_BASE=0x81f00000 @@ -55,7 +55,7 @@ CONFIG_BROKEN=y # CONFIG_KALLSYMS is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y diff --git a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig index 0c6d398508..81bd0c1017 100644 --- a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig +++ b/arch/arm/configs/omap3430_sdp3430_per_uart_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 # Wed Jun 4 13:18:29 2008 # CONFIG_ARCH_TEXT_BASE=0x80e80000 diff --git a/arch/arm/configs/omap3530_beagle_per_uart_defconfig b/arch/arm/configs/omap3530_beagle_per_uart_defconfig index f72b10c543..10e2a05a02 100644 --- a/arch/arm/configs/omap3530_beagle_per_uart_defconfig +++ b/arch/arm/configs/omap3530_beagle_per_uart_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 # Tue Jun 24 02:22:41 2008 # CONFIG_ARCH_TEXT_BASE=0x80e80000 diff --git a/arch/arm/configs/pca100_defconfig b/arch/arm/configs/pca100_defconfig index 25ca7ed2fe..7ae2065d71 100644 --- a/arch/arm/configs/pca100_defconfig +++ b/arch/arm/configs/pca100_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc9 +# barebox version: 2.0.0-rc9 # CONFIG_ARCH_TEXT_BASE=0xa7f00000 CONFIG_BOARDINFO="Phytec phyCard-i.MX27" @@ -68,7 +68,7 @@ CONFIG_MALLOC_SIZE=0x500000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/pcm037_defconfig b/arch/arm/configs/pcm037_defconfig index c35d7aa661..b4fb2d9948 100644 --- a/arch/arm/configs/pcm037_defconfig +++ b/arch/arm/configs/pcm037_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 09:29:45 2008 # CONFIG_ARCH_TEXT_BASE=0x87f00000 @@ -48,7 +48,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=y diff --git a/arch/arm/configs/pcm038_defconfig b/arch/arm/configs/pcm038_defconfig index 88183d5197..0c9ac5fef2 100644 --- a/arch/arm/configs/pcm038_defconfig +++ b/arch/arm/configs/pcm038_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc10 +# barebox version: 2.0.0-rc10 # Wed Dec 9 17:03:10 2009 # # CONFIG_BOARD_LINKER_SCRIPT is not set @@ -91,7 +91,7 @@ CONFIG_MALLOC_SIZE=0x1000000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/pcm043_defconfig b/arch/arm/configs/pcm043_defconfig index 0367929006..c4df354705 100644 --- a/arch/arm/configs/pcm043_defconfig +++ b/arch/arm/configs/pcm043_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc8 +# barebox version: 2.0.0-rc8 # Fri Apr 17 13:27:24 2009 # CONFIG_ARCH_TEXT_BASE=0x87f00000 @@ -67,7 +67,7 @@ CONFIG_MALLOC_SIZE=0x400000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/pm9263_defconfig b/arch/arm/configs/pm9263_defconfig index 9c9a0b7639..18543453c6 100644 --- a/arch/arm/configs/pm9263_defconfig +++ b/arch/arm/configs/pm9263_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 # Tue Aug 26 09:41:29 2008 # CONFIG_ARCH_TEXT_BASE=0x23f00000 @@ -52,7 +52,7 @@ CONFIG_MALLOC_SIZE=0x400000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 diff --git a/arch/arm/configs/scb9328_defconfig b/arch/arm/configs/scb9328_defconfig index 71a53a7b29..d3d723f554 100644 --- a/arch/arm/configs/scb9328_defconfig +++ b/arch/arm/configs/scb9328_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# U-Boot version: 2.0.0-git +# barebox version: 2.0.0-git # Fri Oct 19 11:00:09 2007 # CONFIG_ARCH_TEXT_BASE=0x08f80000 @@ -34,7 +34,7 @@ CONFIG_HAS_MODULES=y CONFIG_TEXT_BASE=0x08f80000 # 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/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c index 154f8cc46d..501e9b99e7 100644 --- a/arch/arm/cpu/cpu.c +++ b/arch/arm/cpu/cpu.c @@ -135,14 +135,14 @@ int icache_status (void) * Prepare a "clean" CPU for Linux to run * @return 0 (always) * - * This function is called by the generic U-Boot part just before we call + * This function is called by the generic barebox part just before we call * Linux. It prepares the processor for Linux. */ int cleanup_before_linux (void) { int i; - shutdown_uboot(); + shutdown_barebox(); #ifdef CONFIG_MMU mmu_disable(); @@ -158,7 +158,7 @@ int cleanup_before_linux (void) * * For ARM we never enable data cache so we do not need to disable it again. * Linux can be called with instruction cache enabled. As this is the - * default setting we are running in U-Boot, there's no special preparation + * default setting we are running in barebox, there's no special preparation * required. */ @@ -180,8 +180,8 @@ static int do_icache(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_icache_help[] = "Usage: icache [0|1]\n"; -U_BOOT_CMD_START(icache) +BAREBOX_CMD_START(icache) .cmd = do_icache, .usage = "show/change icache status", - U_BOOT_CMD_HELP(cmd_icache_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_icache_help) +BAREBOX_CMD_END diff --git a/arch/arm/cpu/cpuinfo.c b/arch/arm/cpu/cpuinfo.c index b990cadee5..e7bcda9783 100644 --- a/arch/arm/cpu/cpuinfo.c +++ b/arch/arm/cpu/cpuinfo.c @@ -129,8 +129,8 @@ static int do_cpuinfo(cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(cpuinfo) +BAREBOX_CMD_START(cpuinfo) .cmd = do_cpuinfo, .usage = "Show info about CPU", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/arch/arm/cpu/start-arm.S b/arch/arm/cpu/start-arm.S index 8ad03e410a..43bc5dddda 100644 --- a/arch/arm/cpu/start-arm.S +++ b/arch/arm/cpu/start-arm.S @@ -83,8 +83,8 @@ _fiq: .word fiq /* * These are defined in the board-specific linker script. */ -.globl _u_boot_start -_u_boot_start: +.globl _barebox_start +_barebox_start: .word _start .globl _bss_start @@ -210,13 +210,13 @@ finished_inval: bl board_init_lowlevel #endif -relocate: /* relocate U-Boot to RAM */ +relocate: /* relocate barebox to RAM */ adr r0, _start /* r0 <- current position of code */ ldr r1, _TEXT_BASE /* test if we run from flash or RAM */ cmp r0, r1 /* don't reloc during debug */ beq stack_setup - ldr r2, _u_boot_start + ldr r2, _barebox_start ldr r3, _bss_start sub r2, r3, r2 /* r2 <- size of armboot */ add r2, r0, r2 /* r2 <- source end address */ @@ -246,4 +246,4 @@ clbss_l: ldr pc, _start_armboot _start_armboot: - .word start_uboot + .word start_barebox diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/barebox-arm.h index 539135add0..6a00d10d1d 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -26,8 +26,8 @@ * MA 02111-1307 USA */ -#ifndef _U_BOOT_ARM_H_ -#define _U_BOOT_ARM_H_ 1 +#ifndef _BAREBOX_ARM_H_ +#define _BAREBOX_ARM_H_ 1 /* for the following variables, see start.S */ extern ulong _armboot_start; /* code start */ @@ -41,4 +41,4 @@ int cleanup_before_linux(void); int board_init(void); int dram_init (void); -#endif /* _U_BOOT_ARM_H_ */ +#endif /* _BAREBOX_ARM_H_ */ diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/barebox.h index 298f9e37b1..c9372dab93 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/barebox.h @@ -26,16 +26,16 @@ * MA 02111-1307 USA * ******************************************************************** - * NOTE: This header file defines an interface to U-Boot. Including + * NOTE: This header file defines an interface to barebox. Including * this (unmodified) header file in another file is considered normal - * use of U-Boot, and does *not* fall under the heading of "derived + * use of barebox, and does *not* fall under the heading of "derived * work". ******************************************************************** */ -#ifndef _U_BOOT_H_ -#define _U_BOOT_H_ 1 +#ifndef _BAREBOX_H_ +#define _BAREBOX_H_ 1 //typedef struct bd_info {} bd_t; -#endif /* _U_BOOT_H_ */ +#endif /* _BAREBOX_H_ */ diff --git a/arch/arm/lib/.gitignore b/arch/arm/lib/.gitignore index 09f1be04eb..d1165788c9 100644 --- a/arch/arm/lib/.gitignore +++ b/arch/arm/lib/.gitignore @@ -1 +1 @@ -u-boot.lds +barebox.lds diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 00e0ea5704..26c318b0eb 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -20,5 +20,5 @@ obj-$(CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS) += memcpy.o obj-$(CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS) += memset.o obj-$(CONFIG_MODULES) += module.o -extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += u-boot.lds +extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += barebox.lds diff --git a/arch/arm/lib/arm.c b/arch/arm/lib/arm.c index 489424707e..8ac9ff4ae4 100644 --- a/arch/arm/lib/arm.c +++ b/arch/arm/lib/arm.c @@ -1,7 +1,7 @@ #include <common.h> #include <init.h> #include <mem_malloc.h> -#include <asm/u-boot-arm.h> +#include <asm/barebox-arm.h> #include <asm-generic/memory_layout.h> #include <reloc.h> diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c index 365a4d278d..25b7744b91 100644 --- a/arch/arm/lib/armlinux.c +++ b/arch/arm/lib/armlinux.c @@ -38,7 +38,7 @@ #include <asm/byteorder.h> #include <asm/global_data.h> #include <asm/setup.h> -#include <asm/u-boot-arm.h> +#include <asm/barebox-arm.h> static struct tag *params; static int armlinux_architecture = 0; @@ -244,7 +244,7 @@ static int do_bootz(cmd_tbl_t *cmdtp, int argc, char *argv[]) void *zimage; if (argc != 2) { - u_boot_cmd_usage(cmdtp); + barebox_cmd_usage(cmdtp); return 1; } @@ -300,11 +300,11 @@ static const __maybe_unused char cmd_bootz_help[] = "Usage: bootz [FILE]\n" "Boot a Linux zImage\n"; -U_BOOT_CMD_START(bootz) +BAREBOX_CMD_START(bootz) .cmd = do_bootz, .usage = "bootz - start a zImage", - U_BOOT_CMD_HELP(cmd_bootz_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_bootz_help) +BAREBOX_CMD_END #endif /* CONFIG_CMD_BOOTZ */ #ifdef CONFIG_CMD_BOOTU @@ -314,7 +314,7 @@ static int do_bootu(cmd_tbl_t *cmdtp, int argc, char *argv[]) const char *commandline = getenv("bootargs"); if (argc != 2) { - u_boot_cmd_usage(cmdtp); + barebox_cmd_usage(cmdtp); return 1; } @@ -334,9 +334,9 @@ static int do_bootu(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_bootu_help[] = "Usage: bootu <address>\n"; -U_BOOT_CMD_START(bootu) +BAREBOX_CMD_START(bootu) .cmd = do_bootu, .usage = "bootu - start a raw linux image", - U_BOOT_CMD_HELP(cmd_bootu_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_bootu_help) +BAREBOX_CMD_END #endif /* CONFIG_CMD_BOOTU */ diff --git a/arch/arm/lib/u-boot.lds.S b/arch/arm/lib/barebox.lds.S index a478281576..c8d1bb9d85 100644 --- a/arch/arm/lib/u-boot.lds.S +++ b/arch/arm/lib/barebox.lds.S @@ -22,7 +22,7 @@ * */ -#include <asm-generic/u-boot.lds.h> +#include <asm-generic/barebox.lds.h> OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) @@ -55,16 +55,16 @@ SECTIONS .got : { *(.got*) } . = .; - __u_boot_cmd_start = .; - .u_boot_cmd : { U_BOOT_CMDS } - __u_boot_cmd_end = .; + __barebox_cmd_start = .; + .barebox_cmd : { BAREBOX_CMDS } + __barebox_cmd_end = .; - __u_boot_initcalls_start = .; - .u_boot_initcalls : { INITCALLS } - __u_boot_initcalls_end = .; + __barebox_initcalls_start = .; + .barebox_initcalls : { INITCALLS } + __barebox_initcalls_end = .; __usymtab_start = .; - __usymtab : { U_BOOT_SYMS } + __usymtab : { BAREBOX_SYMS } __usymtab_end = .; . = ALIGN(4); diff --git a/arch/arm/mach-arm.dox b/arch/arm/mach-arm.dox index 106aa39df9..3b76f8e34a 100644 --- a/arch/arm/mach-arm.dox +++ b/arch/arm/mach-arm.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_arm_mach ARM based CPU (MACH) into the tree @@ -26,14 +26,14 @@ In the case the boot happens from NAND flash memory, further steps are required. Most of the known processor devices are reading the first few blocks from the NAND flash memory into some kind of internal SRAM. This small part must be able to initialize the SDRAM controller and to read the remaining rest of the -U-Boot-v2 binary from the NAND flash memory prior returning from \<board_init_lowlevel\>. +barebox binary from the NAND flash memory prior returning from \<board_init_lowlevel\>. When \<board_init_lowlevel\> returns it will be assumed there is now a working RAM that can be used for all further steps. -Next step is relocation of U-Boot itself (if not already done). It gets copied -to RAM and the last assembler instruction is a jump into start_uboot(). This -target address is the first C instruction in U-Boot. At this point of time:\n +Next step is relocation of barebox itself (if not already done). It gets copied +to RAM and the last assembler instruction is a jump into start_barebox(). This +target address is the first C instruction in barebox. At this point of time:\n "runtime address == link address". @section mach_arm_files List of changes diff --git a/arch/arm/mach-imx/clko.c b/arch/arm/mach-imx/clko.c index 6a8072213c..b6efe8780a 100644 --- a/arch/arm/mach-imx/clko.c +++ b/arch/arm/mach-imx/clko.c @@ -46,9 +46,9 @@ static __maybe_unused char cmd_clko_help[] = " -s <source> Clock select. See Ref. Manual for valid sources. Use -1\n" " for disabling clock output\n"; -U_BOOT_CMD_START(clko) +BAREBOX_CMD_START(clko) .cmd = do_clko, .usage = "Adjust CLKO setting", - U_BOOT_CMD_HELP(cmd_clko_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_clko_help) +BAREBOX_CMD_END diff --git a/arch/arm/mach-imx/include/mach/u-boot.lds.h b/arch/arm/mach-imx/include/mach/barebox.lds.h index 8e1eccda5b..8e1eccda5b 100644 --- a/arch/arm/mach-imx/include/mach/u-boot.lds.h +++ b/arch/arm/mach-imx/include/mach/barebox.lds.h diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c index e9b5ca01fd..76ab6b9bed 100644 --- a/arch/arm/mach-imx/speed.c +++ b/arch/arm/mach-imx/speed.c @@ -76,8 +76,8 @@ static int do_clocks (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(dump_clocks) +BAREBOX_CMD_START(dump_clocks) .cmd = do_clocks, .usage = "show clock frequencies", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index 4af945f4d6..76ae6bdfec 100644 --- a/arch/arm/mach-netx/generic.c +++ b/arch/arm/mach-netx/generic.c @@ -91,7 +91,7 @@ int loadxc(int xcno) { memset32((void*)NETX_PA_XPEC(xcno) + XPEC_RAM_START, 0, 0x2000); memset32((void*)NETX_PA_XMAC(xcno), 0, 0x800); - /* can't use u-boot memcpy here, we need 32bit accesses */ + /* can't use barebox memcpy here, we need 32bit accesses */ if(xcno == 0) { memcpy32((void*)(NETX_PA_XMAC(xcno) + XMAC_RPU_PROGRAM_START), rpu_eth0, sizeof(rpu_eth0)); memcpy32((void*)(NETX_PA_XMAC(xcno) + XMAC_TPU_PROGRAM_START), tpu_eth0, sizeof(tpu_eth0)); @@ -143,8 +143,8 @@ void reset_cpu(ulong addr) } -U_BOOT_CMD_START(loadxc) +BAREBOX_CMD_START(loadxc) .cmd = do_loadxc, .usage = "load xmac/xpec engine with ethernet firmware", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/arch/arm/mach-omap/arch-omap.dox b/arch/arm/mach-omap/arch-omap.dox index 857ca3eb5d..d5a7f8be35 100644 --- a/arch/arm/mach-omap/arch-omap.dox +++ b/arch/arm/mach-omap/arch-omap.dox @@ -1,10 +1,10 @@ /* This document is intended to provide the developer with information - * how to integrate a new OMAP Architecture into this part of the U-Boot tree + * how to integrate a new OMAP Architecture into this part of the barebox tree */ -/** @page dev_omap_arch Texas Instrument's OMAP Platforms in U-Boot V2 +/** @page dev_omap_arch Texas Instrument's OMAP Platforms in barebox -This document highlights some of the factors for supporting Texas Instrument's OMAP platforms in U-Boot V2. +This document highlights some of the factors for supporting Texas Instrument's OMAP platforms in barebox. @par Table of Contents @li @ref omap_boards @@ -24,13 +24,13 @@ This document highlights some of the factors for supporting Texas Instrument's O @li @subpage arch/arm/mach-omap/omap3_generic.c -@section omap_code_arch How is U-Boot V2 OMAP specific architecture code organized? +@section omap_code_arch How is barebox OMAP specific architecture code organized? -To understand the architecture of U-Boot V2 source code for OMAP processors, we need to understand a bit on OMAP itself. +To understand the architecture of barebox source code for OMAP processors, we need to understand a bit on OMAP itself. A typical Texas Instrument's Open Multimedia Application Processor (OMAP) solution is built around ARM core with multiple on-the-silicon peripherals. It also has a TI Digital Signal Processor(DSP) and few hardware accelerators to cater to computing intensive applications such as encoder/decoders. See http://focus.ti.com/general/docs/wtbu/wtbugencontent.tsp?templateId=6123&navigationId=11988&contentId=4638 for further details. -Essentially, OMAP is modular with on-silicon peripherals being reused across multiple OMAP versions. U-Boot V2 code organization is driven by this fact. +Essentially, OMAP is modular with on-silicon peripherals being reused across multiple OMAP versions. barebox code organization is driven by this fact. Motivation for code organization is driven from: @li Clear distinction between architecture and board features. @@ -53,13 +53,13 @@ All OMAP common headers are located here. Where we have to incorporate a OMAP va include/asm-arm/arch-omap/silicon.h contains includes for omapX-silicon.h which defines the base addresses for the peripherals on that platform. the usual convention is to use #define OMAP_SOMETHING_BASE to allow re-use. @section board_omap board/omap directory guidelines -All Board specific files go here. In U-Boot V1, we always had to use common config file which is shared by other drivers to get serial, ethernet baseaddress etc.. we can easily use the device_d structure to handle it with U-Boot V2. This is more like programming for Linux kernel - it is pretty easy. +All Board specific files go here. In barebox V1, we always had to use common config file which is shared by other drivers to get serial, ethernet baseaddress etc.. we can easily use the device_d structure to handle it with barebox. This is more like programming for Linux kernel - it is pretty easy. Each specific board file has board-XYZ.c and potentially and equivalent h file. We'd potentially use device_initcall and console_initcalls as required. @section omap_boot The OMAP boot path -The normal flow is to look for arch_init_lowlevel in the required code. This would be the first function to be called after the ARM common code boots up(arch/arm/cpu/start-arm.S), the job of boot code on OMAP platform would be to preventing watchdog timer from kicking in and spoiling all the fun, setup OMAP clocks to the high performance mode, do other architecture specific initializations. There could be some additional stuff we may need to do based on the specific OMAP we support including setting up a usable interrupt vector table etc - some parts of the code may be desired to be in C code (to let normal humans understand without being an asm junkie), in such a case, U-Boot's stack setup is not ready yet, and we may need to setup a temporary SRAM based stack prior to execution. Some things to keep in mind while handling booting code, we might be executing in eXecute In Place (XIP) mode and that only an SRAM stack is setup. Using global variables or using constructs that create function jump tables is doomed to fail as the required area might not be writable or may not be even initialized. So code in this area tends to use lots of if conditions and local variables. Having C code doing the fun part is easy to maintain, so it is advisable to push as much as possible to C functions where possible. +The normal flow is to look for arch_init_lowlevel in the required code. This would be the first function to be called after the ARM common code boots up(arch/arm/cpu/start-arm.S), the job of boot code on OMAP platform would be to preventing watchdog timer from kicking in and spoiling all the fun, setup OMAP clocks to the high performance mode, do other architecture specific initializations. There could be some additional stuff we may need to do based on the specific OMAP we support including setting up a usable interrupt vector table etc - some parts of the code may be desired to be in C code (to let normal humans understand without being an asm junkie), in such a case, barebox's stack setup is not ready yet, and we may need to setup a temporary SRAM based stack prior to execution. Some things to keep in mind while handling booting code, we might be executing in eXecute In Place (XIP) mode and that only an SRAM stack is setup. Using global variables or using constructs that create function jump tables is doomed to fail as the required area might not be writable or may not be even initialized. So code in this area tends to use lots of if conditions and local variables. Having C code doing the fun part is easy to maintain, so it is advisable to push as much as possible to C functions where possible. The responsibility of arch_init_lowlevel and related calls is to setup OMAP. No board specific initializations are to be done here. @@ -69,7 +69,7 @@ Once this is past, the code returns back to arm common code (cpu/start-arm.S). H If the proper CONFIG_MACH_DO_LOWLEVEL_INIT flag is setup, board_init_lowlevel is called. This again would call a common file board/omap/platform.S which setups a temporary SRAM stack and bumps the control to board_init. Every Board in OMAP platform can potentially define a board_init and enable defconfig in arch/arm/configs directory. The responsibility here is to setup OMAP for board configurations - this includes SDRAM configuration and pin muxing configuration. -Once this is complete, U-boot V2 boot process proceeds by calling init functions and finally entering shell prompt +Once this is complete, barebox boot process proceeds by calling init functions and finally entering shell prompt board-XYZ file may potentially register every device it is interested in. You can check out how the code is organized in other board directories also, esentially, the method is as simple as: @code diff --git a/arch/arm/mach-omap/include/mach/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h index 1221238de8..5c4701fe4f 100644 --- a/arch/arm/mach-omap/include/mach/clocks.h +++ b/arch/arm/mach-omap/include/mach/clocks.h @@ -6,7 +6,7 @@ * * This includes each of the architecture Clock definitions under it. * - * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz + * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz */ /* * (C) Copyright 2006-2008 diff --git a/arch/arm/mach-omap/include/mach/omap3-clock.h b/arch/arm/mach-omap/include/mach/omap3-clock.h index 22694f2367..2a509d84fd 100644 --- a/arch/arm/mach-omap/include/mach/omap3-clock.h +++ b/arch/arm/mach-omap/include/mach/omap3-clock.h @@ -4,7 +4,7 @@ * * FileName: include/asm-arm/arch-omap/omap3-clock.h * - * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz + * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz * */ /* diff --git a/arch/arm/mach-omap/include/mach/omap3-mux.h b/arch/arm/mach-omap/include/mach/omap3-mux.h index 2badc3f851..258a122ef8 100644 --- a/arch/arm/mach-omap/include/mach/omap3-mux.h +++ b/arch/arm/mach-omap/include/mach/omap3-mux.h @@ -8,7 +8,7 @@ * @see include/asm-arm/arch-omap/control.h * The @ref MUX_VAL macro uses the defines from this file * - * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz + * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz */ /* * (C) Copyright 2006-2008 diff --git a/arch/arm/mach-omap/include/mach/sdrc.h b/arch/arm/mach-omap/include/mach/sdrc.h index 9d2d2d1107..b9fecf81aa 100644 --- a/arch/arm/mach-omap/include/mach/sdrc.h +++ b/arch/arm/mach-omap/include/mach/sdrc.h @@ -4,7 +4,7 @@ * * FileName: include/asm-arm/arch-omap/sdrc.h * - * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz + * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz */ /* * (C) Copyright 2006-2008 diff --git a/arch/arm/mach-omap/include/mach/sys_info.h b/arch/arm/mach-omap/include/mach/sys_info.h index 43967209f1..13e17d476f 100644 --- a/arch/arm/mach-omap/include/mach/sys_info.h +++ b/arch/arm/mach-omap/include/mach/sys_info.h @@ -7,7 +7,7 @@ * * These are implemented by the System specific code in omapX-generic.c * - * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz + * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz */ /* * (C) Copyright 2006-2008 diff --git a/arch/arm/mach-omap/include/mach/syslib.h b/arch/arm/mach-omap/include/mach/syslib.h index c89f50b816..d7467435de 100644 --- a/arch/arm/mach-omap/include/mach/syslib.h +++ b/arch/arm/mach-omap/include/mach/syslib.h @@ -6,7 +6,7 @@ * * Implemented by arch/arm/mach-omap/syslib.c * - * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz + * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz */ /* * (C) Copyright 2004-2008 diff --git a/arch/arm/mach-omap/omap3_clock.c b/arch/arm/mach-omap/omap3_clock.c index 4e81ae80d4..2727fd63d1 100644 --- a/arch/arm/mach-omap/omap3_clock.c +++ b/arch/arm/mach-omap/omap3_clock.c @@ -15,7 +15,7 @@ * @warning: IMPORTANT: These functions run from ISRAM stack, so no bss sections * should be used: functions cannot use global variables/switch constructs. * - * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz + * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz */ /* * (C) Copyright 2006-2008 diff --git a/arch/arm/mach-omap/omap3_clock_core.S b/arch/arm/mach-omap/omap3_clock_core.S index 872ae5abcd..21a1902690 100644 --- a/arch/arm/mach-omap/omap3_clock_core.S +++ b/arch/arm/mach-omap/omap3_clock_core.S @@ -12,7 +12,7 @@ * configurations while running in SDRAM/Flash. This provides * relocation and execution capability for the same. * - * Orignally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz + * Orignally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz */ /* * (C) Copyright 2006-2008 diff --git a/arch/arm/mach-omap/omap3_core.S b/arch/arm/mach-omap/omap3_core.S index 76f80e68ca..7337d4c545 100644 --- a/arch/arm/mach-omap/omap3_core.S +++ b/arch/arm/mach-omap/omap3_core.S @@ -48,7 +48,7 @@ arch_init_lowlevel: mov r0, pc /* Store the current pc address */ sub r0, r0, #8 /* Reduce offset */ ldr r1, arch_start /* Load the link address for arch_int */ - ldr r2, uboot_start /* load the link address of start_init*/ + ldr r2, barebox_start /* load the link address of start_init*/ sub r1, r1, r2 /* get the offset */ /* subtract the offset from PC of arch=Current start */ sub r0, r0, r1 @@ -91,7 +91,7 @@ next: arch_start: .word arch_init_lowlevel -uboot_start: +barebox_start: .word _start SRAM_INTVECT: .word OMAP_SRAM_INTVECT diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c index 794d2fa8f2..e5a2addff5 100644 --- a/arch/arm/mach-omap/omap3_generic.c +++ b/arch/arm/mach-omap/omap3_generic.c @@ -11,7 +11,7 @@ * Important one is @ref a_init which is architecture init code. * The implemented functions are present in sys_info.h * - * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz + * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz */ /* * (C) Copyright 2006-2008 @@ -400,7 +400,7 @@ void a_init(void) try_unlock_memory(); - /* Writing to AuxCR in U-boot using SMI for GP DEV */ + /* Writing to AuxCR in barebox using SMI for GP DEV */ /* Currently SMI in Kernel on ES2 devices seems to have an isse * Once that is resolved, we can postpone this config to kernel */ diff --git a/arch/arm/mach-omap/syslib.c b/arch/arm/mach-omap/syslib.c index 2b25dc153c..e966d8e7c5 100644 --- a/arch/arm/mach-omap/syslib.c +++ b/arch/arm/mach-omap/syslib.c @@ -7,7 +7,7 @@ * Provide APIs which can be used from platform/architecture code * to operate on * - * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz + * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz */ /* * (C) Copyright 2006-2008 diff --git a/arch/arm/mach-s3c24xx/generic.c b/arch/arm/mach-s3c24xx/generic.c index 4613e59760..dddd0187c3 100644 --- a/arch/arm/mach-s3c24xx/generic.c +++ b/arch/arm/mach-s3c24xx/generic.c @@ -240,7 +240,7 @@ EXPORT_SYMBOL(reset_cpu); /** -@page dev_s3c24xx_arch Samsung's S3C24xx Platforms in U-Boot-v2 +@page dev_s3c24xx_arch Samsung's S3C24xx Platforms in barebox @section s3c24xx_boards Boards using S3C24xx Processors @@ -274,20 +274,20 @@ All S3C24xx common headers are located here. /** @page dev_s3c24xx_mach Samsung's S3C24xx based platforms -@par U-Boot-v2 Map +@par barebox Map -The location of the U-Boot-v2 itself depends on the available amount of +The location of the barebox itself depends on the available amount of installed SDRAM memory: -- 0x30fc.0000 Start of U-Boot-v2 when 16MiB SDRAM is available -- 0x31fc.0000 Start of U-Boot-v2 when 32MiB SDRAM is available -- 0x33fc.0000 Start of U-Boot-v2 when 64MiB SDRAM is available +- 0x30fc.0000 Start of barebox when 16MiB SDRAM is available +- 0x31fc.0000 Start of barebox when 32MiB SDRAM is available +- 0x33fc.0000 Start of barebox when 64MiB SDRAM is available Adjust the CONFIG_TEXT_BASE/CONFIG_ARCH_TEXT_BASE symbol in accordance to the available memory. @note The RAM based filesystem and the stack resides always below the -U-Boot-v2 start address. +barebox start address. @li @subpage dev_s3c24xx_wd_handling @li @subpage dev_s3c24xx_pll_handling diff --git a/arch/arm/mach-s3c24xx/lowlevel-init.S b/arch/arm/mach-s3c24xx/lowlevel-init.S index fd6b0f396d..e8004e588c 100644 --- a/arch/arm/mach-s3c24xx/lowlevel-init.S +++ b/arch/arm/mach-s3c24xx/lowlevel-init.S @@ -223,7 +223,7 @@ SDRAMDATA: @page dev_s3c24xx_sdram_handling SDRAM controller initialisation The SDRAM controller is very simple and its initialisation requires only a -few steps. U-Boot-v2 provides a generic routine to do this step. +few steps. barebox provides a generic routine to do this step. Enable CONFIG_S3C24XX_SDRAM_INIT and CONFIG_MACH_HAS_LOWLEVEL_INIT to be able to call the generic s3c24x0_sdram_init() assembler function from within the @@ -292,14 +292,14 @@ machine specific board_init_lowlevel() assembler function. an initialized stack pointer. @note Basicly this routine runs from inside the internal SRAM. After load of -the whole U-Boot-v2 image from the NAND flash memory into the SDRAM it adjusts +the whole barebox image from the NAND flash memory into the SDRAM it adjusts the link register to the final SDRAM adress and returns. @note In the NAND boot mode, ECC is not checked. So, the first x KBytes used -by U-Boot-v2 should have no bit error. +by barebox should have no bit error. -Due to the fact the code to load the whole U-Boot-v2 from NAND must fit into -the first 4kiB of the U-Boot-v2 image, the shrinked NAND driver is very +Due to the fact the code to load the whole barebox from NAND must fit into +the first 4kiB of the barebox image, the shrinked NAND driver is very minimalistic. Setup the NAND access timing is done in a safe manner, what means: Slowest possible values are used. If you want to increase the speed you should define the BOARD_DEFAULT_NAND_TIMING to a valid setting into the |