diff --git a/.gitignore b/.gitignore index d58955521..6f046013b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,16 +27,16 @@ tags TAGS cross_arch cross_compile -uboot -uboot.S -uboot.bin -uboot.netx -uboot.map +barebox +barebox.S +barebox.bin +barebox.netx +barebox.map System.map Module.symvers ARCH CROSS_COMPILE -uboot_default_env +barebox_default_env # # Generated include files diff --git a/COPYING b/COPYING index f616ab96c..f13e904b5 100644 --- a/COPYING +++ b/COPYING @@ -1,16 +1,16 @@ NOTE! This copyright does *not* cover the so-called "standalone" -applications that use U-Boot services by means of the jump table -provided by U-Boot exactly for this purpose - this is merely -considered normal use of U-Boot, and does *not* fall under the +applications that use barebox services by means of the jump table +provided by barebox exactly for this purpose - this is merely +considered normal use of barebox, and does *not* fall under the heading of "derived work". - The header files "include/image.h" and "include/asm-*/u-boot.h" -define interfaces to U-Boot. Including these (unmodified) header -files in another file is considered normal use of U-Boot, and does + The header files "include/image.h" and "include/asm-*/barebox.h" +define interfaces to barebox. Including these (unmodified) header +files in another file is considered normal use of barebox, and does *not* fall under the heading of "derived work". Also note that the GPL below is copyrighted by the Free Software -Foundation, but the instance of code that it refers to (the U-Boot +Foundation, but the instance of code that it refers to (the barebox source code) is copyrighted by me and others who actually wrote it. -- Wolfgang Denk diff --git a/CREDITS b/CREDITS index 802158879..bd5a5424d 100644 --- a/CREDITS +++ b/CREDITS @@ -5,7 +5,7 @@ # # # This is at least a partial credits-file of individual people that -# have contributed to the U-Boot project. It is sorted by name and +# have contributed to the barebox project. It is sorted by name and # formatted to allow easy grepping and beautification by scripts. # The fields are: name (N), email (E), web-address (W), PGP key ID # and fingerprint (P), description (D), and snail-mail address (S). @@ -123,7 +123,7 @@ D: FLAGA DM Support N: Wolfgang Denk E: wd@denx.de -D: U-Boot initial version, continuing maintenance, ARMBoot merge +D: barebox initial version, continuing maintenance, ARMBoot merge W: http://www.denx.de N: Dan A. Dickey diff --git a/Documentation/uboot-main.dox b/Documentation/barebox-main.dox similarity index 79% rename from Documentation/uboot-main.dox rename to Documentation/barebox-main.dox index 424e369c6..224677526 100644 --- a/Documentation/uboot-main.dox +++ b/Documentation/barebox-main.dox @@ -1,9 +1,9 @@ /** @mainpage Universal Bootloader -@section uboot_v2_intro Introduction +@section barebox_v2_intro Introduction -This is u2boot, our proposal for a next generation of the famous U-Boot -bootloader. U-Boot offers an excellent choice as a bootloader for +This is barebox, our proposal for a next generation of the famous barebox +bootloader. barebox offers an excellent choice as a bootloader for today's embedded systems, seen from a user's point of view. Nevertheless, there are quite some design flaws which turned out over the last years and we think that they cannot be solved in a production @@ -13,7 +13,7 @@ about losing support for old boards. @par General features include: - A posix based file API - - inside U-Boot the usual open/close/read/write/lseek functions are used. + - inside barebox the usual open/close/read/write/lseek functions are used. This makes it familiar to everyone who has programmed under unix systems. - usual shell commands like ls/cd/mkdir/echo/cat,... @@ -47,12 +47,12 @@ about losing support for old boards. the code. - simulation target - - U-Boot can be compiled to run under Linux. While this is rather useless + - barebox can be compiled to run under Linux. While this is rather useless in real world this is a great debugging and development aid. New features can be easily developped and tested on long train journeys and started under gdb. There is a console driver for linux which emulates a serial device and a tap based ethernet driver. Linux files can be mapped to - devices under U-Boot to emulate storage devices. + devices under barebox to emulate storage devices. - device parameter support - Each device can have a unlimited number of parameters. They can be accessed @@ -65,22 +65,22 @@ about losing support for old boards. - getopt - There is a small getopt implementation. Some commands got really - complicated (both in code and in usage) due to the fact that U-Boot only + complicated (both in code and in usage) due to the fact that barebox only allowed positional parameters. - editor - Scripts can be edited with a small editor. This editor has no features except the ones really needed: moving the cursor and typing characters. -@par Building U-Boot +@par Building barebox -U-Boot uses the Linux kernel's build system. It consists of two parts: +barebox uses the Linux kernel's build system. It consists of two parts: the makefile infrastructure (kbuild), plus a configuration system -(kconfig). So building U-Boot is very similar to building the Linux +(kconfig). So building barebox is very similar to building the Linux kernel. -For the examples below, we use the User Mode U-Boot implementation, which -is a port of U-Boot to the Linux userspace. This makes it possible to +For the examples below, we use the User Mode barebox implementation, which +is a port of barebox to the Linux userspace. This makes it possible to test drive the code without having real hardware. So for this test scenario, ARCH=sandbox is the valid architecture selection. This currently only works on ia32 hosts and partly on x86-64. @@ -94,7 +94,7 @@ architecture: @code # ln -s sandbox cross_arch @endcode -In order to configure the various aspects of U-Boot, start the U-Boot +In order to configure the various aspects of barebox, start the barebox configuration system: @code # make menuconfig @endcode @@ -105,49 +105,49 @@ finished (you can simulate this by using the standard demo config file with 'make sandbox_defconfig'), there is a .config file in the toplevel directory of the sourcode. -Once U-Boot is configured, we can start the compilation +Once barebox is configured, we can start the compilation @code # make @endcode -If everything goes well, the result is a file called uboot: +If everything goes well, the result is a file called barebox: @code - # ls -l uboot - -rwxr-xr-x 1 rsc ptx 114073 Jun 26 22:34 uboot + # ls -l barebox + -rwxr-xr-x 1 rsc ptx 114073 Jun 26 22:34 barebox @endcode -U-Boot usually needs an environment for storing the configuation data. +barebox usually needs an environment for storing the configuation data. You can generate an environment using the example environment contained in examples/environment: -@code # ./scripts/ubootenv -s -p 0x10000 examples/environment/ env.bin @endcode +@code # ./scripts/bareboxenv -s -p 0x10000 examples/environment/ env.bin @endcode To get some files to play with you can generate a cramfs image: @code # mkcramfs somedir/ cramfs.bin @endcode -The U-Boot image is a normal Linux executable, so it can be started +The barebox image is a normal Linux executable, so it can be started just like every other program: @code - # ./uboot -e env.bin -i cramfs.bin + # ./barebox -e env.bin -i cramfs.bin - U-Boot 2.0.0-trunk (Jun 26 2007 - 22:34:38) + barebox 2.0.0-trunk (Jun 26 2007 - 22:34:38) loading environment from /dev/env0 - uboot\> / + barebox\> / @endcode -Specifying -[ie] \ tells U-Boot to map the file as a device +Specifying -[ie] \ tells barebox to map the file as a device under /dev. Files given with '-e' will appear as /dev/env[n]. Files given with '-i' will appear as /dev/fd[n]. -If U-Boot finds a valid configuration sector on /dev/env0 it will +If barebox finds a valid configuration sector on /dev/env0 it will load it to /env. It then executes /env/init if it exists. If you have -loaded the example environment U-Boot will show you a menu asking for +loaded the example environment barebox will show you a menu asking for your settings. -If you have started U-Boot as root you will find a new tap device on your -host which you can configure using ifconfig. Once you configured U-Boots +If you have started barebox as root you will find a new tap device on your +host which you can configure using ifconfig. Once you configured bareboxs network settings accordingly you can do a ping or tftpboot. If you have mapped a cramfs image try mounting it with @@ -160,7 +160,7 @@ If you have mapped a cramfs image try mounting it with Memory can be examined as usual using md/mw commands. They both understand the -f \ option to tell the commands that they should work on the specified files instead of /dev/mem which holds the complete address space. -Note that if you call 'md /dev/fd0' (without -f) U-Boot will segfault on +Note that if you call 'md /dev/fd0' (without -f) barebox will segfault on the host, because it will interpret /dev/fd0 as a number. @par Directory layout @@ -195,7 +195,7 @@ scripts / -> Kconfig system Documentation / -> @endverbatim -@section license U-Boot's License +@section license barebox's License @verbatim This program is free software; you can redistribute it and/or diff --git a/Documentation/boards.dox b/Documentation/boards.dox index c4d05d69a..6c958324e 100644 --- a/Documentation/boards.dox +++ b/Documentation/boards.dox @@ -1,6 +1,6 @@ /** @page supported_boards Supported Boards -This is a list of boards that are currently supported by U-Boot-v2. +This is a list of boards that are currently supported by barebox. PowerPC type: diff --git a/Documentation/console.txt b/Documentation/console.txt index 7ed67202e..76b6107ac 100644 --- a/Documentation/console.txt +++ b/Documentation/console.txt @@ -1,6 +1,6 @@ --------------- U-Boot consoles ------------------ +-------------- barebox consoles ------------------ -U-Boot supports multiple consoles which may be simultaneously active. +barebox supports multiple consoles which may be simultaneously active. Depending on the configuration none, the first or all consoles are activated on startup, see CONSOLE_ACTIVATE_FIRST and CONSOLE_ACTIVATE_ALL options. diff --git a/Documentation/developers_manual.dox b/Documentation/developers_manual.dox index ab941e23b..6326d453b 100644 --- a/Documentation/developers_manual.dox +++ b/Documentation/developers_manual.dox @@ -1,23 +1,23 @@ /** @page developers_manual Developer's Manual -This part of the documentation is intended for developers of U-Boot-v2. +This part of the documentation is intended for developers of barebox. -@section devel_backgrounds Some background knowledge for some frameworks U-Boot-v2 +@section devel_backgrounds Some background knowledge for some frameworks barebox @li @subpage driver_model @li @subpage dev_params -@section devel_hints Hints and tips for simply adapting U-Boot-v2 +@section devel_hints Hints and tips for simply adapting barebox @li @subpage dev_architecture @li @subpage dev_cpu @li @subpage dev_board -@section devel_themes Various themes about U-Boot-v2 +@section devel_themes Various themes about barebox @li @subpage how_mount_works @li @subpage boot_preparation -@li @subpage uboot_simul +@li @subpage barebox_simul @li @subpage io_access_functions @li @subpage mcfv4e_MCDlib diff --git a/Documentation/devices_drivers.txt b/Documentation/devices_drivers.txt index 06e788de8..af929fa8c 100644 --- a/Documentation/devices_drivers.txt +++ b/Documentation/devices_drivers.txt @@ -1,5 +1,5 @@ ----------- Devices and drivers in U-Boot -------------- +---------- Devices and drivers in barebox -------------- We follow a rather simplistic driver model here. There is a struct device which describes a particular device present in the system. A struct driver represents diff --git a/Documentation/manual_org.dox b/Documentation/manual_org.dox index f9cb238a4..6f3b15787 100644 --- a/Documentation/manual_org.dox +++ b/Documentation/manual_org.dox @@ -6,7 +6,7 @@ than listed here. But these files are the main control files: - Documentation - Documentation/Doxyfile - - Documentation/uboot-main.dox + - Documentation/barebox-main.dox - Documentation/users_manual.dox - Documentation/commands.dox - Documentation/developers_manual.dox diff --git a/Documentation/porting.txt b/Documentation/porting.txt index 174a16ba3..ccfe598a7 100644 --- a/Documentation/porting.txt +++ b/Documentation/porting.txt @@ -1,5 +1,5 @@ -When porting from old U-Boot the follwing steps must be taken (please complain +When porting from old barebox the follwing steps must be taken (please complain if there's something missing here ;) @@ -9,24 +9,24 @@ if there's something missing here ;) configured with the Kconfig system feel free to add them there. - The linker script needs a new section for the initcalls. The handling of the - U-Boot command table has changed, too. (The commands are now sorted by the + barebox command table has changed, too. (The commands are now sorted by the linker instead at runtime.) To change it you need an entry like the following in your linker script: -#include +#include - __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 = .; -- Rename your linker script to u-boot.lds.S and add the following entry to the +- Rename your linker script to barebox.lds.S and add the following entry to the Makefile to make sure the linker script is generated: -extra-y += u-boot.lds +extra-y += barebox.lds - Register the devices present in your system in the board specific .c file. To see anything you have to at least register a console. In scb9328.c this @@ -72,7 +72,7 @@ extra-y += u-boot.lds set_mac_address() set the MAC address in the device. All magic previously done with getenv/setenv(ethaddr) must be removed. - During startup U-Boot calls get_mac_address() to see if an EEPROM is + During startup barebox calls get_mac_address() to see if an EEPROM is connected. If so, it calls set_mac_address() with this address. This is done even if networking is not used during startup. This makes sure that the MAC address is set in the device and Linux can pick it up later. @@ -91,8 +91,8 @@ extra-y += u-boot.lds - Adjust start.S. On PowerPC there is at least the Problem that the relocation offset is defined at compile time. It is easily possible to determine the - address U-Boot is currently starting from at runtime and thus allowing it - U-Boot to be started at any address. Look at the relocation code and replace + address barebox is currently starting from at runtime and thus allowing it + barebox to be started at any address. Look at the relocation code and replace TEXT_BASE with the following calculation of the runtime address: bl calc_source /* Calculate Source Address */ @@ -105,7 +105,7 @@ calc_source: fortunately I know next to nothing of PowerPC assembler, so if you have a better way to archieve this, please write to the list.) - On PowerPC U-Boot now runs at the address it was linked to, so you have + On PowerPC barebox now runs at the address it was linked to, so you have to adjust TEXT_BASE to be in RAM. This makes the various fixup relocation functions unnecessary. On PowerPC the removal of -fPIC saves around 10% of binary space. It also simplifies debugging because you will see the correct diff --git a/Documentation/timekeeping.txt b/Documentation/timekeeping.txt index 9d778117c..ed5ef62fe 100644 --- a/Documentation/timekeeping.txt +++ b/Documentation/timekeeping.txt @@ -1,6 +1,6 @@ ------------- U-Boot timekeeping ------------- +------------ barebox timekeeping ------------- -In U-Boot we use the clocksource mechanism from the Linux Kernel. This makes +In barebox we use the clocksource mechanism from the Linux Kernel. This makes it fairly easy to add timer functionality for a new board or architecture. Apart from initialization there is only one function required: clocksource_read(). This function returns the current value of a free running diff --git a/Doxyfile b/Doxyfile index f6eea3a60..4fd3a41a4 100644 --- a/Doxyfile +++ b/Doxyfile @@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = U-Boot +PROJECT_NAME = barebox # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/MAINTAINERS b/MAINTAINERS index ce20def81..6f56ebeed 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,10 +1,10 @@ ######################################################################### # # -# Regular Maintainers for U-Boot board support: # +# Regular Maintainers for barebox board support: # # # # For any board without permanent maintainer, please contact # # Wolfgang Denk # -# and Cc: the mailing lists. # +# and Cc: the mailing lists. # # # # Note: lists sorted by Maintainer Name # ######################################################################### diff --git a/Makefile b/Makefile index 74bee5361..d69f6efbc 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ MAKEFLAGS += -rR --no-print-directory # their own directory. If in some directory we have a dependency on # a file in another dir (which doesn't happen often, but it's often # unavoidable when linking the built-in.o targets which finally -# turn into uboot), we will call a sub make in that other dir, and +# turn into barebox), we will call a sub make in that other dir, and # after that we are sure that everything which is in that other dir # is now up to date. # @@ -292,13 +292,13 @@ LINUXINCLUDE := -Iinclude \ -I$(objtree)/arch/$(ARCH)/include \ -include include/linux/autoconf.h -CPPFLAGS := -D__KERNEL__ -D__U_BOOT__ $(LINUXINCLUDE) -fno-builtin -ffreestanding +CPPFLAGS := -D__KERNEL__ -D__BAREBOX__ $(LINUXINCLUDE) -fno-builtin -ffreestanding CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -Os -pipe AFLAGS := -D__ASSEMBLY__ -LDFLAGS := -Map uboot.map +LDFLAGS := -Map barebox.map # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) @@ -395,7 +395,7 @@ config %config: scripts_basic outputmakefile FORCE else # =========================================================================== -# Build targets only - this includes uboot, arch specific targets, clean +# Build targets only - this includes barebox, arch specific targets, clean # targets and others. In general all targets except *config targets. # Additional helpers built in scripts/ @@ -405,7 +405,7 @@ PHONY += scripts scripts: scripts_basic include/config/auto.conf $(Q)$(MAKE) $(build)=$(@) -# Objects we will link into uboot / subdirs we need to visit +# Objects we will link into barebox / subdirs we need to visit common-y := common/ drivers/ commands/ lib/ net/ fs/ ifeq ($(dot-config),1) @@ -434,8 +434,8 @@ endif # $(dot-config) # The all: target is the default when no target is given on the # command line. # This allow a user to issue only 'make' to build a kernel -# Defaults uboot but it is usually overridden in the arch makefile -all: uboot.bin +# Defaults barebox but it is usually overridden in the arch makefile +all: barebox.bin include $(srctree)/arch/$(ARCH)/Makefile @@ -461,58 +461,58 @@ CFLAGS += $(call cc-option,-Wno-pointer-sign,) # set in the environment # Also any assignments in arch/$(ARCH)/Makefile take precedence over # this default value -export KBUILD_IMAGE ?= uboot +export KBUILD_IMAGE ?= barebox -uboot-dirs := $(patsubst %/,%,$(filter %/, $(common-y))) +barebox-dirs := $(patsubst %/,%,$(filter %/, $(common-y))) -uboot-alldirs := $(sort $(uboot-dirs) $(patsubst %/,%,$(filter %/, \ +barebox-alldirs := $(sort $(barebox-dirs) $(patsubst %/,%,$(filter %/, \ $(common-n) $(common-) \ $(core-n) $(core-) $(drivers-n) $(drivers-) \ $(net-n) $(net-) $(libs-n) $(libs-)))) common-y := $(patsubst %/, %/built-in.o, $(common-y)) -# Build uboot +# Build barebox # --------------------------------------------------------------------------- -# uboot is built from the objects selected by $(uboot-init) and -# $(uboot-main). Most are built-in.o files from top-level directories +# barebox is built from the objects selected by $(barebox-init) and +# $(barebox-main). Most are built-in.o files from top-level directories # in the kernel tree, others are specified in arch/$(ARCH)Makefile. -# Ordering when linking is important, and $(uboot-init) must be first. +# Ordering when linking is important, and $(barebox-init) must be first. # -# FIXME: This picture is wrong for U-Boot. We have no init, driver, mm +# FIXME: This picture is wrong for barebox. We have no init, driver, mm # -# uboot +# barebox # ^ # | -# +-< $(uboot-init) +# +-< $(barebox-init) # | +--< init/version.o + more # | -# +--< $(uboot-main) +# +--< $(barebox-main) # | +--< driver/built-in.o mm/built-in.o + more # | # +-< kallsyms.o (see description in CONFIG_KALLSYMS section) # -# uboot version cannot be updated during normal +# barebox version cannot be updated during normal # descending-into-subdirs phase since we do not yet know if we need to -# update uboot. +# update barebox. # # System.map is generated to document addresses of all kernel symbols -uboot-common := $(common-y) -uboot-all := $(uboot-common) -uboot-lds := $(lds-y) +barebox-common := $(common-y) +barebox-all := $(barebox-common) +barebox-lds := $(lds-y) -# Rule to link uboot +# Rule to link barebox # May be overridden by arch/$(ARCH)/Makefile -quiet_cmd_uboot__ ?= LD $@ - cmd_uboot__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_uboot) -o $@ \ - -T $(uboot-lds) $(uboot-head) \ - --start-group $(uboot-common) --end-group \ - $(filter-out $(uboot-lds) $(uboot-common) FORCE ,$^) +quiet_cmd_barebox__ ?= LD $@ + cmd_barebox__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_barebox) -o $@ \ + -T $(barebox-lds) $(barebox-head) \ + --start-group $(barebox-common) --end-group \ + $(filter-out $(barebox-lds) $(barebox-common) FORCE ,$^) -# Generate new uboot version -quiet_cmd_uboot_version = GEN .version - cmd_uboot_version = set -e; \ +# Generate new barebox version +quiet_cmd_barebox_version = GEN .version + cmd_barebox_version = set -e; \ if [ ! -r .version ]; then \ rm -f .version; \ echo 1 >.version; \ @@ -526,16 +526,16 @@ quiet_cmd_uboot_version = GEN .version quiet_cmd_sysmap = SYSMAP cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap -# Link of uboot +# Link of barebox # Generate System.map and verify that the content is consistent -# Use + in front of the uboot_version rule to silent warning with make -j2 +# Use + in front of the barebox_version rule to silent warning with make -j2 # First command is ':' to allow us to use + in front of the rule -define rule_uboot__ +define rule_barebox__ : - $(call cmd,uboot__) + $(call cmd,barebox__) - $(Q)echo 'cmd_$@ := $(cmd_uboot__)' > $(@D)/.$(@F).cmd + $(Q)echo 'cmd_$@ := $(cmd_barebox__)' > $(@D)/.$(@F).cmd $(Q)$(if $($(quiet)cmd_sysmap), \ echo ' $($(quiet)cmd_sysmap) System.map' &&) \ @@ -547,20 +547,20 @@ define rule_uboot__ endef ifdef CONFIG_KALLSYMS -# Generate section listing all symbols and add it into uboot $(kallsyms.o) +# Generate section listing all symbols and add it into barebox $(kallsyms.o) # It's a three stage process: -# o .tmp_uboot1 has all symbols and sections, but __kallsyms is +# o .tmp_barebox1 has all symbols and sections, but __kallsyms is # empty # Running kallsyms on that gives us .tmp_kallsyms1.o with -# the right size - uboot version is updated during this step -# o .tmp_uboot2 now has a __kallsyms section of the right size, +# the right size - barebox version is updated during this step +# o .tmp_barebox2 now has a __kallsyms section of the right size, # but due to the added section, some addresses have shifted. # From here, we generate a correct .tmp_kallsyms2.o -# o The correct .tmp_kallsyms2.o is linked into the final uboot. -# o Verify that the System.map from uboot matches the map from -# .tmp_uboot2, just in case we did not generate kallsyms correctly. +# o The correct .tmp_kallsyms2.o is linked into the final barebox. +# o Verify that the System.map from barebox matches the map from +# .tmp_barebox2, just in case we did not generate kallsyms correctly. # o If CONFIG_KALLSYMS_EXTRA_PASS is set, do an extra pass using -# .tmp_uboot3 and .tmp_kallsyms3.o. This is only meant as a +# .tmp_barebox3 and .tmp_kallsyms3.o. This is only meant as a # temporary bypass to allow the kernel to be built while the # maintainers work out what went wrong with kallsyms. @@ -575,22 +575,22 @@ kallsyms.o := .tmp_kallsyms$(last_kallsyms).o define verify_kallsyms $(Q)$(if $($(quiet)cmd_sysmap), \ echo ' $($(quiet)cmd_sysmap) .tmp_System.map' &&) \ - $(cmd_sysmap) .tmp_uboot$(last_kallsyms) .tmp_System.map + $(cmd_sysmap) .tmp_barebox$(last_kallsyms) .tmp_System.map $(Q)cmp -s System.map .tmp_System.map || \ (echo Inconsistent kallsyms data; \ echo Try setting CONFIG_KALLSYMS_EXTRA_PASS; \ rm .tmp_kallsyms* ; /bin/false ) endef -# Update uboot version before link +# Update barebox version before link # Use + in front of this rule to silent warning about make -j1 # First command is ':' to allow us to use + in front of this rule -cmd_ksym_ld = $(cmd_uboot__) +cmd_ksym_ld = $(cmd_barebox__) define rule_ksym_ld : - +$(call cmd,uboot_version) - $(call cmd,uboot__) - $(Q)echo 'cmd_$@ := $(cmd_uboot__)' > $(@D)/.$(@F).cmd + +$(call cmd,barebox_version) + $(call cmd,barebox__) + $(Q)echo 'cmd_$@ := $(cmd_barebox__)' > $(@D)/.$(@F).cmd endef # Generate .S file with all kernel symbols @@ -600,18 +600,18 @@ quiet_cmd_kallsyms = KSYM $@ .tmp_kallsyms1.o .tmp_kallsyms2.o .tmp_kallsyms3.o: %.o: %.S scripts FORCE $(call if_changed_dep,as_o_S) -.tmp_kallsyms%.S: .tmp_uboot% $(KALLSYMS) +.tmp_kallsyms%.S: .tmp_barebox% $(KALLSYMS) $(call cmd,kallsyms) -# .tmp_uboot1 must be complete except kallsyms, so update uboot version -.tmp_uboot1: $(uboot-lds) $(uboot-all) FORCE +# .tmp_barebox1 must be complete except kallsyms, so update barebox version +.tmp_barebox1: $(barebox-lds) $(barebox-all) FORCE $(call if_changed_rule,ksym_ld) -.tmp_uboot2: $(uboot-lds) $(uboot-all) .tmp_kallsyms1.o FORCE - $(call if_changed,uboot__) +.tmp_barebox2: $(barebox-lds) $(barebox-all) .tmp_kallsyms1.o FORCE + $(call if_changed,barebox__) -.tmp_uboot3: $(uboot-lds) $(uboot-all) .tmp_kallsyms2.o FORCE - $(call if_changed,uboot__) +.tmp_barebox3: $(barebox-lds) $(barebox-all) .tmp_kallsyms2.o FORCE + $(call if_changed,barebox__) # Needs to visit scripts/ before $(KALLSYMS) can be used. $(KALLSYMS): scripts ; @@ -619,7 +619,7 @@ $(KALLSYMS): scripts ; # Generate some data for debugging strange kallsyms problems debug_kallsyms: .tmp_map$(last_kallsyms) -.tmp_map%: .tmp_uboot% FORCE +.tmp_map%: .tmp_barebox% FORCE ($(OBJDUMP) -h $< | $(AWK) '/^ +[0-9]/{print $$4 " 0 " $$2}'; $(NM) $<) | sort > $@ .tmp_map3: .tmp_map2 @@ -630,39 +630,39 @@ endif # ifdef CONFIG_KALLSYMS # Do modpost on a prelinked vmlinux. The finally linked vmlinux has # relevant sections renamed as per the linker script. -quiet_cmd_uboot-modpost = LD $@ - cmd_uboot-modpost = $(LD) $(LDFLAGS) -r -o $@ \ - $(vmlinux-init) --start-group $(uboot-main) --end-group \ - $(filter-out $(uboot-init) $(uboot-main) $(uboot-lds) FORCE ,$^) -define rule_uboot-modpost +quiet_cmd_barebox-modpost = LD $@ + cmd_barebox-modpost = $(LD) $(LDFLAGS) -r -o $@ \ + $(vmlinux-init) --start-group $(barebox-main) --end-group \ + $(filter-out $(barebox-init) $(barebox-main) $(barebox-lds) FORCE ,$^) +define rule_barebox-modpost : - +$(call cmd,uboot-modpost) + +$(call cmd,barebox-modpost) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@ - $(Q)echo 'cmd_$@ := $(cmd_uboot-modpost)' > $(dot-target).cmd + $(Q)echo 'cmd_$@ := $(cmd_barebox-modpost)' > $(dot-target).cmd endef -uboot.bin: uboot - $(Q)$(OBJCOPY) -O binary uboot uboot.bin - $(Q)$(OBJDUMP) -d uboot > uboot.S +barebox.bin: barebox + $(Q)$(OBJCOPY) -O binary barebox barebox.bin + $(Q)$(OBJDUMP) -d barebox > barebox.S -# uboot image -uboot: $(uboot-lds) $(uboot-head) $(uboot-common) $(kallsyms.o) FORCE - $(call uboot-modpost) - $(call if_changed_rule,uboot__) +# barebox image +barebox: $(barebox-lds) $(barebox-head) $(barebox-common) $(kallsyms.o) FORCE + $(call barebox-modpost) + $(call if_changed_rule,barebox__) $(Q)rm -f .old_version # The actual objects are generated when descending, # make sure no implicit rule kicks in -$(sort $(uboot-head) $(uboot-common) ) $(uboot-lds): $(uboot-dirs) ; +$(sort $(barebox-head) $(barebox-common) ) $(barebox-lds): $(barebox-dirs) ; -# Handle descending into subdirectories listed in $(uboot-dirs) +# Handle descending into subdirectories listed in $(barebox-dirs) # Preset locale variables to speed up the build process. Limit locale # tweaks to this spot to avoid wrong language settings when running # make menuconfig etc. # Error messages still appears in the original language -PHONY += $(uboot-dirs) -$(uboot-dirs): prepare scripts +PHONY += $(barebox-dirs) +$(barebox-dirs): prepare scripts $(Q)$(MAKE) $(build)=$@ # Build the kernel release string @@ -754,7 +754,7 @@ ifneq ($(KBUILD_SRC),) /bin/false; \ fi; $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi; - $(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/u-boot.h ]; then \ + $(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/barebox.h ]; then \ ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ fi endif @@ -778,10 +778,10 @@ prepare0: archprepare FORCE # All the preparing.. prepare prepare-all: prepare0 -# Leave this as default for preprocessing uboot.lds.S, which is now +# Leave this as default for preprocessing barebox.lds.S, which is now # done in arch/$(ARCH)/kernel/Makefile -export CPPFLAGS_uboot.lds += -P -C -U$(ARCH) +export CPPFLAGS_barebox.lds += -P -C -U$(ARCH) # FIXME: The asm symlink changes when $(ARCH) changes. That's # hard to detect, but I suppose "make mrproper" is a good idea @@ -869,7 +869,7 @@ all: modules # Build modules PHONY += modules -modules: $(uboot-dirs) $(if $(KBUILD_BUILTIN),uboot) +modules: $(barebox-dirs) $(if $(KBUILD_BUILTIN),barebox) @echo ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost @@ -937,9 +937,9 @@ endif # CONFIG_MODULES # Directories & files removed with 'make clean' CLEAN_DIRS += $(MODVERDIR) -CLEAN_FILES += uboot System.map include/uboot_default_env.h \ - .tmp_version .tmp_uboot* uboot.bin uboot.S \ - .tmp_kallsyms* uboot_default_env +CLEAN_FILES += barebox System.map include/barebox_default_env.h \ + .tmp_version .tmp_barebox* barebox.bin barebox.S \ + .tmp_kallsyms* barebox_default_env # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include2 usr/include @@ -952,7 +952,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \ # clean: rm-dirs := $(CLEAN_DIRS) clean: rm-files := $(CLEAN_FILES) -clean-dirs := $(addprefix _clean_,$(srctree) $(uboot-alldirs)) +clean-dirs := $(addprefix _clean_,$(srctree) $(barebox-alldirs)) PHONY += $(clean-dirs) clean archclean $(clean-dirs): @@ -1025,7 +1025,7 @@ help: @echo '' @echo 'Other generic targets:' @echo ' all - Build all targets marked with [*]' - @echo '* uboot - Build the bare kernel' + @echo '* barebox - Build the bare kernel' @echo ' dir/ - Build all files in dir and below' @echo ' dir/file.[ois] - Build specified target only' @echo ' dir/file.ko - Build module including final link' diff --git a/README b/README index ef691b657..e8a280fe3 100644 --- a/README +++ b/README @@ -1,8 +1,8 @@ -U2Boot +barebox ------ -This is u2boot, our proposal for a next generation of the famous U-Boot -bootloader. U-Boot offers an excellent choice as a bootloader for +This is barebox, our proposal for a next generation of the famous barebox +bootloader. barebox offers an excellent choice as a bootloader for today's embedded systems, seen from a user's point of view. Nevertheless, there are quite some design flaws which turned out over the last years and we think that they cannot be solved in a production @@ -12,7 +12,7 @@ about losing support for old boards. General features include: - A posix based file API - inside U-Boot the usual open/close/read/write/lseek functions are used. + inside barebox the usual open/close/read/write/lseek functions are used. This makes it familiar to everyone who has programmed under unix systems. - usual shell commands like ls/cd/mkdir/echo/cat,... @@ -46,12 +46,12 @@ General features include: the code. - simulation target - U-Boot can be compiled to run under Linux. While this is rather useless + barebox can be compiled to run under Linux. While this is rather useless in real world this is a great debugging and development aid. New features can be easily developped and tested on long train journeys and started under gdb. There is a console driver for linux which emulates a serial device and a tap based ethernet driver. Linux files can be mapped to - devices under U-Boot to emulate storage devices. + devices under barebox to emulate storage devices. - device parameter support Each device can have a unlimited number of parameters. They can be accessed @@ -64,7 +64,7 @@ General features include: - getopt There is a small getopt implementation. Some commands got really - complicated (both in code and in usage) due to the fact that U-Boot only + complicated (both in code and in usage) due to the fact that barebox only allowed positional parameters. - editor @@ -72,16 +72,16 @@ General features include: except the ones really needed: moving the cursor and typing characters. -Building U-Boot +Building barebox --------------- -U-Boot uses the Linux kernel's build system. It consists of two parts: +barebox uses the Linux kernel's build system. It consists of two parts: the makefile infrastructure (kbuild), plus a configuration system -(kconfig). So building U-Boot is very similar to building the Linux +(kconfig). So building barebox is very similar to building the Linux kernel. -For the examples below, we use the User Mode U-Boot implementation, which -is a port of U-Boot to the Linux userspace. This makes it possible to +For the examples below, we use the User Mode barebox implementation, which +is a port of barebox to the Linux userspace. This makes it possible to test drive the code without having real hardware. So for this test scenario, ARCH=sandbox is the valid architecture selection. This currently only works on ia32 hosts and partly on x86-64. @@ -89,7 +89,7 @@ only works on ia32 hosts and partly on x86-64. Selection of the architecture and the cross compiler can be done by using the environment variables ARCH and CROSS_COMPILE. -In order to configure the various aspects of U-Boot, start the U-Boot +In order to configure the various aspects of barebox, start the barebox configuration system: # make menuconfig @@ -100,44 +100,44 @@ finished (you can simulate this by using the standard demo config file with 'make sandbox_defconfig'), there is a .config file in the toplevel directory of the sourcode. -Once U-Boot is configured, we can start the compilation +Once barebox is configured, we can start the compilation # make -If everything goes well, the result is a file called uboot: +If everything goes well, the result is a file called barebox: - # ls -l uboot - -rwxr-xr-x 1 rsc ptx 114073 Jun 26 22:34 uboot + # ls -l barebox + -rwxr-xr-x 1 rsc ptx 114073 Jun 26 22:34 barebox -U-Boot usually needs an environment for storing the configuation data. +barebox usually needs an environment for storing the configuation data. You can generate an environment using the example environment contained in examples/environment: - # ./scripts/ubootenv -s -p 0x10000 examples/environment/ env.bin + # ./scripts/bareboxenv -s -p 0x10000 examples/environment/ env.bin To get some files to play with you can generate a cramfs image: # mkcramfs somedir/ cramfs.bin -The U-Boot image is a normal Linux executable, so it can be started +The barebox image is a normal Linux executable, so it can be started just like every other program: - # ./uboot -e env.bin -i cramfs.bin + # ./barebox -e env.bin -i cramfs.bin - U-Boot 2.0.0-trunk (Jun 26 2007 - 22:34:38) + barebox 2.0.0-trunk (Jun 26 2007 - 22:34:38) loading environment from /dev/env0 - uboot> / + barebox> / -Specifying -[ie] tells U-Boot to map the file as a device +Specifying -[ie] tells barebox to map the file as a device under /dev. Files given with '-e' will appear as /dev/env[n]. Files given with '-i' will appear as /dev/fd[n]. -If U-Boot finds a valid configuration sector on /dev/env0 it will +If barebox finds a valid configuration sector on /dev/env0 it will load it to /env. It then executes /env/init if it exists. If you have -loaded the example environment U-Boot will show you a menu asking for +loaded the example environment barebox will show you a menu asking for your settings. -If you have started U-Boot as root you will find a new tap device on your -host which you can configure using ifconfig. Once you configured U-Boots +If you have started barebox as root you will find a new tap device on your +host which you can configure using ifconfig. Once you configured bareboxs network settings accordingly you can do a ping or tftpboot. If you have mapped a cramfs image try mounting it with @@ -148,7 +148,7 @@ If you have mapped a cramfs image try mounting it with Memory can be examined as usual using md/mw commands. They both understand the -f option to tell the commands that they should work on the specified files instead of /dev/mem which holds the complete address space. -Note that if you call 'md /dev/fd0' (without -f) U-Boot will segfault on +Note that if you call 'md /dev/fd0' (without -f) barebox will segfault on the host, because it will interpret /dev/fd0 as a number. Directory layout diff --git a/TODO b/TODO index a28927108..27ffb9895 100644 --- a/TODO +++ b/TODO @@ -16,10 +16,10 @@ TODO Run-up and run-down should be reentrant, so if bootm is failing the system can re-initialize devices. csc 21.03.2008 19:48:49) [ ] Clean up make system. Currently I think there are many things from the - Linux make system which are not needed for U-Boot. + Linux make system which are not needed for barebox. (Please retain definitions and related for module loading and relocation, so - that special U-Boot modules containing an ELF object can be linked to the - running U-Boot. csc 21.03.2008 19:52:49) + that special barebox modules containing an ELF object can be linked to the + running barebox. csc 21.03.2008 19:52:49) [ ] get/set for nonextisting parameters crashes [ ] There is a xmalloc function which panics when out of memory. Use this function where we don't want to check for oom. Same applies to @@ -69,7 +69,7 @@ TODO preprocessor. The #ifdefs should be located in their related header files only. [ ] Create an example board, which implements all functions stubs required - to compile a full U-Boot build. Functions are just stubs containing a + to compile a full barebox build. Functions are just stubs containing a panic() call - Real code must be filled in accordingly. Can be copied as starting point for a new target board. [ ] Add generic PCI bios code and a PCI bus driver model. The driver should @@ -81,14 +81,14 @@ TODO DONE ---- -[x] Rename vmlinux -> u-boot +[x] Rename vmlinux -> barebox [x] Implement current work directory [x] ARCH=linux should catch ctrl-c [x] Implement 'rm' [x] the mount command currently does not accept a full path (i.e. /dev/nor0) but only a device id string (nor0). This sucks. [x] FS support is not optional eventhough the Kconfig system claims it. -[x] U-Boot used to have support for different consoles. The old code was huge and +[x] barebox used to have support for different consoles. The old code was huge and ineffective, so I removed it. Reimplement it using the driver model. [x] Mount without options should show mounted filesystems [x] Add/fix help texts for commands diff --git a/arch/architecture.dox b/arch/architecture.dox index 238385275..5f2b45879 100644 --- a/arch/architecture.dox +++ b/arch/architecture.dox @@ -5,7 +5,7 @@ Never include an object file by name directly! Linker Script Files defines the layout, not the content. Content is defined in objecfiles instead. -Don't rely on the given object file order to create your binary U-Boot v2! This +Don't rely on the given object file order to create your binary barebox v2! This may work, but is not relyable in all cases (and its a very bad style)! For the special case some layout contraints exists, use specific section @@ -19,11 +19,11 @@ For example the ARM architecture starts its reset code at address 0x0000000, the x86 architecture at 0x000FFFF0, PowerPC at 0x00000100 or 0xFFFFF100. So for the special reset code on all architectures it must be located at -architecture specific locations within the binary U-Boot image. +architecture specific locations within the binary barebox image. All reset code uses section ".text_entry" for its localisation within the -binary U-Boot image. Its up to the linker script file to use this section name -to find the right place in whatever environment and U-Boot sizes. +binary barebox image. Its up to the linker script file to use this section name +to find the right place in whatever environment and barebox sizes. @code .section ".text_entry","ax" @@ -45,7 +45,7 @@ Features required for every CPU: @section time_keeping Time keeping -In U-Boot-v2 we are using the clocksource mechanism from the Linux Kernel. +In barebox we are using the clocksource mechanism from the Linux Kernel. This makes it fairly easy to add timer functionality for a new board or architecture. @@ -78,7 +78,7 @@ the Linux Kernel can be used nearly 1:1, except for the register accesses. Note: For clocksources the __lshrdi3 symbol is needed. You can find the function for your architecture in the Linux Kernel or a libc of your choice. -Note: U-Boot-v2 expects an upward counting counter! +Note: barebox expects an upward counting counter! @section reset_function Reset function diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a4b6c9ecc..8a8323ffe 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 4f8421737..47b002f9d 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 e973a3068..5cd1ac2ac 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 5e49aab31..f77bb70cc 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 f198e5a40..258b82eea 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 b1f8b3039..c81371d57 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 c54c34002..0e15bc56e 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 62ec009d9..d9cefd417 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 6dbea506e..d48adf5ec 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 af6e3cd4d..bc9bd6ac9 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 8c1a77ed1..6589ca8db 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 79f6e9fbf..d40fbd2fb 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 b84f6a39c..531533307 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 0c6d39850..81bd0c101 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 f72b10c54..10e2a05a0 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 25ca7ed2f..7ae2065d7 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 c35d7aa66..b4fb2d994 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 88183d519..0c9ac5fef 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 036792900..c4df35470 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 9c9a0b763..18543453c 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 71a53a7b2..d3d723f55 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 154f8cc46..501e9b99e 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 b990cadee..e7bcda978 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 8ad03e410..43bc5dddd 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 similarity index 94% rename from arch/arm/include/asm/u-boot-arm.h rename to arch/arm/include/asm/barebox-arm.h index 539135add..6a00d10d1 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 similarity index 86% rename from arch/arm/include/asm/u-boot.h rename to arch/arm/include/asm/barebox.h index 298f9e37b..c9372dab9 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 09f1be04e..d1165788c 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 00e0ea570..26c318b0e 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 489424707..8ac9ff4ae 100644 --- a/arch/arm/lib/arm.c +++ b/arch/arm/lib/arm.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c index 365a4d278..25b7744b9 100644 --- a/arch/arm/lib/armlinux.c +++ b/arch/arm/lib/armlinux.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include 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
\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 similarity index 85% rename from arch/arm/lib/u-boot.lds.S rename to arch/arm/lib/barebox.lds.S index a47828157..c8d1bb9d8 100644 --- a/arch/arm/lib/u-boot.lds.S +++ b/arch/arm/lib/barebox.lds.S @@ -22,7 +22,7 @@ * */ -#include +#include 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 106aa39df..3b76f8e34 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 \. +barebox binary from the NAND flash memory prior returning from \. When \ 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 6a8072213..b6efe8780 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 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 similarity index 100% rename from arch/arm/mach-imx/include/mach/u-boot.lds.h rename to 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 e9b5ca01f..76ab6b9be 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 4af945f4d..76ae6bdfe 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 857ca3eb5..d5a7f8be3 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 1221238de..5c4701fe4 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 22694f236..2a509d84f 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 2badc3f85..258a122ef 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 9d2d2d110..b9fecf81a 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 43967209f..13e17d476 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 c89f50b81..d7467435d 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 4e81ae80d..2727fd63d 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 872ae5abc..21a190269 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 76f80e68c..7337d4c54 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 794d2fa8f..e5a2addff 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 2b25dc153..e966d8e7c 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 4613e5976..dddd0187c 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 fd6b0f396..e8004e588 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 diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 6199fed6f..dbb90814f 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 447270453..16bf2c285 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 81efff09b..434536248 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 similarity index 92% rename from arch/blackfin/include/asm/u-boot.h rename to arch/blackfin/include/asm/barebox.h index ec3933803..2fcf31ce9 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 39410de4e..cdcb2f8e5 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 f2d1e65be..8349d207d 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 219021597..5d0b5094b 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 3b4df4e13..1ba7a51d1 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 586e3cf18..a7c86642d 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 108c2792a..f8bb7bbe3 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 f031c86d7..eadef4582 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 690b6f303..cd2083288 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 0a8551218..8a24dd642 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 7a3166037..5fb1db400 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 1a13d908e..8b0f30df5 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 bf90cd56c..b51e6d1c4 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 1b9ee0198..72fb6fa3d 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 f1f2b5ffc..98397ca5f 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 7095e9562..a5acd0865 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 afd57773a..a2f53c9eb 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 9e6d817fc..fd47cf647 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 440aaf9d9..99e4850cc 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 883009ae0..5141a5c6f 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 d84b6365b..59a381e49 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 b1dde4aba..893233f2d 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 6058908e2..e548f6316 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 c8b1a3a98..752055696 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 fdd0091e9..ce5f3a54c 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 f8451cdbf..9853ed2ce 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 41a6ad433..e81fa9a6d 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 820a33cc7..82ea53d2d 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 3924fd9d2..594878c19 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 fcda7861a..ce479b9d1 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 d40595779..4b3a3c12e 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 diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 313a8f14f..c9608da5c 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -1,18 +1,18 @@ # -# Default location of link U-Boot Image on M68k/Coldfire +# Default location of link barebox Image on M68k/Coldfire # config ARCH_TEXT_BASE hex default 0x07f00000 if MACH_MCF54xx default 0x07f00000 if MACH_MCF5445x help - Vector table for M68k and U-Boot Link Address + Vector table for M68k and barebox Link Address On M68k/Coldfire cores all exceptions and interrupts are routed through a vector array. This vector is by default at address 0x0000_0000, but can be moved to any other 1MB aligned address. - We take advantage of this to move U-Boot out of low memory. Some BDM + We take advantage of this to move barebox out of low memory. Some BDM debuggers won't like a moved vector base and might need tweaking to work. @@ -171,7 +171,7 @@ config INITRD_TAG endmenu # -# Common U-Boot options +# Common barebox options # source common/Kconfig diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 0f2c4f324..f377325ad 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -2,20 +2,20 @@ # (C) Copyright 2007 Carsten Schlote # See file CREDITS for list of people who contributed to this project. # -# This file is part of U-Boot V2. +# This file is part of barebox. # -# U-Boot V2 is free software: you can redistribute it and/or modify +# barebox 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 3 of the License, or # (at your option) any later version. # -# U-Boot V2 is distributed in the hope that it will be useful, +# barebox 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 U-Boot V2. If not, see . +# along with barebox. If not, see . # CPPFLAGS += -isystem $(gccincdir) -D __M68K__ \ @@ -42,8 +42,8 @@ AFLAGS += -gdwarf-2 -save-temps # FIXME - remove overide CFLAGS += -msoft-float -mcfv4e -gdwarf-2 -feliminate-unused-debug-types \ -fmerge-all-constants -# Incompatible code in U-Boot for -std=c99 -LDFLAGS_uboot :=-L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc +# Incompatible code in barebox for -std=c99 +LDFLAGS_barebox :=-L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc # --verbose --stats machdirs := $(patsubst %,arch/m68k/mach-%/,$(machine-y)) @@ -77,7 +77,7 @@ endif common-y += $(BOARD) $(MACH) common-y += arch/m68k/lib/ arch/m68k/cpu/ -lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/m68k/lib/u-boot.lds -lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/u-boot.lds +lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/m68k/lib/barebox.lds +lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/barebox.lds -CLEAN_FILES += arch/m68k/lib/u-boot.lds +CLEAN_FILES += arch/m68k/lib/barebox.lds diff --git a/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig b/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig index f867e511d..ba21a008d 100644 --- a/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig +++ b/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig @@ -52,7 +52,7 @@ CONFIG_EARLY_INITDATA_RAM_SIZE=0x1f00 CONFIG_EARLY_INITDATA_SIZE=0x100 CONFIG_DEBUG_INITCALLS=y CONFIG_USE_IRQ=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y diff --git a/arch/m68k/configs/phycore_mcf54xx_defconfig b/arch/m68k/configs/phycore_mcf54xx_defconfig index 7670c2095..34ca73ffc 100644 --- a/arch/m68k/configs/phycore_mcf54xx_defconfig +++ b/arch/m68k/configs/phycore_mcf54xx_defconfig @@ -52,7 +52,7 @@ CONFIG_EARLY_INITDATA_RAM_SIZE=0x1f00 CONFIG_EARLY_INITDATA_SIZE=0x100 CONFIG_DEBUG_INITCALLS=y CONFIG_USE_IRQ=y -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y diff --git a/arch/m68k/cpu/Makefile b/arch/m68k/cpu/Makefile index 4653534e4..2e434af4e 100644 --- a/arch/m68k/cpu/Makefile +++ b/arch/m68k/cpu/Makefile @@ -2,20 +2,20 @@ # (C) Copyright 2007 Carsten Schlote # See file CREDITS for list of people who contributed to this project. # -# This file is part of U-Boot V2. +# This file is part of barebox. # -# U-Boot V2 is free software: you can redistribute it and/or modify +# barebox 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 3 of the License, or # (at your option) any later version. # -# U-Boot V2 is distributed in the hope that it will be useful, +# barebox 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 U-Boot V2. If not, see . +# along with barebox. If not, see . # obj-y += cpu.o diff --git a/arch/m68k/cpu/cpu.c b/arch/m68k/cpu/cpu.c index c27d08901..9268785a4 100644 --- a/arch/m68k/cpu/cpu.c +++ b/arch/m68k/cpu/cpu.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file @@ -134,7 +134,7 @@ void cpu_cache_disable(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) @@ -157,7 +157,7 @@ int cleanup_before_linux (void) * For M68K 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. */ diff --git a/arch/m68k/cpu/cw_console_io.c b/arch/m68k/cpu/cw_console_io.c index b0575e4c8..417a1b48b 100644 --- a/arch/m68k/cpu/cw_console_io.c +++ b/arch/m68k/cpu/cw_console_io.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file @@ -30,7 +30,7 @@ #ifdef CONFIG_HAS_EARLY_INIT -#if 0 // FIXME - make a CW debug port serial driver for u-boot +#if 0 // FIXME - make a CW debug port serial driver for barebox /* * The result of an I/O command can be any one of the following. diff --git a/arch/m68k/cpu/early_init_support.c b/arch/m68k/cpu/early_init_support.c index 2f6be4353..be4a9e4cb 100644 --- a/arch/m68k/cpu/early_init_support.c +++ b/arch/m68k/cpu/early_init_support.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/cpu/interrupts.c b/arch/m68k/cpu/interrupts.c index 9fc64a124..4e1ff1273 100644 --- a/arch/m68k/cpu/interrupts.c +++ b/arch/m68k/cpu/interrupts.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/cpu/start-mcfv4e.S b/arch/m68k/cpu/start-mcfv4e.S index c8885d756..df9ee4d4b 100644 --- a/arch/m68k/cpu/start-mcfv4e.S +++ b/arch/m68k/cpu/start-mcfv4e.S @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file @@ -55,13 +55,13 @@ .equ ___SP_INIT,__CORE_SRAM1+__CORE_SRAM1_SIZE-16 /* - * Vector table for M68k and U-Boot Link Address + * Vector table for M68k and barebox Link Address * * On M68k/Coldfire cores all exceptions and interrupts are routed through * a vector array. This vector is by default at address 0x0000_0000, but * can be moved to any other 1MB aligned address. * - * We take advantage of this to move U-Boot out of low memory. Some BDM + * We take advantage of this to move barebox out of low memory. Some BDM * debuggers won't like a moved vector base and might need tweaking to * work. * @@ -69,8 +69,8 @@ * 1MB aligned. */ - .globl _u_boot_start -_u_boot_start: + .globl _barebox_start +_barebox_start: VECTOR_TABLE: _VECTOR_TABLE: @@ -357,7 +357,7 @@ vectorFF: .long _asm_isr_handler * * do important init, like SDRAM, only if we don't start from memory! * * setup Memory and board specific bits prior to relocation. * * Setup stack - * * relocate U-Boot to ram + * * relocate barebox to ram * */ .globl _start @@ -446,7 +446,7 @@ saveland: * because memory timing is board-dependend, you will * find a lowlevel_init.[c|S] in your board directory. * - * Do not jump/call other u-boot code here! + * Do not jump/call other barebox code here! */ #ifdef CONFIG_MACH_DO_LOWLEVEL_INIT bsr.l board_init_lowlevel @@ -454,7 +454,7 @@ saveland: #endif /* - * relocate U-Boot Code to RAM (including copy of vectors) + * relocate barebox Code to RAM (including copy of vectors) */ relocate: lea.l %pc@(VECTOR_TABLE),%a0 @@ -516,16 +516,16 @@ skip_copy_vectors: /* * Call other half of initcode in relocated code * - * You allowed to call other U-Boot code from here + * You allowed to call other barebox code from here */ jsr.l board_init_highlevel nop #endif /* - * Now jump to real link address and U-Boot entry point + * Now jump to real link address and barebox entry point */ nop - jmp.l start_uboot + jmp.l start_barebox nop nop diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h index be3fa3f19..efbe2b88b 100644 --- a/arch/m68k/include/asm/atomic.h +++ b/arch/m68k/include/asm/atomic.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/u-boot-m68k.h b/arch/m68k/include/asm/barebox-m68k.h similarity index 73% rename from arch/m68k/include/asm/u-boot-m68k.h rename to arch/m68k/include/asm/barebox-m68k.h index 51cacae6e..c1ee75ed3 100644 --- a/arch/m68k/include/asm/u-boot-m68k.h +++ b/arch/m68k/include/asm/barebox-m68k.h @@ -2,27 +2,27 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file - * Arch dependant U-Boot defines + * Arch dependant barebox defines */ -#ifndef _U_BOOT_M68K_H_ -#define _U_BOOT_M68K_H_ 1 +#ifndef _BAREBOX_M68K_H_ +#define _BAREBOX_M68K_H_ 1 /* for the following variables, see start.S */ //extern ulong _armboot_start; /* code start */ @@ -37,4 +37,4 @@ int cleanup_before_linux(void); //int board_init(void); //int dram_init (void); -#endif /* _U_BOOT_M68K_H_ */ +#endif /* _BAREBOX_M68K_H_ */ diff --git a/arch/m68k/include/asm/u-boot.h b/arch/m68k/include/asm/barebox.h similarity index 62% rename from arch/m68k/include/asm/u-boot.h rename to arch/m68k/include/asm/barebox.h index 34deaf10d..568b2883b 100644 --- a/arch/m68k/include/asm/u-boot.h +++ b/arch/m68k/include/asm/barebox.h @@ -2,32 +2,32 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file - * @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/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index bfc305415..fee64a425 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h index 8b18fda35..a0bd27b31 100644 --- a/arch/m68k/include/asm/bootinfo.h +++ b/arch/m68k/include/asm/bootinfo.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder.h index 779fca00f..7a5fb6188 100644 --- a/arch/m68k/include/asm/byteorder.h +++ b/arch/m68k/include/asm/byteorder.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x.h b/arch/m68k/include/asm/coldfire/mcf548x.h index 6b3eff382..4bde42a57 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x.h +++ b/arch/m68k/include/asm/coldfire/mcf548x.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h index 1956f0d76..bb53eaa03 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h index c4982668c..6c779ec73 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h index 73abc07a4..4229c3675 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h index 309689f46..8eac58bfe 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h index 4d8f33142..889e75bc1 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h index bb07f7c3b..94f724fa2 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h index e7e4712bc..1e11944c4 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h index 29ac24902..738abd80a 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h index 5d494a9d4..d2200714f 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h index b7fcfced9..4ec8fdffc 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h index 3879c0dbb..9f54aaead 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h index 52bf7452f..fa3a2c9db 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h index 031e50945..23c674313 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h index a15554384..8c1164730 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h index 44f920bcb..c685af824 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h index 1f41f3231..452332d1d 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h index f4a65320c..552527d38 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h index e663ec726..558530d34 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h index 6e472f228..10d94a411 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h index d5eb4642c..a706306f2 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h index 8f46f1c3e..2fa25ce3b 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h index 0c8e92cda..0c256ef52 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h index 08c83765f..f4df976b3 100644 --- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h +++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/coldfire/mcf5xxx.h b/arch/m68k/include/asm/coldfire/mcf5xxx.h index 4e239a31d..5edde1e8b 100644 --- a/arch/m68k/include/asm/coldfire/mcf5xxx.h +++ b/arch/m68k/include/asm/coldfire/mcf5xxx.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/common.h b/arch/m68k/include/asm/common.h index 4cd02ad75..202ccad0b 100644 --- a/arch/m68k/include/asm/common.h +++ b/arch/m68k/include/asm/common.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/elf.h b/arch/m68k/include/asm/elf.h index 310179d71..57fdcb263 100644 --- a/arch/m68k/include/asm/elf.h +++ b/arch/m68k/include/asm/elf.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/hardware.h b/arch/m68k/include/asm/hardware.h index 616a4feeb..eeca64eb9 100644 --- a/arch/m68k/include/asm/hardware.h +++ b/arch/m68k/include/asm/hardware.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h index 7bbd2fe0f..b6b01cb18 100644 --- a/arch/m68k/include/asm/io.h +++ b/arch/m68k/include/asm/io.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/memory.h b/arch/m68k/include/asm/memory.h index cb60515a7..006ea3c68 100644 --- a/arch/m68k/include/asm/memory.h +++ b/arch/m68k/include/asm/memory.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/module.h b/arch/m68k/include/asm/module.h index 7036a4e12..f04d79457 100644 --- a/arch/m68k/include/asm/module.h +++ b/arch/m68k/include/asm/module.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/posix_types.h b/arch/m68k/include/asm/posix_types.h index 2e8503338..c40c41d04 100644 --- a/arch/m68k/include/asm/posix_types.h +++ b/arch/m68k/include/asm/posix_types.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h index 75086d540..b0f82d084 100644 --- a/arch/m68k/include/asm/processor.h +++ b/arch/m68k/include/asm/processor.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h index 96ea84938..8f3d39aea 100644 --- a/arch/m68k/include/asm/ptrace.h +++ b/arch/m68k/include/asm/ptrace.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/setup.h b/arch/m68k/include/asm/setup.h index 8fad34434..ee0bde8b7 100644 --- a/arch/m68k/include/asm/setup.h +++ b/arch/m68k/include/asm/setup.h @@ -2,24 +2,24 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file - * Arch dependant U-Boot defines about linux mach types + * Arch dependant barebox defines about linux mach types */ #ifndef _M68K_SETUP_H #define _M68K_SETUP_H diff --git a/arch/m68k/include/asm/string.h b/arch/m68k/include/asm/string.h index 193ec54a1..19e3de45b 100644 --- a/arch/m68k/include/asm/string.h +++ b/arch/m68k/include/asm/string.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/include/asm/types.h b/arch/m68k/include/asm/types.h index 7ce94a176..90e8bd7f7 100644 --- a/arch/m68k/include/asm/types.h +++ b/arch/m68k/include/asm/types.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile index 52ea7e954..09cfb2984 100644 --- a/arch/m68k/lib/Makefile +++ b/arch/m68k/lib/Makefile @@ -2,20 +2,20 @@ # (C) Copyright 2007 Carsten Schlote # See file CREDITS for list of people who contributed to this project. # -# This file is part of U-Boot V2. +# This file is part of barebox. # -# U-Boot V2 is free software: you can redistribute it and/or modify +# barebox 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 3 of the License, or # (at your option) any later version. # -# U-Boot V2 is distributed in the hope that it will be useful, +# barebox 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 U-Boot V2. If not, see . +# along with barebox. If not, see . # # @@ -28,4 +28,4 @@ obj-$(CONFIG_CMD_BOOTM) += m68k-linuxboot.o obj-$(CONFIG_MODULES) += m68k-module.o -extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += u-boot.lds +extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += barebox.lds diff --git a/arch/m68k/lib/u-boot.lds.S b/arch/m68k/lib/barebox.lds.S similarity index 74% rename from arch/m68k/lib/u-boot.lds.S rename to arch/m68k/lib/barebox.lds.S index 823e17a9d..fb6673dee 100644 --- a/arch/m68k/lib/u-boot.lds.S +++ b/arch/m68k/lib/barebox.lds.S @@ -2,26 +2,26 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file * Generic Linker file for M68k targets */ -#include +#include OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k") @@ -54,16 +54,16 @@ SECTIONS } =0xdeadbeef . = ALIGN(4); - __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 = .; /* End of text and rodata section */ @@ -88,5 +88,5 @@ SECTIONS _end = .; . = ALIGN(4); - _u_boot_heap_start = .; + _barebox_heap_start = .; } diff --git a/arch/m68k/lib/m68k-linuxboot.c b/arch/m68k/lib/m68k-linuxboot.c index b29e2d5c1..417a8e0cd 100644 --- a/arch/m68k/lib/m68k-linuxboot.c +++ b/arch/m68k/lib/m68k-linuxboot.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include diff --git a/arch/m68k/lib/m68k-meminit.c b/arch/m68k/lib/m68k-meminit.c index 8dfaa9c47..664ef509c 100644 --- a/arch/m68k/lib/m68k-meminit.c +++ b/arch/m68k/lib/m68k-meminit.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/m68k/lib/m68k-module.c b/arch/m68k/lib/m68k-module.c index e1fe461a3..6a4a2bc1c 100644 --- a/arch/m68k/lib/m68k-module.c +++ b/arch/m68k/lib/m68k-module.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e.dox b/arch/m68k/mach-mcfv4e.dox index 0ecfbc2c9..c6dc8f692 100644 --- a/arch/m68k/mach-mcfv4e.dox +++ b/arch/m68k/mach-mcfv4e.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_m68k_mach M68k/Coldfire based CPU (MACH) into the tree @@ -31,8 +31,8 @@ be C. When \ returns it will be assumed that there is now working RAM that can be used for all further steps. -Next step is relocation of U-Boot itself. It gets copied to the end of -available RAM and the last assembly instruction is a jump to \. +Next step is relocation of barebox itself. It gets copied to the end of +available RAM and the last assembly instruction is a jump to \. At this point of time: "runtime address == link address". diff --git a/arch/m68k/mach-mcfv4e/include/mach/clocks.h b/arch/m68k/mach-mcfv4e/include/mach/clocks.h index 50124b194..daedb7aeb 100644 --- a/arch/m68k/mach-mcfv4e/include/mach/clocks.h +++ b/arch/m68k/mach-mcfv4e/include/mach/clocks.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h b/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h index 064961d92..c58be7033 100644 --- a/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h +++ b/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/mach/hardware.h b/arch/m68k/mach-mcfv4e/include/mach/hardware.h index 46dc08897..118afa63a 100644 --- a/arch/m68k/mach-mcfv4e/include/mach/hardware.h +++ b/arch/m68k/mach-mcfv4e/include/mach/hardware.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h b/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h index e1b17d55e..8dd5ed2c1 100644 --- a/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h +++ b/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h b/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h index 4ebdd558c..1cb27822b 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h +++ b/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/fec.h b/arch/m68k/mach-mcfv4e/include/proc/fec.h index 4c9477438..16bfaa6de 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/fec.h +++ b/arch/m68k/mach-mcfv4e/include/proc/fec.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/fecbd.h b/arch/m68k/mach-mcfv4e/include/proc/fecbd.h index 92195490c..d7551c658 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/fecbd.h +++ b/arch/m68k/mach-mcfv4e/include/proc/fecbd.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h index 09adf8272..ad7f1393c 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h +++ b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h index f90600c7c..a536f147c 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h +++ b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h index bc6ec91f9..6b19d0262 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h +++ b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/net/eth.h b/arch/m68k/mach-mcfv4e/include/proc/net/eth.h index 5240c0c94..e86d0646c 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/net/eth.h +++ b/arch/m68k/mach-mcfv4e/include/proc/net/eth.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h b/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h index bc3a7a692..8b6a89c27 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h +++ b/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/net/net.h b/arch/m68k/mach-mcfv4e/include/proc/net/net.h index a2ccd7651..d6877596b 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/net/net.h +++ b/arch/m68k/mach-mcfv4e/include/proc/net/net.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/net/queue.h b/arch/m68k/mach-mcfv4e/include/proc/net/queue.h index c9da1c83a..d5c13f8a5 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/net/queue.h +++ b/arch/m68k/mach-mcfv4e/include/proc/net/queue.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/processor.h b/arch/m68k/mach-mcfv4e/include/proc/processor.h index f49b65d97..4f196bda9 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/processor.h +++ b/arch/m68k/mach-mcfv4e/include/proc/processor.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/include/proc/ptrace.h b/arch/m68k/mach-mcfv4e/include/proc/ptrace.h index dd124291d..5e120596d 100644 --- a/arch/m68k/mach-mcfv4e/include/proc/ptrace.h +++ b/arch/m68k/mach-mcfv4e/include/proc/ptrace.h @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/mcdapi/Makefile b/arch/m68k/mach-mcfv4e/mcdapi/Makefile index 7e2d5ab46..52ddaf858 100644 --- a/arch/m68k/mach-mcfv4e/mcdapi/Makefile +++ b/arch/m68k/mach-mcfv4e/mcdapi/Makefile @@ -2,20 +2,20 @@ # (C) Copyright 2007 Carsten Schlote # See file CREDITS for list of people who contributed to this project. # -# This file is part of U-Boot V2. +# This file is part of barebox. # -# U-Boot V2 is free software: you can redistribute it and/or modify +# barebox 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 3 of the License, or # (at your option) any later version. # -# U-Boot V2 is distributed in the hope that it will be useful, +# barebox 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 U-Boot V2. If not, see . +# along with barebox. If not, see . # # diff --git a/arch/m68k/mach-mcfv4e/mcf_clocksource.c b/arch/m68k/mach-mcfv4e/mcf_clocksource.c index 926a59215..8fb2fba2e 100644 --- a/arch/m68k/mach-mcfv4e/mcf_clocksource.c +++ b/arch/m68k/mach-mcfv4e/mcf_clocksource.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c b/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c index dc04a270d..c7b77abcf 100644 --- a/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c +++ b/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/multichannel_dma.c b/arch/m68k/mach-mcfv4e/multichannel_dma.c index 494fc68bd..acc104e4a 100644 --- a/arch/m68k/mach-mcfv4e/multichannel_dma.c +++ b/arch/m68k/mach-mcfv4e/multichannel_dma.c @@ -1,5 +1,5 @@ /* - * U-Boot Header File + * barebox Header File * * Generic Clocksource for V4E * diff --git a/arch/m68k/mach-mcfv4e/net/Makefile b/arch/m68k/mach-mcfv4e/net/Makefile index 45badfaaa..78c528f25 100644 --- a/arch/m68k/mach-mcfv4e/net/Makefile +++ b/arch/m68k/mach-mcfv4e/net/Makefile @@ -2,20 +2,20 @@ # (C) Copyright 2007 Carsten Schlote # See file CREDITS for list of people who contributed to this project. # -# This file is part of U-Boot V2. +# This file is part of barebox. # -# U-Boot V2 is free software: you can redistribute it and/or modify +# barebox 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 3 of the License, or # (at your option) any later version. # -# U-Boot V2 is distributed in the hope that it will be useful, +# barebox 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 U-Boot V2. If not, see . +# along with barebox. If not, see . # # diff --git a/arch/m68k/mach-mcfv4e/net/nbuf.c b/arch/m68k/mach-mcfv4e/net/nbuf.c index 5dc6027e0..234e75821 100644 --- a/arch/m68k/mach-mcfv4e/net/nbuf.c +++ b/arch/m68k/mach-mcfv4e/net/nbuf.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/net/net.c b/arch/m68k/mach-mcfv4e/net/net.c index 1bc089bdd..febabfeda 100644 --- a/arch/m68k/mach-mcfv4e/net/net.c +++ b/arch/m68k/mach-mcfv4e/net/net.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/arch/m68k/mach-mcfv4e/net/queue.c b/arch/m68k/mach-mcfv4e/net/queue.c index e573fcfd5..9f779474e 100644 --- a/arch/m68k/mach-mcfv4e/net/queue.c +++ b/arch/m68k/mach-mcfv4e/net/queue.c @@ -2,27 +2,27 @@ * Copyright (c) 2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file * Implements a first in, first out linked list * * @note Simple selfcontaining basic code - * @todo Replace by u-boot standard list functions + * @todo Replace by barebox standard list functions */ #include #include diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index 72eb36bad..2c9c5359f 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile @@ -49,4 +49,4 @@ endif common-y += $(BOARD) $(CPU) common-y += arch/ppc/lib/ -lds-y += $(BOARD)/u-boot.lds +lds-y += $(BOARD)/barebox.lds diff --git a/arch/ppc/configs/pcm030_defconfig b/arch/ppc/configs/pcm030_defconfig index 2a9b6bf8a..a03e7aaf6 100644 --- a/arch/ppc/configs/pcm030_defconfig +++ b/arch/ppc/configs/pcm030_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:49:23 2008 # CONFIG_BOARDINFO="Phytec Phycore mpc5200b tiny" @@ -42,7 +42,7 @@ CONFIG_MALLOC_SIZE=0x400000 # CONFIG_BROKEN is not set # CONFIG_EXPERIMENTAL is not set # CONFIG_RELOCATABLE is not set -CONFIG_PROMPT="uboot:" +CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y diff --git a/arch/ppc/include/asm/u-boot.h b/arch/ppc/include/asm/barebox.h similarity index 94% rename from arch/ppc/include/asm/u-boot.h rename to arch/ppc/include/asm/barebox.h index 30b44e3d2..ac81495cc 100644 --- a/arch/ppc/include/asm/u-boot.h +++ b/arch/ppc/include/asm/barebox.h @@ -18,20 +18,20 @@ * 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__ +#ifndef __BAREBOX_H__ +#define __BAREBOX_H__ /* - * Board information passed to Linux kernel from U-Boot + * Board information passed to Linux kernel from barebox * - * include/asm-ppc/u-boot.h + * include/asm-ppc/barebox.h */ #ifndef __ASSEMBLY__ @@ -131,4 +131,4 @@ typedef struct bd_info { } bd_t; #endif /* __ASSEMBLY__ */ -#endif /* __U_BOOT_H__ */ +#endif /* __BAREBOX_H__ */ diff --git a/arch/ppc/include/asm/common.h b/arch/ppc/include/asm/common.h index 843bcf71e..96de5c656 100644 --- a/arch/ppc/include/asm/common.h +++ b/arch/ppc/include/asm/common.h @@ -1,7 +1,7 @@ #ifndef __ASM_COMMON_H #define __ASM_COMMON_H -#include +#include void upmconfig (unsigned int, unsigned int *, unsigned int); ulong get_tbclk (void); diff --git a/arch/ppc/include/asm/global_data.h b/arch/ppc/include/asm/global_data.h index 482c100d8..c36df9abb 100644 --- a/arch/ppc/include/asm/global_data.h +++ b/arch/ppc/include/asm/global_data.h @@ -108,7 +108,7 @@ typedef struct global_data { void * console_addr; #endif #ifdef CONFIG_AMIGAONEG3SE - unsigned long relocaddr; /* Start address of U-Boot in RAM */ + unsigned long relocaddr; /* Start address of barebox in RAM */ #endif #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) unsigned long fb_base; /* Base address of framebuffer memory */ diff --git a/arch/ppc/lib/board.c b/arch/ppc/lib/board.c index bd701a8f1..7f8118e16 100644 --- a/arch/ppc/lib/board.c +++ b/arch/ppc/lib/board.c @@ -75,6 +75,6 @@ void board_init_r (ulong end_of_ram) /* Initialization complete - start the monitor */ - start_uboot(); + start_barebox(); } diff --git a/arch/ppc/lib/board_data.c b/arch/ppc/lib/board_data.c index 28644de10..b28830f79 100644 --- a/arch/ppc/lib/board_data.c +++ b/arch/ppc/lib/board_data.c @@ -34,7 +34,7 @@ int init_board_data(bd_t *bd) #ifdef CFG_EXTBDINFO strncpy ((char *)bd->bi_s_version, "1.2", sizeof (bd->bi_s_version)); - strncpy ((char *)bd->bi_r_version, U_BOOT_VERSION, sizeof (bd->bi_r_version)); + strncpy ((char *)bd->bi_r_version, BAREBOX_VERSION, sizeof (bd->bi_r_version)); bd->bi_procfreq = gd->cpu_clk; /* Processor Speed, In Hz */ bd->bi_plb_busfreq = gd->bus_clk; diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c index 6fe0141fb..35a9d31a8 100644 --- a/arch/ppc/lib/ppclinux.c +++ b/arch/ppc/lib/ppclinux.c @@ -81,7 +81,7 @@ static int do_bootm_linux(struct image_data *idata) ((unsigned long)initrd_data + ((initrd_len + 3) & ~3)); } else if (len1) { /* We could check here if this is a multifile image - * with only a kernel and an oftree. Original U-Boot + * with only a kernel and an oftree. Original barebox * did not do this, so leave it out for now. */ initrd_data = (void *)((unsigned long)data + ((os_len + 3) & ~3)); @@ -97,7 +97,7 @@ static int do_bootm_linux(struct image_data *idata) #ifdef CONFIG_OF_FLAT_TREE if (idata->oftree) { - /* The oftree can be given either as an uboot image or as a + /* The oftree can be given either as an barebox image or as a * binary blob. First try to read it as an image. */ oftree_handle = map_image(idata->oftree, 1); diff --git a/arch/ppc/mach-mpc5xxx/start.S b/arch/ppc/mach-mpc5xxx/start.S index 19556df16..8fca31b7a 100644 --- a/arch/ppc/mach-mpc5xxx/start.S +++ b/arch/ppc/mach-mpc5xxx/start.S @@ -23,7 +23,7 @@ */ /* - * U-Boot - Startup Code for MPC5xxx CPUs + * barebox - Startup Code for MPC5xxx CPUs */ #include @@ -317,7 +317,7 @@ _continue_init: ori r3, r3, (TEXT_BASE)@l #endif - mr r1, r3 /* Set new stack just below U-Boot code */ + mr r1, r3 /* Set new stack just below barebox code */ subi r1, r1, 0x10 mr r10, r3 /* Save copy of Destination Address */ @@ -333,7 +333,7 @@ calc_source: before_relocate: /* - * We are now ready to copy U-Boot to RAM. + * We are now ready to copy barebox to RAM. * * destination = r3 * source = r4 @@ -828,8 +828,8 @@ pc: _text_base: .long TEXT_BASE -.globl _u_boot_start -_u_boot_start: +.globl _barebox_start +_barebox_start: .long _start .globl _bss_start diff --git a/arch/ppc/mach-ppc.dox b/arch/ppc/mach-ppc.dox index 381909adb..f7191b998 100644 --- a/arch/ppc/mach-ppc.dox +++ b/arch/ppc/mach-ppc.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_ppc_mach PowerPC based CPU into the tree diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index 57fac202f..6b8942eb1 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -4,23 +4,23 @@ CPPFLAGS += -fno-strict-aliasing machine-y := sandbox board-y := sandbox -lds-y := board/sandbox/u-boot.lds +lds-y := board/sandbox/barebox.lds TEXT_BASE = $(CONFIG_TEXT_BASE) CPPFLAGS += -P -CFLAGS += -Dmalloc=u_boot_malloc \ - -Dfree=u_boot_free -Drealloc=u_boot_realloc \ - -Dread=u_boot_read -Dwrite=u_boot_write \ - -Dopen=u_boot_open -Dclose=u_boot_close \ - -Dlseek=u_boot_lseek -Dperror=u_boot_perror \ - -Derrno=u_boot_errno -Dgetc=u_boot_getc \ - -Dputc=u_boot_putc -Dfgetc=u_boot_fgetc \ - -Dfputc=u_boot_fputc -Dfgets=u_boot_fgets \ - -Dfputs=u_boot_fputs -Dsetenv=u_boot_setenv \ - -Dgetenv=u_boot_getenv -Dprintf=u_boot_printf \ - -Dglob=u_boot_glob -Dglobfree=u_boot_globfree \ - -Dioctl=u_boot_ioctl +CFLAGS += -Dmalloc=barebox_malloc \ + -Dfree=barebox_free -Drealloc=barebox_realloc \ + -Dread=barebox_read -Dwrite=barebox_write \ + -Dopen=barebox_open -Dclose=barebox_close \ + -Dlseek=barebox_lseek -Dperror=barebox_perror \ + -Derrno=barebox_errno -Dgetc=barebox_getc \ + -Dputc=barebox_putc -Dfgetc=barebox_fgetc \ + -Dfputc=barebox_fputc -Dfgets=barebox_fgets \ + -Dfputs=barebox_fputs -Dsetenv=barebox_setenv \ + -Dgetenv=barebox_getenv -Dprintf=barebox_printf \ + -Dglob=barebox_glob -Dglobfree=barebox_globfree \ + -Dioctl=barebox_ioctl machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y)) @@ -58,10 +58,10 @@ archprepare: maketools PHONY += maketools -cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \ - -Wl,--start-group $(uboot-common) -Wl,--end-group \ +cmd_barebox__ = $(CC) -o $@ -Wl,-T,$(barebox-lds) \ + -Wl,--start-group $(barebox-common) -Wl,--end-group \ -lrt -lpthread common-y += board/sandbox/ arch/sandbox/os/ -CLEAN_FILES += board/sandbox/u-boot.lds +CLEAN_FILES += board/sandbox/barebox.lds diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig index 8ab4b6ddd..8757fd016 100644 --- a/arch/sandbox/configs/sandbox_defconfig +++ b/arch/sandbox/configs/sandbox_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 # Mon Oct 12 14:15:55 2009 # CONFIG_ARCH_TEXT_BASE=0x00000000 @@ -22,7 +22,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 is not set CONFIG_CBSIZE=1024 diff --git a/arch/sandbox/include/asm/u-boot.h b/arch/sandbox/include/asm/barebox.h similarity index 100% rename from arch/sandbox/include/asm/u-boot.h rename to arch/sandbox/include/asm/barebox.h diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile index 436fd0d3e..854aa4382 100644 --- a/arch/sandbox/lib/Makefile +++ b/arch/sandbox/lib/Makefile @@ -1,4 +1,4 @@ -CPPFLAGS_u-boot.lds = -U$(SUBARCH) -DELF_ARCH=$(ELF_ARCH) \ +CPPFLAGS_barebox.lds = -U$(SUBARCH) -DELF_ARCH=$(ELF_ARCH) \ -DELF_FORMAT="$(ELF_FORMAT)" -extra-y += u-boot.lds +extra-y += barebox.lds diff --git a/arch/sandbox/lib/u-boot.lds.S b/arch/sandbox/lib/barebox.lds.S similarity index 97% rename from arch/sandbox/lib/u-boot.lds.S rename to arch/sandbox/lib/barebox.lds.S index 25d42b1e5..53e9f6021 100644 --- a/arch/sandbox/lib/u-boot.lds.S +++ b/arch/sandbox/lib/barebox.lds.S @@ -1,4 +1,4 @@ -#include +#include OUTPUT_FORMAT(ELF_FORMAT) OUTPUT_ARCH(ELF_ARCH) @@ -71,13 +71,13 @@ SECTIONS } =0x90909090 . = ALIGN(64); - __u_boot_initcalls_start = .; - __u_boot_initcalls : { INITCALLS } - __u_boot_initcalls_end = .; + __barebox_initcalls_start = .; + __barebox_initcalls : { INITCALLS } + __barebox_initcalls_end = .; . = ALIGN(64); - __u_boot_cmd_start = .; - __u_boot_cmd : { U_BOOT_CMDS } - __u_boot_cmd_end = .; + __barebox_cmd_start = .; + __barebox_cmd : { BAREBOX_CMDS } + __barebox_cmd_end = .; PROVIDE (__etext = .); PROVIDE (_etext = .); diff --git a/arch/sandbox/mach-sandbox/include/mach/hostfile.h b/arch/sandbox/mach-sandbox/include/mach/hostfile.h index 30f9499c0..f7aca7c0c 100644 --- a/arch/sandbox/mach-sandbox/include/mach/hostfile.h +++ b/arch/sandbox/mach-sandbox/include/mach/hostfile.h @@ -9,7 +9,7 @@ struct hf_platform_data { char *name; }; -int u_boot_register_filedev(struct hf_platform_data *hf); +int barebox_register_filedev(struct hf_platform_data *hf); #endif /* __ASM_ARCH_HOSTFILE_H */ diff --git a/arch/sandbox/mach-sandbox/include/mach/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h index 09376413e..b9053d85a 100644 --- a/arch/sandbox/mach-sandbox/include/mach/linux.h +++ b/arch/sandbox/mach-sandbox/include/mach/linux.h @@ -12,7 +12,7 @@ int linux_getc (void); void linux_putc (const char c); int linux_tstc(int fd); -int u_boot_register_console(char *name_template, int stdinfd, int stdoutfd); +int barebox_register_console(char *name_template, int stdinfd, int stdoutfd); struct linux_console_data { int stdinfd; diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index e89d8a6d3..90486f889 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -1,5 +1,5 @@ /* - * common.c - common wrapper functions between U-Boot and the host + * common.c - common wrapper functions between barebox and the host * * Copyright (c) 2007 Sascha Hauer , Pengutronix * @@ -22,10 +22,10 @@ /** * @file - * @brief Common wrapper functions between U-Boot and the host + * @brief Common wrapper functions between barebox and the host */ /* - * These are host includes. Never include any U-Boot header + * These are host includes. Never include any barebox header * files here... */ #include @@ -45,7 +45,7 @@ #include #include /* - * ...except the ones needed to connect with U-Boot + * ...except the ones needed to connect with barebox */ #include #include @@ -96,7 +96,7 @@ int linux_tstc(int fd) /* * We set the timeout here to 100us, because otherwise - * U-Boot would eat all cpu resources while waiting + * barebox would eat all cpu resources while waiting * for input. */ ret = select(fd + 1, &rfds, NULL, NULL, &tv); @@ -217,7 +217,7 @@ void flush_cache(unsigned long dummy1, unsigned long dummy2) /* why should we? */ } -extern void start_uboot(void); +extern void start_barebox(void); extern void mem_malloc_init(void *start, void *end); static int add_image(char *str, char *name) @@ -267,7 +267,7 @@ static int add_image(char *str, char *name) printf("warning: mmapping %s failed\n", file); } - ret = u_boot_register_filedev(hf); + ret = barebox_register_filedev(hf); if (ret) goto err_out; return 0; @@ -329,7 +329,7 @@ int main(int argc, char *argv[]) exit(1); } - u_boot_register_console("cout", -1, fd); + barebox_register_console("cout", -1, fd); break; case 'I': fd = open(optarg, O_RDWR); @@ -338,17 +338,17 @@ int main(int argc, char *argv[]) exit(1); } - u_boot_register_console("cin", fd, -1); + barebox_register_console("cin", fd, -1); break; default: exit(1); } } - u_boot_register_console("console", fileno(stdin), fileno(stdout)); + barebox_register_console("console", fileno(stdin), fileno(stdout)); rawmode(); - start_uboot(); + start_barebox(); /* never reached */ return 0; @@ -363,12 +363,12 @@ static void print_usage(const char *prgname) { printf( "Usage: %s [OPTIONS]\n" -"Start U-Boot.\n" +"Start barebox.\n" "Options:\n" -" -i Map a file to U-Boot. This option can be given multiple\n" +" -i Map a file to barebox. This option can be given multiple\n" " times. The files will show up as /dev/fd0 ... /dev/fdx\n" -" under U-Boot.\n" -" -e Map a file to U-Boot. With this option files are mapped as\n" +" under barebox.\n" +" -e Map a file to barebox. With this option files are mapped as\n" " /dev/env0 ... /dev/envx and thus are used as default\n" " environment. An empty file generated with dd will do to get\n" " started wth an empty environment\n" @@ -381,27 +381,27 @@ static void print_usage(const char *prgname) } /** - * @page uboot_simul U-Boot Simulator + * @page barebox_simul barebox Simulator * - * U-Boot can be run as a simulator on your host to check and debug new non + * barebox can be run as a simulator on your host to check and debug new non * hardware related features. * - * @section simu_build How to build U-Boot for simulation + * @section simu_build How to build barebox for simulation * - * @section simu_run How to run U-Boot simulator + * @section simu_run How to run barebox simulator * - * $ uboot [\] + * $ barebox [\] * * Options can be: * * -i \ * - * Map a \ to U-Boot. This option can be given multiple times. The \s - * will show up as /dev/fd0 ... /dev/fdx in the U-Boot simulator. + * Map a \ to barebox. This option can be given multiple times. The \s + * will show up as /dev/fd0 ... /dev/fdx in the barebox simulator. * * -e \ * - * Map \ to U-Boot. With this option \s are mapped as /dev/env0 ... + * Map \ to barebox. With this option \s are mapped as /dev/env0 ... * /dev/envx and thus are used as default environment. A clean file generated * with dd will do to get started with an empty environment * @@ -415,6 +415,6 @@ static void print_usage(const char *prgname) * Register \ as a console capable of doing stdin. \ can be a regular * file or a fifo. * - * @section simu_dbg How to debug U-Boot simulator + * @section simu_dbg How to debug barebox simulator * */ diff --git a/board/a9m2410/env/config b/board/a9m2410/env/config index 7dbd544e2..79150ce01 100644 --- a/board/a9m2410/env/config +++ b/board/a9m2410/env/config @@ -12,10 +12,10 @@ autoboot_timeout=3 nfsroot="/nfsexport/OSELAS.BSP-Hesch-TMU-1/platform-FS_A9M2410/root" bootargs="console=ttySAC0,38400" -nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nand="/dev/mtdblock3" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel #ip=dhcp # or set your networking parameters here diff --git a/board/a9m2440/env/config b/board/a9m2440/env/config index 2667c0f23..936c35f9a 100644 --- a/board/a9m2440/env/config +++ b/board/a9m2440/env/config @@ -12,10 +12,10 @@ autoboot_timeout=3 nfsroot="/nfsexport/OSELAS.BSP-Hesch-TMU-1/platform-FS_A9M2440/root" bootargs="console=ttySAC0,38400" -nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nand="/dev/mtdblock3" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel #ip=dhcp # or set your networking parameters here diff --git a/board/at91sam9260ek/env/config b/board/at91sam9260ek/env/config index c9b0e0ea9..71d6f88cf 100644 --- a/board/at91sam9260ek/env/config +++ b/board/at91sam9260ek/env/config @@ -4,7 +4,7 @@ kernel=net root=net -# use 'dhcp' todo dhcp in uboot and in kernel +# use 'dhcp' todo dhcp in barebox and in kernel ip=dhcp # diff --git a/board/at91sam9263ek/env/bin/init b/board/at91sam9263ek/env/bin/init index 3b5748265..eaa298d65 100644 --- a/board/at91sam9263ek/env/bin/init +++ b/board/at91sam9263ek/env/bin/init @@ -30,7 +30,7 @@ if [ $? != 0 ]; then echo echo "type update_kernel nor [] to update kernel into flash" echo "type update_root nor [] to update rootfs into flash" - echo "type update_uboot_xmodem nor to update uboot into flash" + echo "type update_barebox_xmodem nor to update barebox into flash" echo exit fi diff --git a/board/at91sam9263ek/env/bin/update_uboot_xmodem b/board/at91sam9263ek/env/bin/update_barebox_xmodem similarity index 58% rename from board/at91sam9263ek/env/bin/update_uboot_xmodem rename to board/at91sam9263ek/env/bin/update_barebox_xmodem index b4feb7426..39818b585 100644 --- a/board/at91sam9263ek/env/bin/update_uboot_xmodem +++ b/board/at91sam9263ek/env/bin/update_barebox_xmodem @@ -3,15 +3,15 @@ . /env/config if [ x$1 = xnand ]; then - part=/dev/nand0.uboot + part=/dev/nand0.barebox elif [ x$1 = xnor ]; then - part=/dev/nor0.uboot + part=/dev/nor0.barebox else echo "usage: $0 nor|nand" exit 1 fi -loadb -f uboot.bin -c +loadb -f barebox.bin -c unprotect $part echo @@ -19,8 +19,8 @@ echo "erasing partition $part" erase $part echo -echo "flashing uboot.bin to $part" +echo "flashing barebox.bin to $part" echo -cp uboot.bin $part -crc32 -f uboot.bin +cp barebox.bin $part +crc32 -f barebox.bin crc32 -f $part diff --git a/board/at91sam9263ek/env/config b/board/at91sam9263ek/env/config index 5349bc359..4b322ad4d 100644 --- a/board/at91sam9263ek/env/config +++ b/board/at91sam9263ek/env/config @@ -12,13 +12,13 @@ autoboot_timeout=3 nfsroot="" bootargs="console=ttyS0,115200" -nor_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)" +nor_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" -#nand_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)" +#nand_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)" #rootpart_nand="/dev/mtdblock7" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel ip=dhcp # or set your networking parameters here diff --git a/board/board.dox b/board/board.dox index 466fc591e..12eff17be 100644 --- a/board/board.dox +++ b/board/board.dox @@ -1,7 +1,7 @@ /** @page dev_board Adapting a new Board -To add a new board to U-Boot a few steps must be done, to extend and modify -the U-Boot source tree. +To add a new board to barebox a few steps must be done, to extend and modify +the barebox source tree. @section board_add_files Files/Directories to be added @@ -58,9 +58,9 @@ at the right architecture. @note Consider to use an unique page lable. -@subsection board_lscript board/\/u-boot.ld.S +@subsection board_lscript board/\/barebox.ld.S -If your board needs a special binary U-Boot layout, you can provide a local +If your board needs a special binary barebox layout, you can provide a local board linker script file. This will replace the generic one provided by your architecture or CPU support. diff --git a/board/eco920/config.h b/board/eco920/config.h index 9aa7dde98..3fb8beb8c 100644 --- a/board/eco920/config.h +++ b/board/eco920/config.h @@ -83,7 +83,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "mtdids=nor0=physmap-flash.0\0" \ - "mtdparts=mtdparts=physmap-flash.0:128k(uboot)ro,128k(env),1536k(kernel),-(jffs2)\0" \ + "mtdparts=mtdparts=physmap-flash.0:128k(barebox)ro,128k(env),1536k(kernel),-(jffs2)\0" \ "bootargs_base=setenv bootargs console=ttyAT0,115200\0" \ "bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs ip=dhcp nfsroot=$(serverip):$(nfsrootfs),v3,tcp\0" \ "bootargs_mtd=setenv bootargs $(bootargs) $(mtdparts)\0" \ @@ -113,7 +113,7 @@ #define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } #define CFG_LONGHELP /* undef to save memory */ -#define CFG_PROMPT "uboot> " /* Monitor Command Prompt */ +#define CFG_PROMPT "barebox> " /* Monitor Command Prompt */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_MAXARGS 32 /* max number of command args */ #define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */ diff --git a/board/eukrea_cpuimx27/env/config b/board/eukrea_cpuimx27/env/config index 2547fb115..183787e5c 100644 --- a/board/eukrea_cpuimx27/env/config +++ b/board/eukrea_cpuimx27/env/config @@ -13,7 +13,7 @@ autoboot_timeout=3 video="CMO-QVGA" bootargs="console=ttymxc0,115200 fec_mac=$eth0.ethaddr rtc-pcf8563.probe=0,0x51 video=mxcfb:$video" -nor_parts="256k(uboot)ro,128k(ubootenv),1792k(kernel),-(root)" +nor_parts="256k(barebox)ro,128k(bareboxenv),1792k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" nand_parts="-(nand)" @@ -21,7 +21,7 @@ rootpart_nand="" nfsroot="" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel ip=dhcp # or set your networking parameters here diff --git a/board/eukrea_cpuimx27/lowlevel_init.S b/board/eukrea_cpuimx27/lowlevel_init.S index 5cab984e3..4622af88a 100644 --- a/board/eukrea_cpuimx27/lowlevel_init.S +++ b/board/eukrea_cpuimx27/lowlevel_init.S @@ -129,7 +129,7 @@ copy_loop: ldr pc, =1f /* Jump to SDRAM */ 1: - bl nand_boot /* Load U-Boot from NAND Flash */ + bl nand_boot /* Load barebox from NAND Flash */ ldr r1, =IMX_NFC_BASE - TEXT_BASE sub r10, r10, r1 /* adjust return address from NFC SRAM */ diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c index 3ee87e355..3a528fa36 100644 --- a/board/freescale-mx25-3-stack/3stack.c +++ b/board/freescale-mx25-3-stack/3stack.c @@ -80,7 +80,7 @@ struct mx25_nand_flash_header __flash_header mx25_3ds_header = { extern unsigned long __bss_start; -unsigned long __image_len u_boot_len = 0x40000; +unsigned long __image_len barebox_len = 0x40000; static struct fec_platform_data fec_info = { .xcv_type = RMII, @@ -208,7 +208,7 @@ static int imx25_devices_init(void) #endif /* FEC does only work when the CPLD is initialized. - * Currently we do not do this in U-Boot, so it + * Currently we do not do this in barebox, so it * does only work when Linux has been started after * the last powercycle. */ diff --git a/board/freescale-mx25-3-stack/env/config b/board/freescale-mx25-3-stack/env/config index 149619a5a..a5e492e33 100644 --- a/board/freescale-mx25-3-stack/env/config +++ b/board/freescale-mx25-3-stack/env/config @@ -12,13 +12,13 @@ autoboot_timeout=3 nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-Phytec-phyCORE-i.MX27-trunk/root" bootargs="console=ttymxc0,115200" -nor_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),-(root)" +nor_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" -nand_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),108416k(root),-(kernel1)" +nand_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),108416k(root),-(kernel1)" rootpart_nand="/dev/mtdblock7" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel #ip=dhcp # or set your networking parameters here diff --git a/board/freescale-mx25-3-stack/lowlevel_init.S b/board/freescale-mx25-3-stack/lowlevel_init.S index d622bd362..bf03390c1 100644 --- a/board/freescale-mx25-3-stack/lowlevel_init.S +++ b/board/freescale-mx25-3-stack/lowlevel_init.S @@ -129,7 +129,7 @@ copy_loop: ldr pc, =1f /* Jump to SDRAM */ 1: - bl nand_boot /* Load U-Boot from NAND Flash */ + bl nand_boot /* Load barebox from NAND Flash */ ldr r1, =IMX_NFC_BASE - TEXT_BASE sub r10, r10, r1 /* adjust return address from NFC SRAM */ diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c index efaa6d4a3..77dcf7a0c 100644 --- a/board/freescale-mx35-3-stack/3stack.c +++ b/board/freescale-mx35-3-stack/3stack.c @@ -19,7 +19,7 @@ * * Derived from: * - * * mx35_3stack.c - board file for u-boot-v1 + * * mx35_3stack.c - board file for barebox-v1 * Copyright (C) 2007, Guennadi Liakhovetski * (C) Copyright 2008-2009 Freescale Semiconductor, Inc. * diff --git a/board/freescale-mx35-3-stack/env/config b/board/freescale-mx35-3-stack/env/config index d6afdfbeb..9fcb3dc7b 100644 --- a/board/freescale-mx35-3-stack/env/config +++ b/board/freescale-mx35-3-stack/env/config @@ -12,13 +12,13 @@ autoboot_timeout=3 nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-Phytec-phyCORE-i.MX27-trunk/root" bootargs="console=ttymxc0,115200" -nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" -nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nand="/dev/mtdblock7" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel ip=dhcp # or set your networking parameters here diff --git a/board/freescale-mx35-3-stack/flash_header.c b/board/freescale-mx35-3-stack/flash_header.c index a2496a52d..968a948a8 100644 --- a/board/freescale-mx35-3-stack/flash_header.c +++ b/board/freescale-mx35-3-stack/flash_header.c @@ -45,5 +45,5 @@ struct imx_flash_header __flash_header_0x400 flash_header = { .dcd_block_len = sizeof (dcd_entry), }; -unsigned long __image_len_0x400 u_boot_len = 0x40000; +unsigned long __image_len_0x400 barebox_len = 0x40000; diff --git a/board/freescale-mx35-3-stack/lowlevel_init.S b/board/freescale-mx35-3-stack/lowlevel_init.S index a00d2af05..4e0a10293 100644 --- a/board/freescale-mx35-3-stack/lowlevel_init.S +++ b/board/freescale-mx35-3-stack/lowlevel_init.S @@ -175,7 +175,7 @@ copy_loop: ldr pc, =1f /* Jump to SDRAM */ 1: - bl nand_boot /* Load U-Boot from NAND Flash */ + bl nand_boot /* Load barebox from NAND Flash */ /* rebase the return address */ ldr r1, =IMX_NFC_BASE - TEXT_BASE diff --git a/board/imx27ads/env/config b/board/imx27ads/env/config index a14906a25..f18a86b7c 100644 --- a/board/imx27ads/env/config +++ b/board/imx27ads/env/config @@ -4,7 +4,7 @@ kernel=net root=net -# use 'dhcp' todo dhcp in uboot and in kernel +# use 'dhcp' todo dhcp in barebox and in kernel ip=dhcp eth0.ipaddr=192.168.23.164 @@ -20,6 +20,6 @@ autoboot_timeout=3 nfsroot="/tmp/imx27ads" bootargs="console=ttymxc0,115200" -mtdparts="128k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +mtdparts="128k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart="/dev/mtdblock3" diff --git a/board/imx27ads/lowlevel_init.S b/board/imx27ads/lowlevel_init.S index 2d079b615..df12aead0 100644 --- a/board/imx27ads/lowlevel_init.S +++ b/board/imx27ads/lowlevel_init.S @@ -82,7 +82,7 @@ MODE_REG_VAL0 .long 0x00000000 // system/external device dependent data NORMAL_MODE .long 0x00000000 // system/external device dependent data (SMODE=000) .endm -.macro sdram_init_uboot +.macro sdram_init_barebox /* configure 16 bit nor flash on cs0 */ writel(0x0000CC03, 0xd8002000) writel(0xa0330D01, 0xd8002004) diff --git a/board/ipe337/Makefile b/board/ipe337/Makefile index e16123812..172dfb688 100644 --- a/board/ipe337/Makefile +++ b/board/ipe337/Makefile @@ -1,4 +1,4 @@ obj-y += ipe337.o obj-y += cmd_alternate.o -extra-y += u-boot.lds +extra-y += barebox.lds diff --git a/board/ipe337/u-boot.lds.S b/board/ipe337/barebox.lds.S similarity index 85% rename from board/ipe337/u-boot.lds.S rename to board/ipe337/barebox.lds.S index 09240edbe..4299b8208 100644 --- a/board/ipe337/u-boot.lds.S +++ b/board/ipe337/barebox.lds.S @@ -1,5 +1,5 @@ /* - * U-boot - u-boot.lds.S + * barebox - barebox.lds.S * * Copyright (c) 2005-2007 Analog Device Inc. * @@ -26,7 +26,7 @@ */ #include -#include +#include OUTPUT_ARCH("bfin") SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); @@ -67,16 +67,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/board/ipe337/cmd_alternate.c b/board/ipe337/cmd_alternate.c index 78ed77c2d..538f0bfd6 100644 --- a/board/ipe337/cmd_alternate.c +++ b/board/ipe337/cmd_alternate.c @@ -48,9 +48,9 @@ static const __maybe_unused char cmd_alternate_help[] = "Usage: alternate " "\n"; -U_BOOT_CMD_START(alternate) +BAREBOX_CMD_START(alternate) .cmd = do_alternate, .usage = "count zero bits in a file", - U_BOOT_CMD_HELP(cmd_alternate_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_alternate_help) +BAREBOX_CMD_END diff --git a/board/ipe337/env/bin/init b/board/ipe337/env/bin/init index 9ca41d615..e864dc5a4 100644 --- a/board/ipe337/env/bin/init +++ b/board/ipe337/env/bin/init @@ -15,7 +15,7 @@ if [ $? != 0 ]; then echo "Type update_system [] to update rootfs into flash." echo "Type update_application [] to update applications into flash." echo "Type update_persistent [] to update persistent into flash." - echo "Type update_ubootenv [] to update ubootenv into flash (use with care!)." + echo "Type update_bareboxenv [] to update bareboxenv into flash (use with care!)." echo "Type reset_ageing to initialize the ageing partittion (use with care!)." echo exit diff --git a/board/ipe337/env/bin/update_ubootenv b/board/ipe337/env/bin/update_bareboxenv similarity index 71% rename from board/ipe337/env/bin/update_ubootenv rename to board/ipe337/env/bin/update_bareboxenv index 301072ff5..b0a32c626 100644 --- a/board/ipe337/env/bin/update_ubootenv +++ b/board/ipe337/env/bin/update_bareboxenv @@ -3,6 +3,6 @@ . /env/config image=$envimage -part=/dev/nor0.ubootenv +part=/dev/nor0.bareboxenv . /env/bin/_update $1 diff --git a/board/ipe337/env/config b/board/ipe337/env/config index 39a47ff00..7c5ee76e3 100644 --- a/board/ipe337/env/config +++ b/board/ipe337/env/config @@ -4,7 +4,7 @@ kernel=net root=net -# use 'dhcp' todo dhcp in uboot and in kernel +# use 'dhcp' todo dhcp in barebox and in kernel #ip=dhcp eth0.ipaddr=192.168.23.164 @@ -23,5 +23,5 @@ autoboot_timeout=1 nfsroot="/ptx/work/octopus/wsa/svn/OSELAS.BSP-Pipetronix-ipe337-trunk/root" bootargs="console=ttyBF0,115200" -mtdparts="128k(uboot)ro,128k(ubootenv),128k(ageing),1280k(kernel0),1280k(kernel1),8704k(system0),8704k(system1),8320k(application),4096k(persistent)" +mtdparts="128k(barebox)ro,128k(bareboxenv),128k(ageing),1280k(kernel0),1280k(kernel1),8704k(system0),8704k(system1),8320k(application),4096k(persistent)" ageing=/dev/nor0.ageing diff --git a/board/kp_ukd_r1_num/Makefile b/board/kp_ukd_r1_num/Makefile index 585203109..65f2a02fc 100644 --- a/board/kp_ukd_r1_num/Makefile +++ b/board/kp_ukd_r1_num/Makefile @@ -2,20 +2,20 @@ # (C) Copyright 2007 Carsten Schlote # See file CREDITS for list of people who contributed to this project. # -# This file is part of U-Boot V2. +# This file is part of barebox. # -# U-Boot V2 is free software: you can redistribute it and/or modify +# barebox 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 3 of the License, or # (at your option) any later version. # -# U-Boot V2 is distributed in the hope that it will be useful, +# barebox 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 U-Boot V2. If not, see . +# along with barebox. If not, see . # # The build system allows to split everything into distinct files covering an diff --git a/board/kp_ukd_r1_num/env/config b/board/kp_ukd_r1_num/env/config index 5beed3c9c..14958ba1d 100644 --- a/board/kp_ukd_r1_num/env/config +++ b/board/kp_ukd_r1_num/env/config @@ -4,7 +4,7 @@ kernel=net root=net -# use 'dhcp' todo dhcp in uboot and in kernel +# use 'dhcp' todo dhcp in barebox and in kernel ip=dhcp # diff --git a/board/kp_ukd_r1_num/highlevel_init.c b/board/kp_ukd_r1_num/highlevel_init.c index a0d4a621a..3a88cd68c 100644 --- a/board/kp_ukd_r1_num/highlevel_init.c +++ b/board/kp_ukd_r1_num/highlevel_init.c @@ -2,20 +2,20 @@ * (C) 2007,2008 konzeptpark, Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/board/kp_ukd_r1_num/kp_ukd_r1_num.c b/board/kp_ukd_r1_num/kp_ukd_r1_num.c index a9052e196..9bf1713cc 100644 --- a/board/kp_ukd_r1_num/kp_ukd_r1_num.c +++ b/board/kp_ukd_r1_num/kp_ukd_r1_num.c @@ -2,20 +2,20 @@ * (C) 2007 konzeptpark, Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ diff --git a/board/kp_ukd_r1_num/lowlevel_init.c b/board/kp_ukd_r1_num/lowlevel_init.c index 7770e101d..b3de505c2 100644 --- a/board/kp_ukd_r1_num/lowlevel_init.c +++ b/board/kp_ukd_r1_num/lowlevel_init.c @@ -2,20 +2,20 @@ * (C) 2007 konzeptpark, Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/board/kp_ukd_r1_num/pci-stubs.c b/board/kp_ukd_r1_num/pci-stubs.c index 4993284c0..b7ab7c7d7 100644 --- a/board/kp_ukd_r1_num/pci-stubs.c +++ b/board/kp_ukd_r1_num/pci-stubs.c @@ -2,20 +2,20 @@ * (C) 2007,2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/board/mmccpu/env/config b/board/mmccpu/env/config index de9268448..5367cd9f5 100644 --- a/board/mmccpu/env/config +++ b/board/mmccpu/env/config @@ -13,14 +13,14 @@ nfsroot="/home/kschwinne/src/pengutronix/OSELAS.BSP-Bucyrus-Grabowski-trunk/plat bootargs="console=ttyS0,115200 mmccpu=p299" -#nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" -nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),10240k(root),10240k(rootbu),-(data)" +#nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" +nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),10240k(root),10240k(rootbu),-(data)" rootpart_nor="/dev/mtdblock3" -#nand_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)" +#nand_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)" #rootpart_nand="/dev/mtdblock7" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel ip=dhcp # or set your networking parameters here diff --git a/board/omap/board-sdp343x.c b/board/omap/board-sdp343x.c index 0841df0f2..1e88e397d 100644 --- a/board/omap/board-sdp343x.c +++ b/board/omap/board-sdp343x.c @@ -19,7 +19,7 @@ * Run time initialization includes * @li serial @ref serial_ns16550.c driver device definition * - * 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 @@ -142,7 +142,7 @@ static void sdrc_init(void) * @brief Do the pin muxing required for Board operation. * * See @ref MUX_VAL for description of the muxing mode. Since some versions - * of Linux depend on all pin muxing being done at U-Boot level, we may need to + * of Linux depend on all pin muxing being done at barebox level, we may need to * enable CONFIG_MACH_OMAP_ADVANCED_MUX to enable the full fledged pin muxing. * * @return void diff --git a/board/pcm030/Makefile b/board/pcm030/Makefile index bc830dfb7..e7d744bfb 100644 --- a/board/pcm030/Makefile +++ b/board/pcm030/Makefile @@ -1,2 +1,2 @@ obj-y += pcm030.o -extra-y += u-boot.lds +extra-y += barebox.lds diff --git a/board/pcm030/u-boot.lds.S b/board/pcm030/barebox.lds.S similarity index 88% rename from board/pcm030/u-boot.lds.S rename to board/pcm030/barebox.lds.S index 29ab0ed69..ab9933567 100644 --- a/board/pcm030/u-boot.lds.S +++ b/board/pcm030/barebox.lds.S @@ -21,7 +21,7 @@ * MA 02111-1307 USA */ -#include +#include OUTPUT_ARCH("powerpc") /* Do we need any of these for elf? @@ -30,7 +30,7 @@ SECTIONS { . = TEXT_BASE; - /* Read-only sections, merged into text segment: */ + /* Read-only sections, merged into text segment: */ .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } @@ -96,17 +96,17 @@ SECTIONS PROVIDE (edata = .); . = .; - __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 = .; - __initcall_entries = (__u_boot_initcalls_end - __u_boot_initcalls_start) >> 2; + __barebox_initcalls_start = .; + .barebox_initcalls : { INITCALLS } + __barebox_initcalls_end = .; + __initcall_entries = (__barebox_initcalls_end - __barebox_initcalls_start) >> 2; __usymtab_start = .; - __usymtab : { U_BOOT_SYMS } + __usymtab : { BAREBOX_SYMS } __usymtab_end = .; __early_init_data_begin = .; diff --git a/board/pcm037/env/config b/board/pcm037/env/config index 008925540..fb1f5afdd 100644 --- a/board/pcm037/env/config +++ b/board/pcm037/env/config @@ -12,13 +12,13 @@ autoboot_timeout=3 nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-Phytec-phyCORE-i.MX27-trunk/root" bootargs="console=ttymxc0,115200" -nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" -nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nand="/dev/mtdblock7" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel ip=dhcp # or set your networking parameters here diff --git a/board/pcm037/lowlevel_init.S b/board/pcm037/lowlevel_init.S index a32d375dd..8988db23a 100644 --- a/board/pcm037/lowlevel_init.S +++ b/board/pcm037/lowlevel_init.S @@ -156,7 +156,7 @@ copy_loop: ldr pc, =1f /* Jump to SDRAM */ 1: - bl nand_boot /* Load U-Boot from NAND Flash */ + bl nand_boot /* Load barebox from NAND Flash */ ldr r1, =IMX_NFC_BASE - TEXT_BASE sub r10, r10, r1 /* adjust return address from NFC SRAM */ diff --git a/board/pcm038/env/config b/board/pcm038/env/config index d6afdfbeb..9fcb3dc7b 100644 --- a/board/pcm038/env/config +++ b/board/pcm038/env/config @@ -12,13 +12,13 @@ autoboot_timeout=3 nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-Phytec-phyCORE-i.MX27-trunk/root" bootargs="console=ttymxc0,115200" -nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" -nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nand="/dev/mtdblock7" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel ip=dhcp # or set your networking parameters here diff --git a/board/pcm038/lowlevel_init.S b/board/pcm038/lowlevel_init.S index 759ecd77a..a5ceb26f5 100644 --- a/board/pcm038/lowlevel_init.S +++ b/board/pcm038/lowlevel_init.S @@ -98,7 +98,7 @@ copy_loop: ldr pc, =1f /* Jump to SDRAM */ 1: - bl nand_boot /* Load U-Boot from NAND Flash */ + bl nand_boot /* Load barebox from NAND Flash */ ldr r1, =IMX_NFC_BASE - TEXT_BASE sub r10, r10, r1 /* adjust return address from NFC SRAM */ diff --git a/board/pcm043/env/config b/board/pcm043/env/config index 3558c3a11..c1ab234e6 100644 --- a/board/pcm043/env/config +++ b/board/pcm043/env/config @@ -12,12 +12,12 @@ autoboot_timeout=3 nfsroot="/path/to/nfs_root" bootargs="console=ttymxc0,115200" -nor_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),-(root)" +nor_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" -nand_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),-(root)" +nand_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),-(root)" rootpart_nand="/dev/mtdblock3" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel ip=dhcp # or set your networking parameters here diff --git a/board/pcm043/lowlevel_init.S b/board/pcm043/lowlevel_init.S index 56ebae433..9df064cb4 100644 --- a/board/pcm043/lowlevel_init.S +++ b/board/pcm043/lowlevel_init.S @@ -219,7 +219,7 @@ copy_loop: ldr pc, =1f /* Jump to SDRAM */ 1: - bl nand_boot /* Load U-Boot from NAND Flash */ + bl nand_boot /* Load barebox from NAND Flash */ /* rebase the return address */ ldr r1, =IMX_NFC_BASE - TEXT_BASE diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c index cbd910a21..d93ef80c9 100644 --- a/board/pcm043/pcm043.c +++ b/board/pcm043/pcm043.c @@ -383,11 +383,11 @@ static const __maybe_unused char cmd_cpufreq_help[] = "\n" "Set CPU frequency to MHz\n"; -U_BOOT_CMD_START(cpufreq) +BAREBOX_CMD_START(cpufreq) .cmd = do_cpufreq, .usage = "adjust CPU frequency", - U_BOOT_CMD_HELP(cmd_cpufreq_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_cpufreq_help) +BAREBOX_CMD_END #ifdef CONFIG_NAND_IMX_BOOT void __bare_init nand_boot(void) diff --git a/board/phycard-i.MX27/env/config b/board/phycard-i.MX27/env/config index c0e63c13c..6a93580da 100644 --- a/board/phycard-i.MX27/env/config +++ b/board/phycard-i.MX27/env/config @@ -12,10 +12,10 @@ autoboot_timeout=3 nfsroot="/tmp/root" bootargs="console=ttymxc0,115200" -nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nand="/dev/mtdblock3" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel ip=dhcp # or set your networking parameters here diff --git a/board/phycard-i.MX27/lowlevel_init.S b/board/phycard-i.MX27/lowlevel_init.S index e99dbcfd3..934958116 100644 --- a/board/phycard-i.MX27/lowlevel_init.S +++ b/board/phycard-i.MX27/lowlevel_init.S @@ -116,7 +116,7 @@ copy_loop: ldr pc, =1f /* Jump to SDRAM */ 1: - bl nand_boot /* Load U-Boot from NAND Flash */ + bl nand_boot /* Load barebox from NAND Flash */ ldr r1, =IMX_NFC_BASE - TEXT_BASE sub r10, r10, r1 /* adjust return address from NFC SRAM */ diff --git a/board/phycore_mcf54xx/Makefile b/board/phycore_mcf54xx/Makefile index 97f13fd60..054123fe7 100644 --- a/board/phycore_mcf54xx/Makefile +++ b/board/phycore_mcf54xx/Makefile @@ -2,20 +2,20 @@ # (C) Copyright 2007 Carsten Schlote # See file CREDITS for list of people who contributed to this project. # -# This file is part of U-Boot V2. +# This file is part of barebox. # -# U-Boot V2 is free software: you can redistribute it and/or modify +# barebox 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 3 of the License, or # (at your option) any later version. # -# U-Boot V2 is distributed in the hope that it will be useful, +# barebox 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 U-Boot V2. If not, see . +# along with barebox. If not, see . # # The build system allows to split everything into distinct files covering an diff --git a/board/phycore_mcf54xx/env/config b/board/phycore_mcf54xx/env/config index abc81b536..58550625d 100644 --- a/board/phycore_mcf54xx/env/config +++ b/board/phycore_mcf54xx/env/config @@ -4,7 +4,7 @@ kernel=net root=net -# use 'dhcp' todo dhcp in uboot and in kernel +# use 'dhcp' todo dhcp in barebox and in kernel ip=dhcp # diff --git a/board/phycore_mcf54xx/highlevel_init.c b/board/phycore_mcf54xx/highlevel_init.c index a0d4a621a..3a88cd68c 100644 --- a/board/phycore_mcf54xx/highlevel_init.c +++ b/board/phycore_mcf54xx/highlevel_init.c @@ -2,20 +2,20 @@ * (C) 2007,2008 konzeptpark, Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/board/phycore_mcf54xx/lowlevel_init.c b/board/phycore_mcf54xx/lowlevel_init.c index 2f8e9dae2..2837e3ed6 100644 --- a/board/phycore_mcf54xx/lowlevel_init.c +++ b/board/phycore_mcf54xx/lowlevel_init.c @@ -2,20 +2,20 @@ * (C) 2007 konzeptpark, Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/board/phycore_mcf54xx/pci-stubs.c b/board/phycore_mcf54xx/pci-stubs.c index 4993284c0..b7ab7c7d7 100644 --- a/board/phycore_mcf54xx/pci-stubs.c +++ b/board/phycore_mcf54xx/pci-stubs.c @@ -2,20 +2,20 @@ * (C) 2007,2008 Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.c b/board/phycore_mcf54xx/phyCore_MCF54xx.c index 68c2111fa..b6eb311dd 100644 --- a/board/phycore_mcf54xx/phyCore_MCF54xx.c +++ b/board/phycore_mcf54xx/phyCore_MCF54xx.c @@ -2,20 +2,20 @@ * (C) 2007 konzeptpark, Carsten Schlote * See file CREDITS for list of people who contributed to this project. * - * This file is part of U-Boot V2. + * This file is part of barebox. * - * U-Boot V2 is free software: you can redistribute it and/or modify + * barebox 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 3 of the License, or * (at your option) any later version. * - * U-Boot V2 is distributed in the hope that it will be useful, + * barebox 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 U-Boot V2. If not, see . + * along with barebox. If not, see . */ /** @file diff --git a/board/pm9263/env/config b/board/pm9263/env/config index 7cbff9476..75132911c 100644 --- a/board/pm9263/env/config +++ b/board/pm9263/env/config @@ -12,13 +12,13 @@ autoboot_timeout=3 nfsroot="/ptx/work/octopus/mkl/bucyrus/OSELAS.BSP-Bucyrus-Grabowski-trunk/platform-Ronetix-PM9263/root" bootargs="console=ttyS0,115200" -nor_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)" +nor_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" -#nand_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)" +#nand_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)" #rootpart_nand="/dev/mtdblock7" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel ip=dhcp # or set your networking parameters here diff --git a/board/sandbox/.gitignore b/board/sandbox/.gitignore index 09f1be04e..d1165788c 100644 --- a/board/sandbox/.gitignore +++ b/board/sandbox/.gitignore @@ -1 +1 @@ -u-boot.lds +barebox.lds diff --git a/board/sandbox/Makefile b/board/sandbox/Makefile index 0fdd2e328..8abe5dde0 100644 --- a/board/sandbox/Makefile +++ b/board/sandbox/Makefile @@ -3,7 +3,7 @@ obj-y += clock.o obj-y += hostfile.o obj-y += console.o -CPPFLAGS_u-boot.lds = -U$(SUBARCH) -DELF_ARCH=$(ELF_ARCH) \ +CPPFLAGS_barebox.lds = -U$(SUBARCH) -DELF_ARCH=$(ELF_ARCH) \ -DELF_FORMAT="$(ELF_FORMAT)" -extra-y += u-boot.lds +extra-y += barebox.lds diff --git a/board/sandbox/u-boot.lds.S b/board/sandbox/barebox.lds.S similarity index 97% rename from board/sandbox/u-boot.lds.S rename to board/sandbox/barebox.lds.S index 25d42b1e5..53e9f6021 100644 --- a/board/sandbox/u-boot.lds.S +++ b/board/sandbox/barebox.lds.S @@ -1,4 +1,4 @@ -#include +#include OUTPUT_FORMAT(ELF_FORMAT) OUTPUT_ARCH(ELF_ARCH) @@ -71,13 +71,13 @@ SECTIONS } =0x90909090 . = ALIGN(64); - __u_boot_initcalls_start = .; - __u_boot_initcalls : { INITCALLS } - __u_boot_initcalls_end = .; + __barebox_initcalls_start = .; + __barebox_initcalls : { INITCALLS } + __barebox_initcalls_end = .; . = ALIGN(64); - __u_boot_cmd_start = .; - __u_boot_cmd : { U_BOOT_CMDS } - __u_boot_cmd_end = .; + __barebox_cmd_start = .; + __barebox_cmd : { BAREBOX_CMDS } + __barebox_cmd_end = .; PROVIDE (__etext = .); PROVIDE (_etext = .); diff --git a/board/sandbox/clock.c b/board/sandbox/clock.c index 7ad1f53e1..b15086432 100644 --- a/board/sandbox/clock.c +++ b/board/sandbox/clock.c @@ -1,5 +1,5 @@ /* - * clock.c - wrapper between a U-Boot clocksource and linux + * clock.c - wrapper between a barebox clocksource and linux * * Copyright (c) 2007 Sascha Hauer , Pengutronix * diff --git a/board/sandbox/console.c b/board/sandbox/console.c index 094521678..2959e85c7 100644 --- a/board/sandbox/console.c +++ b/board/sandbox/console.c @@ -25,7 +25,7 @@ #include #include -int u_boot_register_console(char *name, int stdinfd, int stdoutfd) +int barebox_register_console(char *name, int stdinfd, int stdoutfd) { struct device_d *dev; struct linux_console_data *data; diff --git a/board/sandbox/hostfile.c b/board/sandbox/hostfile.c index f91601feb..ad625d7a6 100644 --- a/board/sandbox/hostfile.c +++ b/board/sandbox/hostfile.c @@ -1,5 +1,5 @@ /* - * hostfile.c - use files from the host to simalute U-Boot devices + * hostfile.c - use files from the host to simalute barebox devices * * Copyright (c) 2007 Sascha Hauer , Pengutronix * @@ -97,7 +97,7 @@ static int hf_init(void) device_initcall(hf_init); -int u_boot_register_filedev(struct hf_platform_data *hf) +int barebox_register_filedev(struct hf_platform_data *hf) { struct device_d *dev; diff --git a/commands/bmp.c b/commands/bmp.c index 181639a7d..51989e14f 100644 --- a/commands/bmp.c +++ b/commands/bmp.c @@ -201,9 +201,9 @@ static const __maybe_unused char cmd_bmp_help[] = " -y y offset (default center)\n" " -o render offscreen\n"; -U_BOOT_CMD_START(bmp) +BAREBOX_CMD_START(bmp) .cmd = do_bmp, .usage = "show a bmp image", - U_BOOT_CMD_HELP(cmd_bmp_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_bmp_help) +BAREBOX_CMD_END diff --git a/commands/bootm.c b/commands/bootm.c index 350d82635..849d4c20d 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -106,7 +106,7 @@ static const char *image_os(image_header_t *hdr) case IH_OS_LINUX: os = "Linux"; break; case IH_OS_VXWORKS: os = "VxWorks"; break; case IH_OS_QNX: os = "QNX"; break; - case IH_OS_U_BOOT: os = "U-Boot"; break; + case IH_OS_BAREBOX: os = "barebox"; break; case IH_OS_RTEMS: os = "RTEMS"; break; #ifdef CONFIG_ARTOS case IH_OS_ARTOS: os = "ARTOS"; break; @@ -457,11 +457,11 @@ static const __maybe_unused char cmd_bootm_help[] = " -h show advanced options\n"; -U_BOOT_CMD_START(bootm) +BAREBOX_CMD_START(bootm) .cmd = do_bootm, .usage = "boot application image", - U_BOOT_CMD_HELP(cmd_bootm_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_bootm_help) +BAREBOX_CMD_END #ifdef CONFIG_CMD_IMI static int do_iminfo ( cmd_tbl_t *cmdtp, int argc, char *argv[]) @@ -522,7 +522,7 @@ static int image_info (ulong addr) return 0; } -U_BOOT_CMD( +BAREBOX_CMD( iminfo, 1, do_iminfo, "iminfo - print header information for application image\n", "addr [addr ...]\n" @@ -589,7 +589,7 @@ void bz_internal_error(int errcode) * @page boot_preparation Preparing for Boot * * This chapter describes what's to be done to forward the control from - * U-Boot to Linux. This part describes the generic part, below you can find + * barebox to Linux. This part describes the generic part, below you can find * the architecture specific part. * * - @subpage arm_boot_preparation diff --git a/commands/cat.c b/commands/cat.c index 59b93a90d..c0a93d89d 100644 --- a/commands/cat.c +++ b/commands/cat.c @@ -90,11 +90,11 @@ static const __maybe_unused char cmd_cat_help[] = "Concatenate files on stdout. Currently only printable characters\n" "and \\n and \\t are printed, but this should be optional\n"; -U_BOOT_CMD_START(cat) +BAREBOX_CMD_START(cat) .cmd = do_cat, .usage = "concatenate file(s)", - U_BOOT_CMD_HELP(cmd_cat_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_cat_help) +BAREBOX_CMD_END /** * @page cat_command cat (concatenate) diff --git a/commands/cd.c b/commands/cd.c index 973ef7840..50e40b629 100644 --- a/commands/cd.c +++ b/commands/cd.c @@ -51,11 +51,11 @@ static const __maybe_unused char cmd_cd_help[] = "Usage: cd [directory]\n" "change to directory. If called without argument, change to /\n"; -U_BOOT_CMD_START(cd) +BAREBOX_CMD_START(cd) .cmd = do_cd, .usage = "change working directory", - U_BOOT_CMD_HELP(cmd_cd_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_cd_help) +BAREBOX_CMD_END /** * @page cd_command cd (change working directory) diff --git a/commands/clear.c b/commands/clear.c index 2d51574cd..178842845 100644 --- a/commands/clear.c +++ b/commands/clear.c @@ -31,7 +31,7 @@ static int do_clear (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(clear) +BAREBOX_CMD_START(clear) .cmd = do_clear, .usage = "clear screen", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/cp.c b/commands/cp.c index d0cb570a6..aa7b410e5 100644 --- a/commands/cp.c +++ b/commands/cp.c @@ -84,11 +84,11 @@ static const __maybe_unused char cmd_cp_help[] = "filename (not a target directory).\n" "This command is file based only. See memcpy for memory copy\n"; -U_BOOT_CMD_START(cp) +BAREBOX_CMD_START(cp) .cmd = do_cp, .usage = "copy files", - U_BOOT_CMD_HELP(cmd_cp_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_cp_help) +BAREBOX_CMD_END /** * @page cp_command cp: Copy file diff --git a/commands/crc.c b/commands/crc.c index b2dbfc78c..17188c7e1 100644 --- a/commands/crc.c +++ b/commands/crc.c @@ -116,9 +116,9 @@ static const __maybe_unused char cmd_crc_help[] = " -f Use file instead of memory\n" " -v Verfify\n"; -U_BOOT_CMD_START(crc32) +BAREBOX_CMD_START(crc32) .cmd = do_crc, .usage = "crc32 checksum calculation", - U_BOOT_CMD_HELP(cmd_crc_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_crc_help) +BAREBOX_CMD_END diff --git a/commands/dfu.c b/commands/dfu.c index c8a598c22..fe865efb9 100644 --- a/commands/dfu.c +++ b/commands/dfu.c @@ -101,7 +101,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int argc, char *argv[]) struct usb_dfu_pdata pdata; char *endptr, *argstr; struct usb_dfu_dev *dfu_alts = NULL; - char *manufacturer = "U-Boot"; + char *manufacturer = "barebox"; char *productname = CONFIG_BOARDINFO; u16 idVendor = 0, idProduct = 0; @@ -165,7 +165,7 @@ out: static const __maybe_unused char cmd_dfu_help[] = "Usage: dfu [OPTION]... description\n" "start dfu firmware update\n" -" -m Manufacturer string (U-Boot)\n" +" -m Manufacturer string (barebox)\n" " -p product string (" CONFIG_BOARDINFO ")\n" " -V vendor id\n" " -P product id\n" @@ -173,8 +173,8 @@ static const __maybe_unused char cmd_dfu_help[] = "device1(name1)[sr],device2(name2)[sr]\n" "where s is for save mode and r for read back of firmware\n"; -U_BOOT_CMD_START(dfu) +BAREBOX_CMD_START(dfu) .cmd = do_dfu, .usage = "Device firmware update", - U_BOOT_CMD_HELP(cmd_dfu_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_dfu_help) +BAREBOX_CMD_END diff --git a/commands/echo.c b/commands/echo.c index 44206ad55..49bd44ed8 100644 --- a/commands/echo.c +++ b/commands/echo.c @@ -96,8 +96,8 @@ no_optarg_out: return 1; } -U_BOOT_CMD_START(echo) +BAREBOX_CMD_START(echo) .cmd = do_echo, .usage = "echo args to console", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/edit.c b/commands/edit.c index 8d3df6fa5..6503edfc8 100644 --- a/commands/edit.c +++ b/commands/edit.c @@ -561,12 +561,12 @@ static const __maybe_unused char cmd_edit_help[] = static const __maybe_unused char cmd_edit_usage[] = "edit a file"; -U_BOOT_CMD_START(edit) +BAREBOX_CMD_START(edit) .cmd = do_edit, .aliases = edit_aliases, .usage = cmd_edit_usage, - U_BOOT_CMD_HELP(cmd_edit_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_edit_help) +BAREBOX_CMD_END /** diff --git a/commands/exec.c b/commands/exec.c index aeb769d57..ce0a0a990 100644 --- a/commands/exec.c +++ b/commands/exec.c @@ -53,7 +53,7 @@ out: return 1; } -U_BOOT_CMD_START(exec) +BAREBOX_CMD_START(exec) .cmd = do_exec, .usage = "execute a script", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/export.c b/commands/export.c index 750a83f3b..3e2f84d9f 100644 --- a/commands/export.c +++ b/commands/export.c @@ -55,11 +55,11 @@ static const __maybe_unused char cmd_export_help[] = "Usage: export [=value]...\n" "export an environment variable to subsequently executed scripts\n"; -U_BOOT_CMD_START(export) +BAREBOX_CMD_START(export) .cmd = do_export, .usage = "export environment variables", - U_BOOT_CMD_HELP(cmd_export_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_export_help) +BAREBOX_CMD_END /** * @page export_command export: Export an environment variable diff --git a/commands/false.c b/commands/false.c index 94878a6fb..fec3fdf71 100644 --- a/commands/false.c +++ b/commands/false.c @@ -29,8 +29,8 @@ static int do_false (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 1; } -U_BOOT_CMD_START(false) +BAREBOX_CMD_START(false) .cmd = do_false, .usage = "do nothing, unsuccessfully", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/flash.c b/commands/flash.c index d630783f1..ec793c531 100644 --- a/commands/flash.c +++ b/commands/flash.c @@ -89,11 +89,11 @@ static const __maybe_unused char cmd_erase_help[] = "Erase a flash device or parts of a device if an area specification\n" "is given\n"; -U_BOOT_CMD_START(erase) +BAREBOX_CMD_START(erase) .cmd = do_flerase, .usage = "erase FLASH memory", - U_BOOT_CMD_HELP(cmd_erase_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_erase_help) +BAREBOX_CMD_END /** @page erase_command erase Erase flash memory * @@ -166,17 +166,17 @@ static const __maybe_unused char cmd_protect_help[] = "(un)protect a flash device or parts of a device if an area specification\n" "is given\n"; -U_BOOT_CMD_START(protect) +BAREBOX_CMD_START(protect) .cmd = do_protect, .usage = "enable FLASH write protection", - U_BOOT_CMD_HELP(cmd_protect_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_protect_help) +BAREBOX_CMD_END -U_BOOT_CMD_START(unprotect) +BAREBOX_CMD_START(unprotect) .cmd = do_protect, .usage = "disable FLASH write protection", - U_BOOT_CMD_HELP(cmd_protect_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_protect_help) +BAREBOX_CMD_END /** @page protect_command protect Protect a flash memory * diff --git a/commands/go.c b/commands/go.c index 283b6d49b..e720e3235 100644 --- a/commands/go.c +++ b/commands/go.c @@ -78,8 +78,8 @@ static const __maybe_unused char cmd_go_help[] = "If addr does not start with a digit it is interpreted as a filename\n" "in which case the file is memmapped and executed\n"; -U_BOOT_CMD_START(go) +BAREBOX_CMD_START(go) .cmd = do_go, .usage = "start application at address or file", - U_BOOT_CMD_HELP(cmd_go_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_go_help) +BAREBOX_CMD_END diff --git a/commands/gpio.c b/commands/gpio.c index ec6b28813..58bf8b637 100644 --- a/commands/gpio.c +++ b/commands/gpio.c @@ -39,11 +39,11 @@ static int do_gpio_get_value(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_gpio_get_value_help[] = "Usage: gpio_set_value \n"; -U_BOOT_CMD_START(gpio_get_value) +BAREBOX_CMD_START(gpio_get_value) .cmd = do_gpio_get_value, .usage = "return a gpio's value", - U_BOOT_CMD_HELP(cmd_gpio_get_value_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_gpio_get_value_help) +BAREBOX_CMD_END static int do_gpio_set_value(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -63,11 +63,11 @@ static int do_gpio_set_value(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_gpio_set_value_help[] = "Usage: gpio_set_value \n"; -U_BOOT_CMD_START(gpio_set_value) +BAREBOX_CMD_START(gpio_set_value) .cmd = do_gpio_set_value, .usage = "set a gpio's output value", - U_BOOT_CMD_HELP(cmd_gpio_set_value_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_gpio_set_value_help) +BAREBOX_CMD_END static int do_gpio_direction_input(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -88,11 +88,11 @@ static int do_gpio_direction_input(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_do_gpio_direction_input_help[] = "Usage: gpio_direction_input \n"; -U_BOOT_CMD_START(gpio_direction_input) +BAREBOX_CMD_START(gpio_direction_input) .cmd = do_gpio_direction_input, .usage = "set a gpio as output", - U_BOOT_CMD_HELP(cmd_do_gpio_direction_input_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_do_gpio_direction_input_help) +BAREBOX_CMD_END static int do_gpio_direction_output(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -114,9 +114,9 @@ static int do_gpio_direction_output(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_gpio_direction_output_help[] = "Usage: gpio_direction_output \n"; -U_BOOT_CMD_START(gpio_direction_output) +BAREBOX_CMD_START(gpio_direction_output) .cmd = do_gpio_direction_output, .usage = "set a gpio as output", - U_BOOT_CMD_HELP(cmd_gpio_direction_output_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_gpio_direction_output_help) +BAREBOX_CMD_END diff --git a/commands/help.c b/commands/help.c index 1a8bc9b17..d8c67cddb 100644 --- a/commands/help.c +++ b/commands/help.c @@ -41,7 +41,7 @@ static int do_help (cmd_tbl_t * cmdtp, int argc, char *argv[]) /* command help (long version) */ if ((cmdtp = find_cmd(argv[1])) != NULL) { - u_boot_cmd_usage(cmdtp); + barebox_cmd_usage(cmdtp); return 0; } else { printf ("Unknown command '%s' - try 'help'" @@ -61,10 +61,10 @@ static const __maybe_unused char cmd_help_help[] = static const char *help_aliases[] = { "?", NULL}; -U_BOOT_CMD_START(help) +BAREBOX_CMD_START(help) .cmd = do_help, .aliases = help_aliases, .usage = "print online help", - U_BOOT_CMD_HELP(cmd_help_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_help_help) +BAREBOX_CMD_END diff --git a/commands/insmod.c b/commands/insmod.c index 82858bf82..e14af49f7 100644 --- a/commands/insmod.c +++ b/commands/insmod.c @@ -35,8 +35,8 @@ static int do_insmod (cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_insmod_help[] = "Usage: insmod \n"; -U_BOOT_CMD_START(insmod) +BAREBOX_CMD_START(insmod) .cmd = do_insmod, .usage = "insert a module", - U_BOOT_CMD_HELP(cmd_insmod_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_insmod_help) +BAREBOX_CMD_END diff --git a/commands/loadb.c b/commands/loadb.c index a942d3609..efb1a3cd8 100644 --- a/commands/loadb.c +++ b/commands/loadb.c @@ -806,17 +806,17 @@ static const __maybe_unused char cmd_loadb_help[] = "console baudrate" " -c - Create file if it is not present - default disabled"; #ifdef CONFIG_CMD_LOADB -U_BOOT_CMD_START(loadb) +BAREBOX_CMD_START(loadb) .cmd = do_load_serial_bin, .usage = "Load binary file over serial line (kermit mode)", - U_BOOT_CMD_HELP(cmd_loadb_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_loadb_help) +BAREBOX_CMD_END #endif #ifdef CONFIG_CMD_LOADY -U_BOOT_CMD_START(loady) +BAREBOX_CMD_START(loady) .cmd = do_load_serial_bin, .usage = "Load binary file over serial line (ymodem mode)", - U_BOOT_CMD_HELP(cmd_loadb_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_loadb_help) +BAREBOX_CMD_END #endif diff --git a/commands/loadenv.c b/commands/loadenv.c index 1250aa74b..8b885abf2 100644 --- a/commands/loadenv.c +++ b/commands/loadenv.c @@ -50,11 +50,11 @@ static const __maybe_unused char cmd_loadenv_help[] = "If ommitted defaults to /env and defaults to /dev/env0.\n" "Note that envfs can only handle files. Directories are skipped silently.\n"; -U_BOOT_CMD_START(loadenv) +BAREBOX_CMD_START(loadenv) .cmd = do_loadenv, .usage = "load environment from persistent storage", - U_BOOT_CMD_HELP(cmd_loadenv_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_loadenv_help) +BAREBOX_CMD_END /** * @page loadenv_command loadenv diff --git a/commands/loads.c b/commands/loads.c index 0d0359758..2578c1525 100644 --- a/commands/loads.c +++ b/commands/loads.c @@ -380,7 +380,7 @@ write_record (char *buf) # endif /* CFG_CMD_SAVES */ #ifdef CFG_LOADS_BAUD_CHANGE -U_BOOT_CMD( +BAREBOX_CMD( loads, 3, 0, do_load_serial, "loads - load S-Record file over serial line\n", "[ off ] [ baud ]\n" @@ -389,7 +389,7 @@ U_BOOT_CMD( ); #else /* ! CFG_LOADS_BAUD_CHANGE */ -U_BOOT_CMD( +BAREBOX_CMD( loads, 2, 0, do_load_serial, "loads - load S-Record file over serial line\n", "[ off ]\n" @@ -404,7 +404,7 @@ U_BOOT_CMD( #if (CONFIG_COMMANDS & CFG_CMD_SAVES) #ifdef CFG_LOADS_BAUD_CHANGE -U_BOOT_CMD( +BAREBOX_CMD( saves, 4, 0, do_save_serial, "saves - save S-Record file over serial line\n", "[ off ] [size] [ baud ]\n" @@ -412,7 +412,7 @@ U_BOOT_CMD( " with offset 'off', size 'size' and baudrate 'baud'\n" ); #else /* ! CFG_LOADS_BAUD_CHANGE */ -U_BOOT_CMD( +BAREBOX_CMD( saves, 3, 0, do_save_serial, "saves - save S-Record file over serial line\n", "[ off ] [size]\n" diff --git a/commands/ls.c b/commands/ls.c index 6e085ae35..4d880e514 100644 --- a/commands/ls.c +++ b/commands/ls.c @@ -199,8 +199,8 @@ static const __maybe_unused char cmd_ls_help[] = "List information about the FILEs (the current directory by default).\n" " -R list subdirectories recursively\n"; -U_BOOT_CMD_START(ls) +BAREBOX_CMD_START(ls) .cmd = do_ls, .usage = "list a file or directory", - U_BOOT_CMD_HELP(cmd_ls_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_ls_help) +BAREBOX_CMD_END diff --git a/commands/lsmod.c b/commands/lsmod.c index ffca8405a..696304d11 100644 --- a/commands/lsmod.c +++ b/commands/lsmod.c @@ -12,7 +12,7 @@ static int do_lsmod (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(lsmod) +BAREBOX_CMD_START(lsmod) .cmd = do_lsmod, .usage = "list modules", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/mem.c b/commands/mem.c index 01fdfdbb6..f06bc64f0 100644 --- a/commands/mem.c +++ b/commands/mem.c @@ -232,11 +232,11 @@ static const __maybe_unused char cmd_md_help[] = "respectively\n"; -U_BOOT_CMD_START(md) +BAREBOX_CMD_START(md) .cmd = do_mem_md, .usage = "memory display", - U_BOOT_CMD_HELP(cmd_md_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_md_help) +BAREBOX_CMD_END static int do_mem_mw ( cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -295,11 +295,11 @@ static const __maybe_unused char cmd_mw_help[] = "Write value(s) to the specifies region.\n" "see 'help md' for supported options.\n"; -U_BOOT_CMD_START(mw) +BAREBOX_CMD_START(mw) .cmd = do_mem_mw, .usage = "memory write (fill)", - U_BOOT_CMD_HELP(cmd_mw_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_mw_help) +BAREBOX_CMD_END static int do_mem_cmp(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -404,11 +404,11 @@ static const __maybe_unused char cmd_memcmp_help[] = "be left unspecified in which case the whole file is\n" "compared\n"; -U_BOOT_CMD_START(memcmp) +BAREBOX_CMD_START(memcmp) .cmd = do_mem_cmp, .usage = "memory compare", - U_BOOT_CMD_HELP(cmd_memcmp_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_memcmp_help) +BAREBOX_CMD_END static int do_mem_cp(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -500,11 +500,11 @@ static const __maybe_unused char cmd_memcpy_help[] = "\n" "Copy memory at of bytes to \n"; -U_BOOT_CMD_START(memcpy) +BAREBOX_CMD_START(memcpy) .cmd = do_mem_cp, .usage = "memory copy", - U_BOOT_CMD_HELP(cmd_memcpy_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_memcpy_help) +BAREBOX_CMD_END static int do_memset(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -565,11 +565,11 @@ static const __maybe_unused char cmd_memset_help[] = "\n" "Fill the first n bytes of area with byte c\n"; -U_BOOT_CMD_START(memset) +BAREBOX_CMD_START(memset) .cmd = do_memset, .usage = "memory fill", - U_BOOT_CMD_HELP(cmd_memset_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_memset_help) +BAREBOX_CMD_END static struct file_operations memops = { .read = mem_read, diff --git a/commands/meminfo.c b/commands/meminfo.c index 04b32b7df..76caf0a4f 100644 --- a/commands/meminfo.c +++ b/commands/meminfo.c @@ -30,7 +30,7 @@ static int do_meminfo (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(meminfo) +BAREBOX_CMD_START(meminfo) .cmd = do_meminfo, .usage = "print info about memory usage", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/memtest.c b/commands/memtest.c index d2c61200b..4038aceb7 100644 --- a/commands/memtest.c +++ b/commands/memtest.c @@ -347,9 +347,9 @@ static const __maybe_unused char cmd_mtest_help[] = #endif "\nsimple RAM read/write test\n"; -U_BOOT_CMD_START(mtest) +BAREBOX_CMD_START(mtest) .cmd = do_mem_mtest, .usage = "simple RAM test", - U_BOOT_CMD_HELP(cmd_mtest_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_mtest_help) +BAREBOX_CMD_END diff --git a/commands/mkdir.c b/commands/mkdir.c index db1514bef..d5f58f027 100644 --- a/commands/mkdir.c +++ b/commands/mkdir.c @@ -63,8 +63,8 @@ static const __maybe_unused char cmd_mkdir_help[] = "Usage: mkdir [directories]\n" "Create new directories\n"; -U_BOOT_CMD_START(mkdir) +BAREBOX_CMD_START(mkdir) .cmd = do_mkdir, .usage = "make directories", - U_BOOT_CMD_HELP(cmd_mkdir_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_mkdir_help) +BAREBOX_CMD_END diff --git a/commands/mount.c b/commands/mount.c index 66767f782..41735c834 100644 --- a/commands/mount.c +++ b/commands/mount.c @@ -70,11 +70,11 @@ static const __maybe_unused char cmd_mount_help[] = " must be an empty directory descending directly from the\n" "root directory.\n"; -U_BOOT_CMD_START(mount) +BAREBOX_CMD_START(mount) .cmd = do_mount, .usage = "mount a filesystem to a device", - U_BOOT_CMD_HELP(cmd_mount_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_mount_help) +BAREBOX_CMD_END /** @page mount_command mount * Usage: mount [\ \ \] @@ -90,7 +90,7 @@ U_BOOT_CMD_END * root directory. */ -/** @page how_mount_works How mount works in U-Boot +/** @page how_mount_works How mount works in barebox * * Mounting a filesystem ontop of a device is working like devices and drivers * are finding together. diff --git a/commands/nand.c b/commands/nand.c index 256ef4f97..cbf1058d2 100644 --- a/commands/nand.c +++ b/commands/nand.c @@ -349,8 +349,8 @@ static const __maybe_unused char cmd_nand_help[] = " -d deregister a bad block aware device\n" " -b mark block at offset ofs as bad\n"; -U_BOOT_CMD_START(nand) +BAREBOX_CMD_START(nand) .cmd = do_nand, .usage = "", - U_BOOT_CMD_HELP(cmd_nand_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_nand_help) +BAREBOX_CMD_END diff --git a/commands/net.c b/commands/net.c index 9114606a8..df06227de 100644 --- a/commands/net.c +++ b/commands/net.c @@ -86,11 +86,11 @@ static const __maybe_unused char cmd_tftp_help[] = "Usage: tftp [localfile]\n" "Load a file via network using BootP/TFTP protocol.\n"; -U_BOOT_CMD_START(tftp) +BAREBOX_CMD_START(tftp) .cmd = do_tftpb, .usage = "Load file using tftp protocol", - U_BOOT_CMD_HELP(cmd_tftp_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_tftp_help) +BAREBOX_CMD_END /** * @page tftp_command tftp @@ -130,11 +130,11 @@ static int do_rarpb (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(rarpboot) +BAREBOX_CMD_START(rarpboot) .cmd = do_rarpb, .usage = "boot image via network using rarp/tftp protocol", - U_BOOT_CMD_HELP("[loadAddress] [bootfilename]\n") -U_BOOT_CMD_END + BAREBOX_CMD_HELP("[loadAddress] [bootfilename]\n") +BAREBOX_CMD_END #endif /* CONFIG_NET_RARP */ #ifdef CONFIG_NET_NFS @@ -147,11 +147,11 @@ static const __maybe_unused char cmd_nfs_help[] = "Usage: nfs [localfile]\n" "Load a file via network using nfs protocol.\n"; -U_BOOT_CMD_START(nfs) +BAREBOX_CMD_START(nfs) .cmd = do_nfs, .usage = "boot image via network using nfs protocol", - U_BOOT_CMD_HELP(cmd_nfs_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_nfs_help) +BAREBOX_CMD_END #endif /* CONFIG_NET_NFS */ @@ -250,11 +250,11 @@ static int do_cdp (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(cdp) +BAREBOX_CMD_START(cdp) .cmd = do_cdp, .usage = "Perform CDP network configuration", - U_BOOT_CMD_HELP("[loadAddress] [host ip addr:bootfilename]\n") -U_BOOT_CMD_END + BAREBOX_CMD_HELP("[loadAddress] [host ip addr:bootfilename]\n") +BAREBOX_CMD_END #endif /* CONFIG_NET_CDP */ @@ -286,9 +286,9 @@ static int do_ethact (cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_ethact_help[] = "Usage: ethact [ethx]\n"; -U_BOOT_CMD_START(ethact) +BAREBOX_CMD_START(ethact) .cmd = do_ethact, .usage = "set current ethernet device", - U_BOOT_CMD_HELP(cmd_ethact_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_ethact_help) +BAREBOX_CMD_END diff --git a/commands/partition.c b/commands/partition.c index 09991a244..3cb7b612f 100755 --- a/commands/partition.c +++ b/commands/partition.c @@ -154,11 +154,11 @@ static const __maybe_unused char cmd_addpart_help[] = "\n" "Note: That this command has to be reworked and will probably change it's API."; -U_BOOT_CMD_START(addpart) +BAREBOX_CMD_START(addpart) .cmd = do_addpart, .usage = "adds a partition table to a device", - U_BOOT_CMD_HELP(cmd_addpart_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_addpart_help) +BAREBOX_CMD_END /** @page addpart_command addpart Add a partition to a device * @@ -199,11 +199,11 @@ static const __maybe_unused char cmd_delpart_help[] = "Usage: delpart FILE...\n" "Delete partitions previously added to a device with addpart.\n"; -U_BOOT_CMD_START(delpart) +BAREBOX_CMD_START(delpart) .cmd = do_delpart, .usage = "delete partition(s)", - U_BOOT_CMD_HELP(cmd_delpart_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_delpart_help) +BAREBOX_CMD_END /** @page delpart_command delpart Delete a partition * diff --git a/commands/printenv.c b/commands/printenv.c index a7efd142c..5490980c7 100644 --- a/commands/printenv.c +++ b/commands/printenv.c @@ -71,11 +71,11 @@ static const __maybe_unused char cmd_printenv_help[] = " - print value of environment variable 'name'\n"; -U_BOOT_CMD_START(printenv) +BAREBOX_CMD_START(printenv) .cmd = do_printenv, .usage = "print environment variables", - U_BOOT_CMD_HELP(cmd_printenv_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_printenv_help) +BAREBOX_CMD_END /** * @page printenv_command printenv diff --git a/commands/pwd.c b/commands/pwd.c index 683a2407b..6c3cbb976 100644 --- a/commands/pwd.c +++ b/commands/pwd.c @@ -29,7 +29,7 @@ static int do_pwd (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(pwd) +BAREBOX_CMD_START(pwd) .cmd = do_pwd, .usage = "print working directory", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/readline.c b/commands/readline.c index 9b12da301..55c288cb8 100644 --- a/commands/readline.c +++ b/commands/readline.c @@ -49,9 +49,9 @@ static const __maybe_unused char cmd_readline_help[] = "Usage: readline VAR\n" "readline reads a line of user input into variable VAR.\n"; -U_BOOT_CMD_START(readline) +BAREBOX_CMD_START(readline) .cmd = do_readline, .usage = "prompt for user input", - U_BOOT_CMD_HELP(cmd_readline_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_readline_help) +BAREBOX_CMD_END diff --git a/commands/reginfo.c b/commands/reginfo.c index fe0b776e5..f11a73c85 100644 --- a/commands/reginfo.c +++ b/commands/reginfo.c @@ -29,7 +29,7 @@ static int do_reginfo (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(reginfo) +BAREBOX_CMD_START(reginfo) .cmd = do_reginfo, .usage = "print register information", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/reset.c b/commands/reset.c index 1e9b74fef..f14862352 100644 --- a/commands/reset.c +++ b/commands/reset.c @@ -31,7 +31,7 @@ static int cmd_reset (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 1; } -U_BOOT_CMD_START(reset) +BAREBOX_CMD_START(reset) .cmd = cmd_reset, .usage = "Perform RESET of the CPU", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/rm.c b/commands/rm.c index a5b29d255..869460694 100644 --- a/commands/rm.c +++ b/commands/rm.c @@ -46,8 +46,8 @@ static const __maybe_unused char cmd_rm_help[] = "Usage: rm [FILES]\n" "Remove files\n"; -U_BOOT_CMD_START(rm) +BAREBOX_CMD_START(rm) .cmd = do_rm, .usage = "remove files", - U_BOOT_CMD_HELP(cmd_rm_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_rm_help) +BAREBOX_CMD_END diff --git a/commands/rmdir.c b/commands/rmdir.c index 1248b8b9a..3531f32d7 100644 --- a/commands/rmdir.c +++ b/commands/rmdir.c @@ -25,8 +25,8 @@ static const __maybe_unused char cmd_rmdir_help[] = "Usage: rmdir [directories]\n" "Remove directories. The directories have to be empty.\n"; -U_BOOT_CMD_START(rmdir) +BAREBOX_CMD_START(rmdir) .cmd = do_rmdir, .usage = "remove directorie(s)", - U_BOOT_CMD_HELP(cmd_rmdir_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_rmdir_help) +BAREBOX_CMD_END diff --git a/commands/saveenv.c b/commands/saveenv.c index fadd6747f..6a9da5cab 100644 --- a/commands/saveenv.c +++ b/commands/saveenv.c @@ -101,11 +101,11 @@ static const __maybe_unused char cmd_saveenv_help[] = "If ommitted defaults to /env and defaults to /dev/env0.\n" "Note that envfs can only handle files. Directories are skipped silently.\n"; -U_BOOT_CMD_START(saveenv) +BAREBOX_CMD_START(saveenv) .cmd = do_saveenv, .usage = "save environment to persistent storage", - U_BOOT_CMD_HELP(cmd_saveenv_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_saveenv_help) +BAREBOX_CMD_END /** * @page saveenv_command saveenv diff --git a/commands/setenv.c b/commands/setenv.c index 944c21592..16b81776a 100644 --- a/commands/setenv.c +++ b/commands/setenv.c @@ -45,11 +45,11 @@ static const __maybe_unused char cmd_setenv_help[] = " - delete environment variable 'name'\n"; -U_BOOT_CMD_START(setenv) +BAREBOX_CMD_START(setenv) .cmd = do_setenv, .usage = "set environment variables", - U_BOOT_CMD_HELP(cmd_setenv_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_setenv_help) +BAREBOX_CMD_END /** * @page setenv_command setenv: set an environment variable diff --git a/commands/sleep.c b/commands/sleep.c index 4a7aef083..d88f39efb 100644 --- a/commands/sleep.c +++ b/commands/sleep.c @@ -43,7 +43,7 @@ static int do_sleep (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(sleep) +BAREBOX_CMD_START(sleep) .cmd = do_sleep, .usage = "delay execution for n seconds", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/test.c b/commands/test.c index fa01bc0d9..afabe1234 100644 --- a/commands/test.c +++ b/commands/test.c @@ -1,7 +1,7 @@ /* * test.c - sh like test * - * Originally based on U-Boots do_test, but mostly reimplemented + * Originally based on bareboxs do_test, but mostly reimplemented * for smaller binary size * * Copyright (c) 2007 Sascha Hauer , Pengutronix @@ -229,9 +229,9 @@ static const __maybe_unused char cmd_test_help[] = static const __maybe_unused char cmd_test_usage[] = "minimal test like /bin/sh"; -U_BOOT_CMD_START(test) +BAREBOX_CMD_START(test) .aliases = test_aliases, .cmd = do_test, .usage = cmd_test_usage, - U_BOOT_CMD_HELP(cmd_test_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_test_help) +BAREBOX_CMD_END diff --git a/commands/timeout.c b/commands/timeout.c index b0fd906f9..dfbefc9c7 100644 --- a/commands/timeout.c +++ b/commands/timeout.c @@ -102,9 +102,9 @@ static const __maybe_unused char cmd_timeout_help[] = " -r interrupt on return\n" " -s silent mode\n"; -U_BOOT_CMD_START(timeout) +BAREBOX_CMD_START(timeout) .cmd = do_timeout, .usage = "wait for a specified timeout", - U_BOOT_CMD_HELP(cmd_timeout_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_timeout_help) +BAREBOX_CMD_END diff --git a/commands/true.c b/commands/true.c index 61381ab0d..4697a8115 100644 --- a/commands/true.c +++ b/commands/true.c @@ -29,8 +29,8 @@ static int do_true (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(true) +BAREBOX_CMD_START(true) .cmd = do_true, .usage = "do nothing, successfully", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/umount.c b/commands/umount.c index d0ac5256e..0dc517a32 100644 --- a/commands/umount.c +++ b/commands/umount.c @@ -42,8 +42,8 @@ static const __maybe_unused char cmd_umount_help[] = "Usage: umount \n" "umount a filesystem mounted on a specific mountpoint\n"; -U_BOOT_CMD_START(umount) +BAREBOX_CMD_START(umount) .cmd = do_umount, .usage = "umount a filesystem", - U_BOOT_CMD_HELP(cmd_umount_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_umount_help) +BAREBOX_CMD_END diff --git a/commands/version.c b/commands/version.c index a9626809b..425f430f1 100644 --- a/commands/version.c +++ b/commands/version.c @@ -31,8 +31,8 @@ static int do_version (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(version) +BAREBOX_CMD_START(version) .cmd = do_version, .usage = "print monitor version", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/xyzModem.c b/commands/xyzModem.c index 7f6955c5a..e034658eb 100644 --- a/commands/xyzModem.c +++ b/commands/xyzModem.c @@ -3,7 +3,7 @@ * @brief RedBoot stream handler for xyzModem protocol * * FileName: commands/xyzModem.c - * Originally from U-Boot V1 xyzModem.c + * Originally from barebox V1 xyzModem.c */ /* * 2008 - Nishanth Menon diff --git a/common/Kconfig b/common/Kconfig index 7d6cd9894..4c4a627a3 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -65,7 +65,7 @@ config TEXT_BASE hex default ARCH_TEXT_BASE help - The Address U-Boot gets linked at. + The Address barebox gets linked at. config HAVE_CONFIGURABLE_MEMORY_LAYOUT bool @@ -78,7 +78,7 @@ choice config MEMORY_LAYOUT_DEFAULT bool "use default memory layout" help - select this option to use U-Boots standard memory layout: + select this option to use bareboxs standard memory layout: stack ----- @@ -138,19 +138,19 @@ config KALLSYMS depends on BROKEN bool "kallsyms" help - With Kallsyms enabled all symbols are compiled into the U-Boot image. + With Kallsyms enabled all symbols are compiled into the barebox image. This is useful to print a nice backtrace when an exception occurs. No architecture supports backtraces at the moment, so this option is quite useless at the moment config RELOCATABLE depends on PPC - bool "generate relocatable U-Boot binary" + bool "generate relocatable barebox binary" help - A non relocatable U-Boot binary will run at it's compiled in + A non relocatable barebox binary will run at it's compiled in link address in RAM. This leads to smaller image sizes but may - put U-Boot just in the middle of RAM. With this option enabled - instead U-Boot can determine this address at runtime and thus + put barebox just in the middle of RAM. With this option enabled + instead barebox can determine this address at runtime and thus allowing it to relocate to the end of the available RAM. This way you have the whole memory in a single piece. @@ -164,15 +164,15 @@ config MACH_DO_LOWLEVEL_INIT help This entry enables SDRAM and other board low level initialization on many platforms. Disabling this option allows configurations to use - U-boot as a second stage boot loader. + barebox as a second stage boot loader. config ARCH_HAS_LOWLEVEL_INIT bool config PROMPT string - prompt "U-Boot command prompt" - default "uboot:" + prompt "barebox command prompt" + default "barebox:" config BAUDRATE int @@ -205,7 +205,7 @@ choice bool "hush parser" help Enable hush support. This is the most advanced shell available - for U-Boot. + for barebox. config SHELL_SIMPLE bool "Simple parser" @@ -280,7 +280,7 @@ config CONSOLE_ACTIVATE_FIRST prompt "activate first console on startup" help Normally on startup all consoles are disabled, so you won't - see anything from U-Boot starting. Enabling this option + see anything from barebox starting. Enabling this option enables the first console. config CONSOLE_ACTIVATE_ALL @@ -331,7 +331,7 @@ config DEFAULT_ENVIRONMENT_PATH prompt "Default environment path" help The path the default environment will be taken from. Relative - pathes will be relative to the U-Boot Toplevel dir, but absolute + pathes will be relative to the barebox Toplevel dir, but absolute pathes are fine aswell. endmenu @@ -342,7 +342,7 @@ config DEBUG_INFO bool prompt "enable debug symbols" help - Enable build of u-boot with -g. + Enable build of barebox with -g. config ENABLE_FLASH_NOISE bool diff --git a/common/Makefile b/common/Makefile index 7f5bdb7ec..d7a024bf8 100644 --- a/common/Makefile +++ b/common/Makefile @@ -20,12 +20,12 @@ obj-$(CONFIG_MODULES) += module.o extra-$(CONFIG_MODULES) += module.lds ifdef CONFIG_DEFAULT_ENVIRONMENT -$(obj)/startup.o: include/uboot_default_env.h -$(obj)/env.o: include/uboot_default_env.h +$(obj)/startup.o: include/barebox_default_env.h +$(obj)/env.o: include/barebox_default_env.h ENV_FILES := $(shell find $(srctree)/$(CONFIG_DEFAULT_ENVIRONMENT_PATH)) endif # ifdef CONFIG_DEFAULT_ENVIRONMENT -include/uboot_default_env.h: $(ENV_FILES) - $(Q)scripts/ubootenv -s $(srctree)/$(CONFIG_DEFAULT_ENVIRONMENT_PATH) uboot_default_env - $(Q)cat uboot_default_env | scripts/bin2c default_environment > $@ +include/barebox_default_env.h: $(ENV_FILES) + $(Q)scripts/bareboxenv -s $(srctree)/$(CONFIG_DEFAULT_ENVIRONMENT_PATH) barebox_default_env + $(Q)cat barebox_default_env | scripts/bin2c default_environment > $@ diff --git a/common/command.c b/common/command.c index d9907250a..e21e80dc1 100644 --- a/common/command.c +++ b/common/command.c @@ -37,7 +37,7 @@ #include const char version_string[] = - "U-Boot " UTS_RELEASE " (" __DATE__ " - " __TIME__ ")"; + "barebox " UTS_RELEASE " (" __DATE__ " - " __TIME__ ")"; LIST_HEAD(command_list); EXPORT_SYMBOL(command_list); @@ -55,14 +55,14 @@ static int do_exit (cmd_tbl_t *cmdtp, int argc, char *argv[]) return -r - 2; } -U_BOOT_CMD_START(exit) +BAREBOX_CMD_START(exit) .cmd = do_exit, .usage = "exit script", -U_BOOT_CMD_END +BAREBOX_CMD_END #endif -void u_boot_cmd_usage(cmd_tbl_t *cmdtp) +void barebox_cmd_usage(cmd_tbl_t *cmdtp) { #ifdef CONFIG_LONGHELP /* found - print (long) help info */ @@ -81,7 +81,7 @@ void u_boot_cmd_usage(cmd_tbl_t *cmdtp) } #endif /* CONFIG_LONGHELP */ } -EXPORT_SYMBOL(u_boot_cmd_usage); +EXPORT_SYMBOL(barebox_cmd_usage); static int compare(struct list_head *a, struct list_head *b) { @@ -103,7 +103,7 @@ int execute_command(int argc, char **argv) /* OK - call function to do the command */ ret = cmdtp->cmd(cmdtp, argc, argv); if (ret == COMMAND_ERROR_USAGE) { - u_boot_cmd_usage(cmdtp); + barebox_cmd_usage(cmdtp); return COMMAND_ERROR; } return ret; @@ -159,7 +159,7 @@ EXPORT_SYMBOL(register_command); cmd_tbl_t *find_cmd (const char *cmd) { cmd_tbl_t *cmdtp; - cmd_tbl_t *cmdtp_temp = &__u_boot_cmd_start; /*Init value */ + cmd_tbl_t *cmdtp_temp = &__barebox_cmd_start; /*Init value */ int len; int n_found = 0; len = strlen (cmd); @@ -193,8 +193,8 @@ static int init_command_list(void) { cmd_tbl_t *cmdtp; - for (cmdtp = &__u_boot_cmd_start; - cmdtp != &__u_boot_cmd_end; + for (cmdtp = &__barebox_cmd_start; + cmdtp != &__barebox_cmd_end; cmdtp++) register_command(cmdtp); diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 2f616370a..83b1e187f 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -401,7 +401,7 @@ operating system immediately after a free(). */ -#define HAVE_MMAP 0 /* Not available for U-Boot */ +#define HAVE_MMAP 0 /* Not available for barebox */ /* Define HAVE_MREMAP to make realloc() use mremap() to re-allocate @@ -409,7 +409,7 @@ kernel versions newer than 1.3.77. */ -#undef HAVE_MREMAP /* Not available for U-Boot */ +#undef HAVE_MREMAP /* Not available for barebox */ /* @@ -935,7 +935,7 @@ static void *sbrk(ptrdiff_t increment) /* Other static bookkeeping data */ /* variables holding tunable values */ -#ifndef __U_BOOT__ +#ifndef __BAREBOX__ static unsigned long trim_threshold = DEFAULT_TRIM_THRESHOLD; static unsigned int n_mmaps_max = DEFAULT_MMAP_MAX; static unsigned long mmap_threshold = DEFAULT_MMAP_THRESHOLD; @@ -2014,7 +2014,7 @@ void malloc_stats(void) See descriptions of tunable parameters above. */ -#ifndef __U_BOOT__ +#ifndef __BAREBOX__ int mallopt(int param_number, int value) { switch (param_number) { diff --git a/common/environment.c b/common/environment.c index c314d7ccc..0c7de84b5 100644 --- a/common/environment.c +++ b/common/environment.c @@ -23,11 +23,11 @@ * @brief Environment handling support (host and target) * * Important: This file will also be used on the host to create - * the default environment when building the U-Boot binary. So - * do not add any new U-Boot related functions here! + * the default environment when building the barebox binary. So + * do not add any new barebox related functions here! */ -#ifdef __U_BOOT__ +#ifdef __BAREBOX__ #include #include #include diff --git a/common/ft_build.c b/common/ft_build.c index 578a4b8ed..4a7ff3137 100644 --- a/common/ft_build.c +++ b/common/ft_build.c @@ -461,13 +461,13 @@ void ft_setup(void *blob, bd_t * bd, ulong initrd_start, ulong initrd_end) int len; struct ft_cxt cxt; ulong clock; -#if defined(CONFIG_OF_HAS_UBOOT_ENV) +#if defined(CONFIG_OF_HAS_BAREBOX_ENV) int k, nxt; #endif #if defined(CONFIG_OF_HAS_BD_T) u8 *end; #endif -#if defined(CONFIG_OF_HAS_UBOOT_ENV) || defined(CONFIG_OF_HAS_BD_T) +#if defined(CONFIG_OF_HAS_BAREBOX_ENV) || defined(CONFIG_OF_HAS_BD_T) int i; static char tmpenv[256]; #endif @@ -491,8 +491,8 @@ void ft_setup(void *blob, bd_t * bd, ulong initrd_start, ulong initrd_end) /* back into root */ ft_backtrack_node(&cxt); -#ifdef CONFIG_OF_HAS_UBOOT_ENV - ft_begin_node(&cxt, "u-boot-env"); +#ifdef CONFIG_OF_HAS_BAREBOX_ENV + ft_begin_node(&cxt, "barebox-env"); for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) { char *s, *lval, *rval; diff --git a/common/hush.c b/common/hush.c index e4ae631bf..e7a13c2bd 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1596,11 +1596,11 @@ static const __maybe_unused char cmd_sh_help[] = "\n" "Execute a shell script\n"; -U_BOOT_CMD_START(sh) +BAREBOX_CMD_START(sh) .cmd = do_sh, .usage = "run shell script", - U_BOOT_CMD_HELP(cmd_sh_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_sh_help) +BAREBOX_CMD_END static int do_source(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -1623,12 +1623,12 @@ static const __maybe_unused char cmd_source_help[] = static const __maybe_unused char cmd_source_usage[] = "execute shell script in current shell environment"; -U_BOOT_CMD_START(source) +BAREBOX_CMD_START(source) .aliases = source_aliases, .cmd = do_source, .usage = cmd_source_usage, - U_BOOT_CMD_HELP(cmd_source_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_source_help) +BAREBOX_CMD_END /** * @file diff --git a/common/module.c b/common/module.c index 302aefa63..cedd7029b 100644 --- a/common/module.c +++ b/common/module.c @@ -295,7 +295,7 @@ struct module * load_module(void *mod_image, unsigned long len) sym = (void *)sechdrs[symindex].sh_addr; #ifdef CONFIG_COMMAND - cmdindex = find_sec(ehdr, sechdrs, secstrings, ".u_boot_cmd"); + cmdindex = find_sec(ehdr, sechdrs, secstrings, ".barebox_cmd"); if (cmdindex) { cmd_tbl_t *cmd = (cmd_tbl_t *)sechdrs[cmdindex].sh_addr; for (i = 0; i < sechdrs[cmdindex].sh_size / sizeof(cmd_tbl_t); i++) { diff --git a/common/module.lds.S b/common/module.lds.S index ae5ca5cf8..52454f71b 100644 --- a/common/module.lds.S +++ b/common/module.lds.S @@ -22,7 +22,7 @@ * */ -#include +#include SECTIONS { @@ -38,7 +38,7 @@ SECTIONS . = ALIGN(4); .got : { *(.got) } - .u_boot_cmd : { U_BOOT_CMDS } + .barebox_cmd : { BAREBOX_CMDS } . = ALIGN(4); .bss : { *(.bss) } } diff --git a/common/startup.c b/common/startup.c index e40759d2c..6dca2702a 100644 --- a/common/startup.c +++ b/common/startup.c @@ -27,7 +27,7 @@ /** * @file - * @brief Main entry into the C part of U-Boot-v2 + * @brief Main entry into the C part of barebox */ #include #include @@ -41,8 +41,8 @@ #include #include -extern initcall_t __u_boot_initcalls_start[], __u_boot_early_initcalls_end[], - __u_boot_initcalls_end[]; +extern initcall_t __barebox_initcalls_start[], __barebox_early_initcalls_end[], + __barebox_initcalls_end[]; static void display_meminfo(void) { @@ -50,8 +50,8 @@ static void display_meminfo(void) ulong mend = mem_malloc_end(); ulong msize = mend - mstart + 1; - debug("U-Boot code : 0x%08lX -> 0x%08lX BSS: -> 0x%08lX\n", - _u_boot_start, _bss_start, _bss_end); + debug("barebox code : 0x%08lX -> 0x%08lX BSS: -> 0x%08lX\n", + _barebox_start, _bss_start, _bss_end); printf("Malloc space: 0x%08lx -> 0x%08lx (size %s)\n", mstart, mend, size_human_readable(msize)); #ifdef CONFIG_ARM @@ -79,7 +79,7 @@ void early_init (void) #endif /* CONFIG_HAS_EARLY_INIT */ #ifdef CONFIG_DEFAULT_ENVIRONMENT -#include +#include static struct memory_platform_data default_env_platform_data = { .name = "defaultenv", @@ -110,7 +110,7 @@ static int mount_root(void) } fs_initcall(mount_root); -void start_uboot (void) +void start_barebox (void) { initcall_t *initcall; int result; @@ -126,8 +126,8 @@ void start_uboot (void) init_data_ptr = &__early_init_data_begin; #endif /* CONFIG_HAS_EARLY_INIT */ - for (initcall = __u_boot_initcalls_start; - initcall < __u_boot_initcalls_end; initcall++) { + for (initcall = __barebox_initcalls_start; + initcall < __barebox_initcalls_end; initcall++) { PUTHEX_LL(*initcall); PUTC_LL('\n'); result = (*initcall)(); @@ -167,11 +167,11 @@ void hang (void) for (;;); } -/* Everything needed to cleanly shutdown U-Boot. +/* Everything needed to cleanly shutdown barebox. * Should be called before starting an OS to get * the devices into a clean state */ -void shutdown_uboot(void) +void shutdown_barebox(void) { devices_shutdown(); } diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c index a00e53a38..079a7eabc 100644 --- a/drivers/i2c/i2c.c +++ b/drivers/i2c/i2c.c @@ -9,7 +9,7 @@ * - at24.c - handle most I2C EEPROMs * Copyright (C) 2005-2007 David Brownell * Copyright (C) 2008 Wolfram Sang, Pengutronix - * - spi.c - u-boot-v2 SPI Framework + * - spi.c - barebox-v2 SPI Framework * Copyright (C) 2008 Sascha Hauer, Pengutronix * - Linux SPI Framework * Copyright (C) 2005 David Brownell diff --git a/drivers/nand/Kconfig b/drivers/nand/Kconfig index 72b2be049..031b94d4e 100644 --- a/drivers/nand/Kconfig +++ b/drivers/nand/Kconfig @@ -15,7 +15,7 @@ config NAND_IMX config NAND_IMX_BOOT bool - prompt "Support Starting U-Boot from NAND" + prompt "Support Starting barebox from NAND" depends on NAND_IMX || NAND_IMX_V2 config NAND_OMAP_GPMC diff --git a/drivers/nand/atmel_nand.c b/drivers/nand/atmel_nand.c index e8f85fc62..c3669e5a3 100644 --- a/drivers/nand/atmel_nand.c +++ b/drivers/nand/atmel_nand.c @@ -11,8 +11,8 @@ * Add Hardware ECC support for AT91SAM9260 / AT91SAM9263 * Richard Genoud (richard.genoud@gmail.com), Adeneo Copyright (C) 2007 * - * Derived from Das U-Boot source code - * (u-boot-1.1.5/board/atmel/at91sam9263ek/nand.c) + * Derived from Das barebox source code + * (barebox-1.1.5/board/atmel/at91sam9263ek/nand.c) * (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas * * diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c index 5c02ee051..5fe288f02 100644 --- a/drivers/nand/nand_imx.c +++ b/drivers/nand/nand_imx.c @@ -1148,11 +1148,11 @@ static int do_nand_boot_test(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_nand_boot_test_help[] = "Usage: nand_boot_test \n"; -U_BOOT_CMD_START(nand_boot_test) +BAREBOX_CMD_START(nand_boot_test) .cmd = do_nand_boot_test, .usage = "list a file or directory", - U_BOOT_CMD_HELP(cmd_nand_boot_test_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_nand_boot_test_help) +BAREBOX_CMD_END #endif #endif /* CONFIG_NAND_IMX_BOOT */ diff --git a/drivers/nand/nand_s3c2410.c b/drivers/nand/nand_s3c2410.c index b1fe377be..2f98c7622 100644 --- a/drivers/nand/nand_s3c2410.c +++ b/drivers/nand/nand_s3c2410.c @@ -439,7 +439,7 @@ static void __nand_boot_init nfc_addr(unsigned long host, uint32_t offs) * @param[in] page Start page to read from * @param[in] pagesize Size of each page in the NAND * - * This function must be located in the first 4kiB of the U-Boot-v2 image + * This function must be located in the first 4kiB of the barebox image * (guess why). When this routine is running the SDRAM is up and running * and it runs from the correct address (physical=linked address). * TODO Could we access the platform data from the boardfile? @@ -504,11 +504,11 @@ static int do_nand_boot_test(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_nand_boot_test_help[] = "Usage: nand_boot_test \n"; -U_BOOT_CMD_START(nand_boot_test) +BAREBOX_CMD_START(nand_boot_test) .cmd = do_nand_boot_test, .usage = "load an image from NAND", - U_BOOT_CMD_HELP(cmd_nand_boot_test_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_nand_boot_test_help) +BAREBOX_CMD_END #endif #endif /* CONFIG_S3C24XX_NAND_BOOT */ diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c index 32566cdb3..64366acb1 100644 --- a/drivers/net/cs8900.c +++ b/drivers/net/cs8900.c @@ -1,10 +1,10 @@ /* * cs8900.c * - * Cirrus Logic Crystal CS89X0 Ethernet driver for u-boot v2 + * Cirrus Logic Crystal CS89X0 Ethernet driver for barebox * Copyright (C) 2009 Ivo Clarysse * - * Based on cs8900.c from u-boot mainline, + * Based on cs8900.c from barebox mainline, * (C) 2003 Wolfgang Denk, wd@denx.de * (C) Copyright 2002 Sysgo Real-Time Solutions, GmbH * Marius Groeger diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index b8ad98d1d..77c771bf3 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -36,7 +36,7 @@ * * * - * 12/15/2003 Initial port to u-boot by Sascha Hauer + * 12/15/2003 Initial port to barebox by Sascha Hauer * * * ... see commit logs diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 693e64f27..1bb833ae6 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -18,7 +18,7 @@ #include /* - * The u-boot networking stack is a little weird. It seems like the + * The barebox networking stack is a little weird. It seems like the * networking core allocates receive buffers up front without any * regard to the hardware that's supposed to actually receive those * packets. diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c index e29f69ccb..e535f18e7 100644 --- a/drivers/net/netx_eth.c +++ b/drivers/net/netx_eth.c @@ -112,7 +112,7 @@ static int netx_eth_rx (struct eth_device *edev) /* get data */ memcpy((void*)NetRxPackets[0], (void *)(SRAM_BASE(seg) + frameno * 1560), len); - /* pass to u-boot */ + /* pass to barebox */ NetReceive(NetRxPackets[0], len); PFIFO_REG(PFIFO_BASE(EMPTY_PTR_FIFO(xcno))) = diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index 987b284b2..0df664aef 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -52,7 +52,7 @@ . o skeleton.c by Donald Becker ( becker@cesdis.gsfc.nasa.gov ) . . History: - . 06/19/03 Richard Woodruff Made u-boot environment aware and added mac addr checks. + . 06/19/03 Richard Woodruff Made barebox environment aware and added mac addr checks. . 10/17/01 Marco Hasewinkel Modify for DNP/1110 . 07/25/01 Woojung Huh Modify for ADS Bitsy . 04/25/01 Daris A Nevil Initial public release through SMSC diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 7070cc6b4..8673436ca 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -1,5 +1,5 @@ /* - * tap.c - A tap ethernet driver for U-Boot + * tap.c - A tap ethernet driver for barebox * * Copyright (c) 2007 Sascha Hauer , Pengutronix * @@ -80,7 +80,7 @@ int tap_probe(struct device_d *dev) int ret = 0; priv = malloc(sizeof(struct tap_priv)); - priv->name = "uboot"; + priv->name = "barebox"; priv->fd = tap_alloc(priv->name); if (priv->fd < 0) { diff --git a/drivers/nor/Kconfig b/drivers/nor/Kconfig index 7d9497e3b..db07aa30c 100644 --- a/drivers/nor/Kconfig +++ b/drivers/nor/Kconfig @@ -14,7 +14,7 @@ config DRIVER_CFI_NEW default y bool "new cfi flash driver" help - The old cfi flash driver is mainly an adopted version from U-Boot v1 + The old cfi flash driver is mainly an adopted version from barebox v1 whereas the new driver contains some more experimental features such as selecting the supported chiptypes and bus widths making the driver smaller. diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c index 7131aa570..37206d0e5 100644 --- a/drivers/nor/cfi_flash.c +++ b/drivers/nor/cfi_flash.c @@ -1490,9 +1490,9 @@ device_initcall(cfi_init); /** * @file - * @brief This file implements a Common Flash Interface (CFI) driver for U-Boot. + * @brief This file implements a Common Flash Interface (CFI) driver for barebox. * - * This file implements a Common Flash Interface (CFI) driver for U-Boot. + * This file implements a Common Flash Interface (CFI) driver for barebox. * The width of the port and the width of the chips are determined at initialization. * These widths are used to calculate the address for access CFI data structures. * diff --git a/drivers/nor/cfi_flash_new.c b/drivers/nor/cfi_flash_new.c index e114bd2be..c9910eda0 100644 --- a/drivers/nor/cfi_flash_new.c +++ b/drivers/nor/cfi_flash_new.c @@ -45,7 +45,7 @@ #include /* - * This file implements a Common Flash Interface (CFI) driver for U-Boot. + * This file implements a Common Flash Interface (CFI) driver for barebox. * The width of the port and the width of the chips are determined at initialization. * These widths are used to calculate the address for access CFI data structures. * diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 524190dbc..de316f9a4 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -5,7 +5,7 @@ * FileName: drivers/serial/serial_ns16550.c * * NS16550 support - * Modified from U-Boot V1 drivers/serial.c and drivers/ns16550.c + * Modified from barebox V1 drivers/serial.c and drivers/ns16550.c * originally from linux source (arch/ppc/boot/ns16550.c) * modified to use CFG_ISA_MEM and new defines */ @@ -63,7 +63,7 @@ static unsigned int ns16550_calc_divisor(struct console_device *cdev, cdev->dev->platform_data; unsigned int clk = plat->clock; #ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS - /* FIXME: Legacy Code copied from U-Boot V1 implementation + /* FIXME: Legacy Code copied from barebox V1 implementation */ #ifdef CONFIG_ARCH_OMAP1510 unsigned long base = cdev->dev->map_base; diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c index 1b15178ea..f6a712b1c 100644 --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c @@ -110,7 +110,7 @@ printf("%s\n", __func__); */ /* device description: manufacturer, product */ - sprintf(manufacturer, "u-boot with %s", + sprintf(manufacturer, "barebox with %s", gadget->name); status = usb_string_id(cdev); if (status < 0) diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index 5b22e151b..d3b49edaf 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c @@ -484,9 +484,9 @@ static int do_mycdev (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(mycdev) +BAREBOX_CMD_START(mycdev) .cmd = do_mycdev, -U_BOOT_CMD_END +BAREBOX_CMD_END /** * gserial_disconnect - notify TTY I/O glue that USB link is inactive diff --git a/drivers/usb/usb.c b/drivers/usb/usb.c index 208a38cdb..decdbdd8e 100644 --- a/drivers/usb/usb.c +++ b/drivers/usb/usb.c @@ -12,7 +12,7 @@ * (C) Copyright Yggdrasil Computing, Inc. 2000 * (usb_device_id matching changes by Adam J. Richter) * - * Adapted for U-Boot: + * Adapted for barebox: * (C) Copyright 2001 Denis Peter, MPL AG Switzerland * * See file CREDITS for list of people who contributed to this @@ -489,11 +489,11 @@ static const __maybe_unused char cmd_usb_help[] = "Usage: usb\n" "(re-)detect USB devices\n"; -U_BOOT_CMD_START(usb) +BAREBOX_CMD_START(usb) .cmd = do_usb, .usage = "(re-)detect USB devices", - U_BOOT_CMD_HELP(cmd_usb_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_usb_help) +BAREBOX_CMD_END /* * disables the asynch behaviour of the control message. This is used for data @@ -700,7 +700,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) * According to 9.4.10 of the Universal Serial Bus Specification * Revision 2.0 such devices can return with a STALL. This results in * some USB sticks timeouting during initialization and then being - * unusable in U-Boot. + * unusable in barebox. */ if (if_face->num_altsetting == 1) return 0; diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c index e8180fafd..d49ac32d3 100644 --- a/fs/cramfs/cramfs.c +++ b/fs/cramfs/cramfs.c @@ -7,7 +7,7 @@ * * Copyright (C) 2003 Kai-Uwe Bloem, * Auerswald GmbH & Co KG, - * - adapted from the www.tuxbox.org u-boot tree, added "ls" command + * - adapted from the www.tuxbox.org barebox tree, added "ls" command * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License (Version 2) as diff --git a/fs/devfs.c b/fs/devfs.c index 943ffb88e..7478ef9f7 100644 --- a/fs/devfs.c +++ b/fs/devfs.c @@ -1,5 +1,5 @@ /* - * devfs.c - a device file system for U-Boot + * devfs.c - a device file system for barebox * * Copyright (c) 2007 Sascha Hauer , Pengutronix * diff --git a/include/.gitignore b/include/.gitignore index c5149e0a8..bb388ccca 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,2 +1,2 @@ config.h -uboot_default_env.h +barebox_default_env.h diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h new file mode 100644 index 000000000..99ccc5e97 --- /dev/null +++ b/include/asm-generic/barebox.lds.h @@ -0,0 +1,22 @@ + +#if defined CONFIG_ARCH_IMX25 || defined CONFIG_ARCH_IMX35 +#include +#endif + +#ifndef PRE_IMAGE +#define PRE_IMAGE +#endif + +#define INITCALLS \ + KEEP(*(.initcall.0)) \ + KEEP(*(.initcall.1)) \ + KEEP(*(.initcall.2)) \ + KEEP(*(.initcall.3)) \ + KEEP(*(.initcall.4)) \ + KEEP(*(.initcall.5)) \ + KEEP(*(.initcall.6)) \ + KEEP(*(.initcall.7)) + +#define BAREBOX_CMDS KEEP(*(SORT_BY_NAME(.barebox_cmd*))) + +#define BAREBOX_SYMS KEEP(*(__usymtab)) diff --git a/include/asm-generic/u-boot.lds.h b/include/asm-generic/u-boot.lds.h deleted file mode 100644 index 220262753..000000000 --- a/include/asm-generic/u-boot.lds.h +++ /dev/null @@ -1,22 +0,0 @@ - -#if defined CONFIG_ARCH_IMX25 || defined CONFIG_ARCH_IMX35 -#include -#endif - -#ifndef PRE_IMAGE -#define PRE_IMAGE -#endif - -#define INITCALLS \ - KEEP(*(.initcall.0)) \ - KEEP(*(.initcall.1)) \ - KEEP(*(.initcall.2)) \ - KEEP(*(.initcall.3)) \ - KEEP(*(.initcall.4)) \ - KEEP(*(.initcall.5)) \ - KEEP(*(.initcall.6)) \ - KEEP(*(.initcall.7)) - -#define U_BOOT_CMDS KEEP(*(SORT_BY_NAME(.u_boot_cmd*))) - -#define U_BOOT_SYMS KEEP(*(__usymtab)) diff --git a/include/bzlib.h b/include/bzlib.h index 2d864d56b..4b0f820fe 100644 --- a/include/bzlib.h +++ b/include/bzlib.h @@ -66,10 +66,10 @@ #ifndef _BZLIB_H #define _BZLIB_H -/* Configure for U-Boot environment */ +/* Configure for barebox environment */ #define BZ_NO_STDIO #define BZ_NO_COMPRESS -/* End of configuration for U-Boot environment */ +/* End of configuration for barebox environment */ #ifdef __cplusplus extern "C" { diff --git a/include/command.h b/include/command.h index a769d547d..f103045fd 100644 --- a/include/command.h +++ b/include/command.h @@ -64,14 +64,14 @@ __attribute__((aligned(64))) typedef struct cmd_tbl_s cmd_tbl_t; -extern cmd_tbl_t __u_boot_cmd_start; -extern cmd_tbl_t __u_boot_cmd_end; +extern cmd_tbl_t __barebox_cmd_start; +extern cmd_tbl_t __barebox_cmd_end; /* common/command.c */ cmd_tbl_t *find_cmd(const char *cmd); int execute_command(int argc, char **argv); -void u_boot_cmd_usage(cmd_tbl_t *cmdtp); +void barebox_cmd_usage(cmd_tbl_t *cmdtp); #define COMMAND_SUCCESS 0 #define COMMAND_ERROR 1 @@ -88,20 +88,20 @@ void u_boot_cmd_usage(cmd_tbl_t *cmdtp); #define __stringify(x) __stringify_1(x) -#define Struct_Section __attribute__ ((unused,section (".u_boot_cmd"))) +#define Struct_Section __attribute__ ((unused,section (".barebox_cmd"))) -#define U_BOOT_CMD_START(_name) \ -const cmd_tbl_t __u_boot_cmd_##_name \ - __attribute__ ((unused,section (".u_boot_cmd_" __stringify(_name)))) = { \ +#define BAREBOX_CMD_START(_name) \ +const cmd_tbl_t __barebox_cmd_##_name \ + __attribute__ ((unused,section (".barebox_cmd_" __stringify(_name)))) = { \ .name = #_name, -#define U_BOOT_CMD_END \ +#define BAREBOX_CMD_END \ }; #ifdef CONFIG_LONGHELP -#define U_BOOT_CMD_HELP(text) .help = text, +#define BAREBOX_CMD_HELP(text) .help = text, #else -#define U_BOOT_CMD_HELP(text) +#define BAREBOX_CMD_HELP(text) #endif int register_command(cmd_tbl_t *); diff --git a/include/common.h b/include/common.h index 3df1f7fbf..c38257177 100644 --- a/include/common.h +++ b/include/common.h @@ -57,7 +57,7 @@ typedef void (interrupt_handler_t)(void *); -#include /* boot information for Linux kernel */ +#include /* boot information for Linux kernel */ /* * Function Prototypes @@ -130,8 +130,8 @@ int parse_area_spec(const char *str, ulong *start, ulong *size); /* Just like simple_strtoul(), but this one honors a K/M/G suffix */ unsigned long strtoul_suffix(const char *str, char **endp, int base); -void start_uboot(void); -void shutdown_uboot(void); +void start_barebox(void); +void shutdown_barebox(void); int arch_execute(unsigned long address, int argc, char *argv[]); diff --git a/include/envfs.h b/include/envfs.h index dd88f7478..b5849d9b8 100644 --- a/include/envfs.h +++ b/include/envfs.h @@ -6,7 +6,7 @@ #define ENVFS_MAGIC 0x798fba79 /* some random number */ #define ENVFS_INODE_MAGIC 0x67a8c78d #define ENVFS_END_MAGIC 0x6a87d6cd -#define ENVFS_SIGNATURE "U-Boot envfs" +#define ENVFS_SIGNATURE "barebox envfs" struct envfs_inode { uint32_t magic; /* ENVFS_INODE_MAGIC */ diff --git a/include/environment.h b/include/environment.h index a50fc6857..21a7ffa0e 100644 --- a/include/environment.h +++ b/include/environment.h @@ -25,7 +25,7 @@ #define _ENVIRONMENT_H_ -#ifdef __U_BOOT__ +#ifdef __BAREBOX__ /** * Managment of a environment variable */ @@ -59,7 +59,7 @@ struct stat; int file_size_action(const char *, struct stat *, void *, int); int file_save_action(const char *, struct stat *, void *, int); -#endif /* __U_BOOT__ */ +#endif /* __BAREBOX__ */ /* This part is used for the host and the target */ struct action_data { @@ -76,5 +76,5 @@ struct action_data { * @brief Environment handling * * Important: This file will also be used on the host to create - * the default environment when building the U-Boot binary. + * the default environment when building the barebox binary. */ diff --git a/include/fcntl.h b/include/fcntl.h index ca62df027..aed741e58 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -16,7 +16,7 @@ #define O_DIRECTORY 00200000 /* must be a directory */ #define O_NOFOLLOW 00400000 /* don't follow links */ -/* U-Boot additional flags */ +/* barebox additional flags */ #define O_RWSIZE_MASK 00000070 #define O_RWSIZE_SHIFT 3 #define O_RWSIZE_1 00000010 diff --git a/include/ft_build.h b/include/ft_build.h index be4229ec3..1fb6b4d11 100644 --- a/include/ft_build.h +++ b/include/ft_build.h @@ -7,7 +7,7 @@ #define FT_BUILD_H #include -#include +#include /* Definitions used by the flattened device tree */ #define OF_DT_HEADER 0xd00dfeed /* marker */ diff --git a/include/i2c/i2c.h b/include/i2c/i2c.h index 670898ba4..6b0e58509 100644 --- a/include/i2c/i2c.h +++ b/include/i2c/i2c.h @@ -1,5 +1,5 @@ /* - * i2c.h - definitions for the u-boot-v2 i2c framework + * i2c.h - definitions for the barebox-v2 i2c framework * * Copyricht (C) 2009 by Marc Kleine-Budde * diff --git a/include/image.h b/include/image.h index 5524f8424..13d030316 100644 --- a/include/image.h +++ b/include/image.h @@ -21,9 +21,9 @@ * 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". ******************************************************************** */ @@ -53,7 +53,7 @@ #define IH_OS_VXWORKS 14 /* VxWorks */ #define IH_OS_PSOS 15 /* pSOS */ #define IH_OS_QNX 16 /* QNX */ -#define IH_OS_U_BOOT 17 /* Firmware */ +#define IH_OS_BAREBOX 17 /* Firmware */ #define IH_OS_RTEMS 18 /* RTEMS */ #define IH_OS_ARTOS 19 /* ARTOS */ #define IH_OS_UNITY 20 /* Unity OS */ @@ -106,14 +106,14 @@ * Image Types * * "Standalone Programs" are directly runnable in the environment - * provided by U-Boot; it is expected that (if they behave - * well) you can continue to work in U-Boot after return from + * provided by barebox; it is expected that (if they behave + * well) you can continue to work in barebox after return from * the Standalone Program. * "OS Kernel Images" are usually images of some Embedded OS which * will take over control completely. Usually these programs * will install their own set of exception handlers, device * drivers, set up the MMU, etc. - this means, that you cannot - * expect to re-enter U-Boot except by resetting the CPU. + * expect to re-enter barebox except by resetting the CPU. * "RAMDisk Images" are more or less just data blocks, and their * parameters (address, size) are passed to an OS kernel that is * being started. @@ -132,12 +132,12 @@ * a multiple of 4 bytes - except for the last file). * * "Firmware Images" are binary images containing firmware (like - * U-Boot or FPGA images) which usually will be programmed to + * barebox or FPGA images) which usually will be programmed to * flash memory. * * "Script files" are command sequences that will be executed by - * U-Boot's command interpreter; this feature is especially - * useful when you configure U-Boot to use a real shell (hush) + * barebox's command interpreter; this feature is especially + * useful when you configure barebox to use a real shell (hush) * as command interpreter (=> Shell Scripts). */ diff --git a/include/linux/uboot-wrapper.h b/include/linux/barebox-wrapper.h similarity index 87% rename from include/linux/uboot-wrapper.h rename to include/linux/barebox-wrapper.h index 9722d513b..1221a21fb 100644 --- a/include/linux/uboot-wrapper.h +++ b/include/linux/barebox-wrapper.h @@ -1,5 +1,5 @@ -#ifndef __INCLUDE_LINUX_U_BOOT_WRAPPER_H -#define __INCLUDE_LINUX_U_BOOT_WRAPPER_H +#ifndef __INCLUDE_LINUX_BAREBOX_WRAPPER_H +#define __INCLUDE_LINUX_BAREBOX_WRAPPER_H #include @@ -26,4 +26,4 @@ #define MODULE_DESCRIPTION(x) #define MODULE_LICENSE(x) -#endif /* __INCLUDE_LINUX_U_BOOT_WRAPPER_H */ +#endif /* __INCLUDE_LINUX_BAREBOX_WRAPPER_H */ diff --git a/include/linux/bitops.h b/include/linux/bitops.h index e8ff23b6e..127c1619f 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -1,7 +1,7 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H -#ifdef __U_BOOT__ +#ifdef __BAREBOX__ #define BIT(nr) (1UL << (nr)) #define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 7e613d306..e9e2f0764 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -2,7 +2,7 @@ #define _LINUX_KERNEL_H #include -#include +#include /* * min()/max()/clamp() macros that also do diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h index fe55087ea..a99d86e69 100644 --- a/include/linux/mtd/compat.h +++ b/include/linux/mtd/compat.h @@ -33,7 +33,7 @@ #ifndef BUG #define BUG() do { \ - printf("U-Boot BUG at %s:%d!\n", __FILE__, __LINE__); \ + printf("barebox BUG at %s:%d!\n", __FILE__, __LINE__); \ } while (0) #define BUG_ON(condition) do { if (condition) BUG(); } while(0) diff --git a/include/part.h b/include/part.h index 318aa3cb3..d0c419ba0 100644 --- a/include/part.h +++ b/include/part.h @@ -63,9 +63,9 @@ typedef struct block_dev_desc { #define PART_TYPE_AMIGA 0x04 /* - * Type string for U-Boot bootable partitions + * Type string for barebox bootable partitions */ -#define BOOT_PART_TYPE "U-Boot" /* primary boot partition type */ +#define BOOT_PART_TYPE "barebox" /* primary boot partition type */ #define BOOT_PART_COMP "PPCBoot" /* PPCBoot compatibility type */ /* device types */ diff --git a/include/reloc.h b/include/reloc.h index d450097dd..a5ad7575b 100644 --- a/include/reloc.h +++ b/include/reloc.h @@ -1,7 +1,7 @@ #ifndef __RELOC_H #define __RELOC_H -extern unsigned long _u_boot_start, _bss_start, _bss_end, _text_base; +extern unsigned long _barebox_start, _bss_start, _bss_end, _text_base; #ifdef CONFIG_HAS_EARLY_INIT diff --git a/include/usb_dfu_trailer.h b/include/usb_dfu_trailer.h index 3903b85b3..2cf66a590 100644 --- a/include/usb_dfu_trailer.h +++ b/include/usb_dfu_trailer.h @@ -3,9 +3,9 @@ /* trailer handling for DFU files */ -#define UBOOT_DFU_TRAILER_V1 1 -#define UBOOT_DFU_TRAILER_MAGIC 0x19731978 -struct uboot_dfu_trailer { +#define BAREBOX_DFU_TRAILER_V1 1 +#define BAREBOX_DFU_TRAILER_MAGIC 0x19731978 +struct barebox_dfu_trailer { u_int32_t magic; u_int16_t version; u_int16_t length; @@ -16,11 +16,11 @@ struct uboot_dfu_trailer { /* we mirror the trailer because we want it to be longer in later versions * while keeping backwards compatibility */ -static inline void dfu_trailer_mirror(struct uboot_dfu_trailer *trailer, +static inline void dfu_trailer_mirror(struct barebox_dfu_trailer *trailer, unsigned char *eof) { int i; - int len = sizeof(struct uboot_dfu_trailer); + int len = sizeof(struct barebox_dfu_trailer); unsigned char *src = eof - len; unsigned char *dst = (unsigned char *) trailer; diff --git a/lib/bus.c b/lib/bus.c index ac90b49a8..e0dd9ea58 100644 --- a/lib/bus.c +++ b/lib/bus.c @@ -1,5 +1,5 @@ /* - * bus.c - U-Boot driver model + * bus.c - barebox driver model * * Copyright (c) 2009 Sascha Hauer , Pengutronix * diff --git a/lib/crc32.c b/lib/crc32.c index 9a2f8f5f5..2ed2df04c 100644 --- a/lib/crc32.c +++ b/lib/crc32.c @@ -8,7 +8,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#ifdef __U_BOOT__ /* Shut down "ANSI does not permit..." warnings */ +#ifdef __BAREBOX__ /* Shut down "ANSI does not permit..." warnings */ #include /* to get command definitions like CFG_CMD_JFFS2 */ #endif @@ -149,7 +149,7 @@ ulong crc32(ulong crc, const unsigned char *buf, uint len) } while (--len); return crc ^ 0xffffffffL; } -#ifdef __U_BOOT__ +#ifdef __BAREBOX__ EXPORT_SYMBOL(crc32); #endif diff --git a/lib/driver.c b/lib/driver.c index 67c7b0f51..b3115de59 100644 --- a/lib/driver.c +++ b/lib/driver.c @@ -1,5 +1,5 @@ /* - * driver.c - U-Boot driver model + * driver.c - barebox driver model * * Copyright (c) 2007 Sascha Hauer , Pengutronix * @@ -22,7 +22,7 @@ /** * @file - * @brief U-Boot's driver model, and devinfo command + * @brief barebox's driver model, and devinfo command */ #include @@ -334,11 +334,11 @@ static const __maybe_unused char cmd_devinfo_help[] = "drivers. If called with a device path as argument devinfo shows more detailed\n" "information about this device and its parameters.\n"; -U_BOOT_CMD_START(devinfo) +BAREBOX_CMD_START(devinfo) .cmd = do_devinfo, .usage = "display info about devices and drivers", - U_BOOT_CMD_HELP(cmd_devinfo_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_devinfo_help) +BAREBOX_CMD_END #endif @@ -353,7 +353,7 @@ U_BOOT_CMD_END * * Example from an MPC5200 based system: @verbatim - uboot:/ devinfo /dev/eth0 + barebox:/ devinfo /dev/eth0 base : 0x1002b000 size : 0x00000000 driver: fec_mpc5xxx diff --git a/lib/libgen.c b/lib/libgen.c index 8cd0b4196..e1093f16d 100644 --- a/lib/libgen.c +++ b/lib/libgen.c @@ -1,5 +1,5 @@ /* - * libgen.c - some libgen functions needed for U-Boot + * libgen.c - some libgen functions needed for barebox * * See file CREDITS for list of people who contributed to this * project. diff --git a/lib/make_directory.c b/lib/make_directory.c index afbf84e6a..274bc146c 100644 --- a/lib/make_directory.c +++ b/lib/make_directory.c @@ -1,7 +1,7 @@ #include #include -#ifdef __U_BOOT__ +#ifdef __BAREBOX__ #include #include #include @@ -33,7 +33,7 @@ int make_directory(const char *dir) /* If we failed for any other reason than the directory * already exists, output a diagnostic and return -1.*/ -#ifdef __U_BOOT__ +#ifdef __BAREBOX__ if (errno != -EEXIST) #else if (errno != EEXIST) @@ -52,6 +52,6 @@ out: free(path); return errno; } -#ifdef __U_BOOT__ +#ifdef __BAREBOX__ EXPORT_SYMBOL(make_directory); #endif diff --git a/lib/parameter.c b/lib/parameter.c index 1f683b268..6b32207cd 100644 --- a/lib/parameter.c +++ b/lib/parameter.c @@ -135,7 +135,7 @@ int dev_add_param(struct device_d *dev, struct param_d *newparam) @section params_devices Devices can have several parameters. In case of a network device this may be the IP address, networking mask or -similar and users need access to these parameters. In U-Boot this is solved +similar and users need access to these parameters. In barebox this is solved with device paramters. Device parameters are always strings, although there are functions to interpret them as something else. 'hush' users can access parameters as a local variable which have a dot (.) in them. So setting the diff --git a/lib/recursive_action.c b/lib/recursive_action.c index b86445d66..1ef758df6 100644 --- a/lib/recursive_action.c +++ b/lib/recursive_action.c @@ -6,7 +6,7 @@ * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#ifdef __U_BOOT__ +#ifdef __BAREBOX__ #include #include @@ -129,6 +129,6 @@ done_nak_warn: return 0; } -#ifdef __U_BOOT__ +#ifdef __BAREBOX__ EXPORT_SYMBOL(recursive_action); #endif diff --git a/net/dhcp.c b/net/dhcp.c index 9a66dfbce..1c479cfe2 100644 --- a/net/dhcp.c +++ b/net/dhcp.c @@ -608,8 +608,8 @@ static int do_dhcp (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(dhcp) +BAREBOX_CMD_START(dhcp) .cmd = do_dhcp, .usage = "invoke dhcp client to obtain ip/boot params", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/net/nfs.c b/net/nfs.c index 33063d7f6..fe0bc70cb 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -1,5 +1,5 @@ /* - * NFS support driver - based on etherboot and U-BOOT's tftp.c + * NFS support driver - based on etherboot and barebox's tftp.c * * Masami Komiya 2004 * @@ -539,7 +539,7 @@ nfs_read_reply (uchar *pkt, unsigned len) } /************************************************************************** -Interfaces of U-BOOT +Interfaces of barebox **************************************************************************/ static void diff --git a/net/ping.c b/net/ping.c index 6c6b0693e..7a1fda258 100644 --- a/net/ping.c +++ b/net/ping.c @@ -103,7 +103,7 @@ int do_ping (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(ping) +BAREBOX_CMD_START(ping) .cmd = do_ping, .usage = "ping ", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/scripts/.gitignore b/scripts/.gitignore index 4d60d3f1a..26317b28c 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,4 +1,4 @@ -ubootenv +bareboxenv bin2c mkimage kallsyms diff --git a/scripts/Makefile b/scripts/Makefile index cb08458ff..a6829c56b 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -2,7 +2,7 @@ # scripts contains sources for various helper programs used throughout # the kernel for the build process. # --------------------------------------------------------------------------- -# kallsyms: Find all symbols in uboot +# kallsyms: Find all symbols in barebox # pnmttologo: Convert pnm files to logo files # conmakehash: Create chartable # conmakehash: Create arrays for initializing the kernel console tables @@ -13,7 +13,7 @@ hostprogs-$(CONFIG_VT) += conmakehash hostprogs-$(CONFIG_PROM_CONSOLE) += conmakehash hostprogs-y += bin2c hostprogs-y += mkimage -hostprogs-y += ubootenv +hostprogs-y += bareboxenv hostprogs-$(CONFIG_ARCH_NETX) += gen_netx_image always := $(hostprogs-y) $(hostprogs-m) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 6d26dde24..d7e25630d 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -90,7 +90,7 @@ _c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(basetarget).o) _a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o) _cpp_flags = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F)) -# If building uboot in a separate objtree expand all occurrences +# If building barebox in a separate objtree expand all occurrences # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/'). ifeq ($(KBUILD_SRC),) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 0278d29a5..7620c608b 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -56,7 +56,7 @@ _modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules)) # Step 2), invoke modpost # Includes step 3,4 -quiet_cmd_modpost = MODPOST $(words $(filter-out uboot FORCE, $^)) modules +quiet_cmd_modpost = MODPOST $(words $(filter-out barebox FORCE, $^)) modules cmd_modpost = scripts/mod/modpost \ $(if $(CONFIG_MODVERSIONS),-m) \ $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,) \ @@ -67,13 +67,13 @@ quiet_cmd_modpost = MODPOST $(words $(filter-out uboot FORCE, $^)) modules PHONY += __modpost __modpost: $(modules:.ko=.o) FORCE - $(call cmd,modpost) $(wildcard uboot) $(filter-out FORCE,$^) + $(call cmd,modpost) $(wildcard barebox) $(filter-out FORCE,$^) quiet_cmd_kernel-mod = MODPOST $@ cmd_kernel-mod = $(cmd_modpost) $@ -PHONY += uboot -uboot.o: FORCE +PHONY += barebox +barebox.o: FORCE $(call cmd,kernel-mod) # Declare generated files as targets for modpost diff --git a/scripts/ubootenv.c b/scripts/bareboxenv.c similarity index 95% rename from scripts/ubootenv.c rename to scripts/bareboxenv.c index 32da113b5..5c7f10e6b 100644 --- a/scripts/ubootenv.c +++ b/scripts/bareboxenv.c @@ -1,5 +1,5 @@ /* - * ubootenv.c - generate or read a U-Boot environment archive + * bareboxenv.c - generate or read a barebox environment archive * * Copyright (c) 2007 Sascha Hauer , Pengutronix * @@ -125,8 +125,8 @@ char *concat_subpath_file(const char *path, const char *f) void usage(char *prgname) { printf( "Usage : %s [OPTION] DIRECTORY FILE\n" - "Load an u-boot environment sector into a directory or\n" - "save a directory into an u-boot environment sector\n" + "Load an barebox environment sector into a directory or\n" + "save a directory into an barebox environment sector\n" "\n" "options:\n" " -s save (directory -> environment sector)\n" diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile index a0c0189fb..4f284df33 100644 --- a/scripts/basic/Makefile +++ b/scripts/basic/Makefile @@ -3,7 +3,7 @@ # The programs listed herein is what is needed to do the basic stuff, # such as fix dependency file. # This initial step is needed to avoid files to be recompiled -# when uboot configuration changes (which is what happens when +# when barebox configuration changes (which is what happens when # .config is included by main Makefile. # --------------------------------------------------------------------------- # fixdep: Used to generate dependency information during build process diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c index f71e10620..0d4f5e7d7 100644 --- a/scripts/basic/docproc.c +++ b/scripts/basic/docproc.c @@ -1,6 +1,6 @@ /* * docproc is a simple preprocessor for the template files - * used as placeholders for the uboot internal documentation. + * used as placeholders for the barebox internal documentation. * docproc is used for documentation-frontend and * dependency-generator. * The two usages have in common that they require diff --git a/scripts/gen_netx_image.c b/scripts/gen_netx_image.c index 364900b0f..af279d548 100644 --- a/scripts/gen_netx_image.c +++ b/scripts/gen_netx_image.c @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) struct stat s; int opt; unsigned char *buf; - int bytes, err, uboot_size, ofs, i; + int bytes, err, barebox_size, ofs, i; uint32_t *ptr; uint32_t checksum = 0; uint32_t memctrl = 0, sdramctrl = 0, sdramtimctrl = 0, entrypoint = 0, cookie = 0; @@ -158,22 +158,22 @@ int main(int argc, char *argv[]) exit(1); } - uboot_size = s.st_size; - printf("found u-boot image. size: %d bytes. Using entrypoint 0x%08x\n",uboot_size,entrypoint); + barebox_size = s.st_size; + printf("found barebox image. size: %d bytes. Using entrypoint 0x%08x\n",barebox_size,entrypoint); - buf = malloc(uboot_size + sizeof(struct netx_bootblock) + 4); + buf = malloc(barebox_size + sizeof(struct netx_bootblock) + 4); if(!buf) { perror("malloc"); exit(1); } - memset(buf, 0, uboot_size + sizeof(struct netx_bootblock) + 4); + memset(buf, 0, barebox_size + sizeof(struct netx_bootblock) + 4); nb = (struct netx_bootblock *)buf; nb->cookie = cookie; nb->ctrl.mem_ctrl = memctrl; nb->appl_entrypoint = entrypoint; - nb->appl_size = (uboot_size >> 2); + nb->appl_size = (barebox_size >> 2); nb->appl_start_addr = entrypoint; nb->signature = NETX_IDENTIFICATION; @@ -181,7 +181,7 @@ int main(int argc, char *argv[]) nb->config.normal.sdram_timing_ctrl = sdramtimctrl; ofs = sizeof(struct netx_bootblock); - bytes = uboot_size; + bytes = barebox_size; while(bytes) { err = read(fd, buf + ofs, bytes); @@ -220,7 +220,7 @@ int main(int argc, char *argv[]) exit(1); } - bytes = uboot_size + sizeof(struct netx_bootblock); + bytes = barebox_size + sizeof(struct netx_bootblock); ofs = 0; while(bytes) { err = write(fd, buf + ofs, bytes); diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index b82d01af4..3ce2996d2 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -559,7 +559,7 @@ int main(int ac, char **av) case ask_silent: if (stat(".config", &tmpstat)) { printf(_("***\n" - "*** You have not yet configured u-boot!\n" + "*** You have not yet configured barebox!\n" "*** (missing .config file)\n" "***\n" "*** Please run some configurator (e.g. \"make oldconfig\" or\n" diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index aff533968..2b8f14063 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -440,7 +440,7 @@ int conf_write(const char *name) fprintf(out, _("#\n" "# Automatically generated make config: don't edit\n" - "# U-Boot version: %s\n" + "# barebox version: %s\n" "%s%s" "#\n"), sym_get_string_value(sym), @@ -692,13 +692,13 @@ int conf_write_autoconf(void) time(&now); fprintf(out, "#\n" "# Automatically generated make config: don't edit\n" - "# U-Boot version: %s\n" + "# barebox version: %s\n" "# %s" "#\n", sym_get_string_value(sym), ctime(&now)); fprintf(out_h, "/*\n" " * Automatically generated C config: don't edit\n" - " * U-Boot version: %s\n" + " * barebox version: %s\n" " * %s" " */\n" "#define AUTOCONF_INCLUDED\n", diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 4eca54028..4f99c380f 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -29,10 +29,10 @@ static const char mconf_readme[] = N_( "Overview\n" "--------\n" -"Some U-Boot features may be built directly into U-Boot.\n" +"Some barebox features may be built directly into barebox.\n" "Some may be made into loadable runtime modules. Some features\n" "may be completely removed altogether. There are also certain\n" -"U-Boot parameters which are not really features, but must be\n" +"barebox parameters which are not really features, but must be\n" "entered in as decimal or hexadecimal numbers or possibly text.\n" "\n" "Menu items beginning with [*], or [ ] represent features\n" @@ -115,7 +115,7 @@ static const char mconf_readme[] = N_( "-----------------------------\n" "Menuconfig supports the use of alternate configuration files for\n" "those who, for various reasons, find it necessary to switch\n" -"between different U-Boot configurations.\n" +"between different barebox configurations.\n" "\n" "At the end of the main menu you will find two options. One is\n" "for saving the current configuration to a file of your choosing.\n" @@ -148,7 +148,7 @@ static const char mconf_readme[] = N_( "\n" "Optional personality available\n" "------------------------------\n" -"If you prefer to have all of the U-Boot options listed in a single\n" +"If you prefer to have all of the barebox options listed in a single\n" "menu, rather than the default multimenu hierarchy, run the menuconfig\n" "with MENUCONFIG_MODE environment variable set to single_menu. Example:\n" "\n" @@ -200,18 +200,18 @@ setmod_text[] = N_( "This feature depends on another which has been configured as a module.\n" "As a result, this feature will be built as a module."), nohelp_text[] = N_( - "There is no help available for this U-Boot option.\n"), + "There is no help available for this barebox option.\n"), load_config_text[] = N_( "Enter the name of the configuration file you wish to load. " "Accept the name shown to restore the configuration you " "last retrieved. Leave blank to abort."), load_config_help[] = N_( "\n" - "For various reasons, one may wish to keep several different U-Boot\n" + "For various reasons, one may wish to keep several different barebox\n" "configurations available on a single machine.\n" "\n" "If you have saved a previous configuration in a file other than the\n" - "U-Boot's default, entering the name of the file here will allow you\n" + "barebox's default, entering the name of the file here will allow you\n" "to modify that configuration.\n" "\n" "If you are uncertain, then you have probably never used alternate\n" @@ -221,7 +221,7 @@ save_config_text[] = N_( "as an alternate. Leave blank to abort."), save_config_help[] = N_( "\n" - "For various reasons, one may wish to keep different U-Boot\n" + "For various reasons, one may wish to keep different barebox\n" "configurations available on a single machine.\n" "\n" "Entering a file name here will allow you to later retrieve, modify\n" @@ -403,7 +403,7 @@ static void set_config_filename(const char *config_filename) sym = sym_lookup("KERNELVERSION", 0); sym_calc_value(sym); size = snprintf(menu_backtitle, sizeof(menu_backtitle), - _("%s - U-Boot v%s Configuration"), + _("%s - barebox v%s Configuration"), config_filename, sym_get_string_value(sym)); if (size >= sizeof(menu_backtitle)) menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; @@ -919,7 +919,7 @@ int main(int ac, char **av) if (conf_get_changed()) res = dialog_yesno(NULL, _("Do you wish to save your " - "new U-Boot configuration?\n" + "new barebox configuration?\n" " to continue."), 6, 60); else @@ -931,20 +931,20 @@ int main(int ac, char **av) case 0: if (conf_write(filename)) { fprintf(stderr, _("\n\n" - "Error during writing of the U-Boot configuration.\n" - "Your U-Boot configuration changes were NOT saved." + "Error during writing of the barebox configuration.\n" + "Your barebox configuration changes were NOT saved." "\n\n")); return 1; } case -1: printf(_("\n\n" - "*** End of U-Boot configuration.\n" - "*** Execute 'make' to build U-Boot or try 'make help'." + "*** End of barebox configuration.\n" + "*** Execute 'make' to build barebox or try 'make help'." "\n\n")); break; default: fprintf(stderr, _("\n\n" - "Your U-Boot configuration changes were NOT saved." + "Your barebox configuration changes were NOT saved." "\n\n")); } diff --git a/scripts/mkimage.c b/scripts/mkimage.c index ab7d55dc4..240c5cf5d 100644 --- a/scripts/mkimage.c +++ b/scripts/mkimage.c @@ -118,7 +118,7 @@ table_entry_t os_name[] = { { IH_OS_SCO, "sco", "SCO", }, { IH_OS_SOLARIS, "solaris", "Solaris", }, { IH_OS_SVR4, "svr4", "SVR4", }, - { IH_OS_U_BOOT, "u-boot", "U-Boot", }, + { IH_OS_BAREBOX, "barebox", "barebox", }, { IH_OS_VXWORKS, "vxworks", "VxWorks", }, { -1, "", "", }, }; @@ -269,14 +269,14 @@ NXTARG: ; if (!eflag) { ep = addr; - /* If XIP, entry point must be after the U-Boot header */ + /* If XIP, entry point must be after the barebox header */ if (xflag) ep += sizeof(image_header_t); } /* * If XIP, ensure the entry point is equal to the load address plus - * the size of the U-Boot header. + * the size of the barebox header. */ if (xflag) { if (ep != addr + sizeof(image_header_t)) { diff --git a/scripts/mksysmap b/scripts/mksysmap index 67f094702..bacef6a4b 100644 --- a/scripts/mksysmap +++ b/scripts/mksysmap @@ -1,10 +1,10 @@ #!/bin/sh -x -# Based on the uboot file create the System.map file +# Based on the barebox file create the System.map file # System.map is used by module-init tools and some debugging # tools to retrieve the actual addresses of symbols in the kernel. # # Usage -# mksysmap uboot System.map +# mksysmap barebox System.map ##### diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 76e61042e..4075c35d3 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -91,8 +91,8 @@ static int is_vmlinux(const char *modname) else myname = modname; - return (strcmp(myname, "uboot") == 0) || - (strcmp(myname, "uboot.o") == 0); + return (strcmp(myname, "barebox") == 0) || + (strcmp(myname, "barebox.o") == 0); } void *do_nofail(void *ptr, const char *expr)