summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/i2c.c2
-rw-r--r--drivers/nand/Kconfig2
-rw-r--r--drivers/nand/atmel_nand.c4
-rw-r--r--drivers/nand/nand_imx.c6
-rw-r--r--drivers/nand/nand_s3c2410.c8
-rw-r--r--drivers/net/cs8900.c4
-rw-r--r--drivers/net/dm9000.c2
-rw-r--r--drivers/net/macb.c2
-rw-r--r--drivers/net/netx_eth.c2
-rw-r--r--drivers/net/smc91111.c2
-rw-r--r--drivers/net/tap.c4
-rw-r--r--drivers/nor/Kconfig2
-rw-r--r--drivers/nor/cfi_flash.c4
-rw-r--r--drivers/nor/cfi_flash_new.c2
-rw-r--r--drivers/serial/serial_ns16550.c4
-rw-r--r--drivers/usb/gadget/serial.c2
-rw-r--r--drivers/usb/gadget/u_serial.c4
-rw-r--r--drivers/usb/usb.c10
18 files changed, 33 insertions, 33 deletions
diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c
index a00e53a388..079a7eabc6 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 72b2be049a..031b94d4e5 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 e8f85fc621..c3669e5a31 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 5c02ee0515..5fe288f023 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 <dest> <size>\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 b1fe377bef..2f98c76221 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 <dest> <size> <pagesize>\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 32566cdb30..64366acb15 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 <ivo.clarysse@gmail.com>
*
- * 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 <www.elinos.com>
* Marius Groeger <mgroeger@sysgo.de>
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index b8ad98d1da..77c771bf32 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
* <saschahauer@web.de>
*
* ... see commit logs
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 693e64f278..1bb833ae69 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -18,7 +18,7 @@
#include <common.h>
/*
- * 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 e29f69ccb5..e535f18e7a 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 987b284b2f..0df664aefc 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 7070cc6b41..8673436caf 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 <s.hauer@pengutronix.de>, 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 7d9497e3be..db07aa30c5 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 7131aa5707..37206d0e52 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 e114bd2be6..c9910eda09 100644
--- a/drivers/nor/cfi_flash_new.c
+++ b/drivers/nor/cfi_flash_new.c
@@ -45,7 +45,7 @@
#include <errno.h>
/*
- * 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 524190dbc3..de316f9a47 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 1b15178eae..f6a712b1c4 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 5b22e151b3..d3b49edafa 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 208a38cdb7..decdbdd8e7 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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 23:53:05 +0000