diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-12-15 09:11:09 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-12-15 10:18:30 +0100 |
commit | a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97 (patch) | |
tree | 7a9076c1a20df00baeadca9a07d4c1f5cd0611e2 /common | |
parent | caa5cec7b1c93d660aa89d24eb160ab18e4eb628 (diff) | |
download | barebox-a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97.tar.gz barebox-a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97.tar.xz |
rename U-Boot-v2 project to barebox
This has been done with the following script:
find -path ./.git -prune -o -type f -print0 | xargs -0 -r sed -i \
-e 's/u2boot/barebox/g' \
-e 's/U2Boot/barebox/g' \
-e 's/U-boot V2/barebox/g' \
-e 's/u-boot v2/barebox/g' \
-e 's/U-Boot V2/barebox/g' \
-e 's/U-Boot-v2/barebox/g' \
-e 's/U_BOOT/BAREBOX/g' \
-e 's/UBOOT/BAREBOX/g' \
-e 's/uboot/barebox/g' \
-e 's/u-boot/barebox/g' \
-e 's/u_boot/barebox/g' \
-e 's/U-Boot/barebox/g' \
-e 's/U-boot/barebox/g' \
-e 's/U-BOOT/barebox/g'
find -path ./.git -prune -o \( -name "*u-boot*" -o -name "*uboot*" -o -name "*u_boot*" \) -print0 | \
xargs -0 -r rename 's/u[-_]?boot/barebox/'
It needs some manual fixup following in the next patch
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
-rw-r--r-- | common/Kconfig | 28 | ||||
-rw-r--r-- | common/Makefile | 10 | ||||
-rw-r--r-- | common/command.c | 18 | ||||
-rw-r--r-- | common/dlmalloc.c | 8 | ||||
-rw-r--r-- | common/environment.c | 6 | ||||
-rw-r--r-- | common/ft_build.c | 8 | ||||
-rw-r--r-- | common/hush.c | 12 | ||||
-rw-r--r-- | common/module.c | 2 | ||||
-rw-r--r-- | common/module.lds.S | 4 | ||||
-rw-r--r-- | common/startup.c | 22 |
10 files changed, 59 insertions, 59 deletions
diff --git a/common/Kconfig b/common/Kconfig index 7d6cd9894f..4c4a627a36 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 7f5bdb7ec8..d7a024bf86 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 d9907250a7..e21e80dc17 100644 --- a/common/command.c +++ b/common/command.c @@ -37,7 +37,7 @@ #include <getopt.h> 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 2f616370aa..83b1e187f8 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 c314d7cccc..0c7de84b5f 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 <common.h> #include <command.h> #include <malloc.h> diff --git a/common/ft_build.c b/common/ft_build.c index 578a4b8ed3..4a7ff31370 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 e4ae631bff..e7a13c2bd3 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 302aefa637..cedd7029bf 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 ae5ca5cf84..52454f71b1 100644 --- a/common/module.lds.S +++ b/common/module.lds.S @@ -22,7 +22,7 @@ * */ -#include <asm-generic/u-boot.lds.h> +#include <asm-generic/barebox.lds.h> 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 e40759d2c6..6dca2702a9 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 <common.h> #include <init.h> @@ -41,8 +41,8 @@ #include <reloc.h> #include <asm-generic/memory_layout.h> -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 <uboot_default_env.h> +#include <barebox_default_env.h> 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(); } |