summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/.gitignore2
-rw-r--r--include/asm-generic/barebox.lds.h22
-rw-r--r--include/asm-generic/u-boot.lds.h22
-rw-r--r--include/bzlib.h4
-rw-r--r--include/command.h20
-rw-r--r--include/common.h6
-rw-r--r--include/envfs.h2
-rw-r--r--include/environment.h6
-rw-r--r--include/fcntl.h2
-rw-r--r--include/ft_build.h2
-rw-r--r--include/i2c/i2c.h2
-rw-r--r--include/image.h18
-rw-r--r--include/linux/barebox-wrapper.h (renamed from include/linux/uboot-wrapper.h)6
-rw-r--r--include/linux/bitops.h2
-rw-r--r--include/linux/kernel.h2
-rw-r--r--include/linux/mtd/compat.h2
-rw-r--r--include/part.h4
-rw-r--r--include/reloc.h2
-rw-r--r--include/usb_dfu_trailer.h10
19 files changed, 68 insertions, 68 deletions
diff --git a/include/.gitignore b/include/.gitignore
index c5149e0a8c..bb388cccaa 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 0000000000..99ccc5e970
--- /dev/null
+++ b/include/asm-generic/barebox.lds.h
@@ -0,0 +1,22 @@
+
+#if defined CONFIG_ARCH_IMX25 || defined CONFIG_ARCH_IMX35
+#include <mach/barebox.lds.h>
+#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 2202627534..0000000000
--- a/include/asm-generic/u-boot.lds.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#if defined CONFIG_ARCH_IMX25 || defined CONFIG_ARCH_IMX35
-#include <mach/u-boot.lds.h>
-#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 2d864d56b7..4b0f820fed 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 a769d547d4..f103045fd4 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 3df1f7fbfd..c38257177e 100644
--- a/include/common.h
+++ b/include/common.h
@@ -57,7 +57,7 @@
typedef void (interrupt_handler_t)(void *);
-#include <asm/u-boot.h> /* boot information for Linux kernel */
+#include <asm/barebox.h> /* 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 dd88f7478d..b5849d9b8d 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 a50fc6857f..21a7ffa0e2 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 ca62df0278..aed741e584 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 be4229ec3a..1fb6b4d11e 100644
--- a/include/ft_build.h
+++ b/include/ft_build.h
@@ -7,7 +7,7 @@
#define FT_BUILD_H
#include <linux/types.h>
-#include <asm/u-boot.h>
+#include <asm/barebox.h>
/* 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 670898ba4a..6b0e585094 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 <mkl@pengutronix.de>
*
diff --git a/include/image.h b/include/image.h
index 5524f84246..13d0303160 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
index 9722d513b4..1221a21fb6 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 <xfuncs.h>
@@ -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 e8ff23b6e0..127c1619fe 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 7e613d3062..e9e2f0764f 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -2,7 +2,7 @@
#define _LINUX_KERNEL_H
#include <linux/compiler.h>
-#include <linux/uboot-wrapper.h>
+#include <linux/barebox-wrapper.h>
/*
* min()/max()/clamp() macros that also do
diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h
index fe55087ea9..a99d86e693 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 318aa3cb3f..d0c419ba00 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 d450097dde..a5ad7575b1 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 3903b85b39..2cf66a590c 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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 07:42:36 +0000