summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/barebox-main.dox2
-rw-r--r--arch/architecture.dox2
-rw-r--r--arch/arm/mach-omap/include/mach/clocks.h2
-rw-r--r--arch/arm/mach-omap/include/mach/omap3-clock.h2
-rw-r--r--arch/arm/mach-omap/include/mach/omap3-mux.h2
-rw-r--r--arch/arm/mach-omap/include/mach/sdrc.h2
-rw-r--r--arch/arm/mach-omap/include/mach/sys_info.h2
-rw-r--r--arch/arm/mach-omap/include/mach/syslib.h2
-rw-r--r--arch/arm/mach-omap/omap3_clock.c6
-rw-r--r--arch/arm/mach-omap/omap3_generic.c2
-rw-r--r--arch/arm/mach-omap/syslib.c2
-rw-r--r--commands/xyzModem.c2
-rw-r--r--drivers/i2c/i2c.c2
-rw-r--r--drivers/serial/serial_ns16550.c18
-rw-r--r--include/i2c/i2c.h2
15 files changed, 25 insertions, 25 deletions
diff --git a/Documentation/barebox-main.dox b/Documentation/barebox-main.dox
index 2246775269..e2f965ce70 100644
--- a/Documentation/barebox-main.dox
+++ b/Documentation/barebox-main.dox
@@ -1,6 +1,6 @@
/** @mainpage Universal Bootloader
-@section barebox_v2_intro Introduction
+@section barebox_intro Introduction
This is barebox, our proposal for a next generation of the famous barebox
bootloader. barebox offers an excellent choice as a bootloader for
diff --git a/arch/architecture.dox b/arch/architecture.dox
index 5f2b458797..b1e32a5328 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 barebox v2! This
+Don't rely on the given object file order to create your binary barebox! 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
diff --git a/arch/arm/mach-omap/include/mach/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h
index 5c4701fe4f..1221238de8 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/barebox-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-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 2a509d84fd..22694f2367 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/barebox-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-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 258a122ef8..2badc3f851 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/barebox-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-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 b9fecf81aa..9d2d2d1107 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/barebox-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-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 13e17d476f..43967209f1 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/barebox-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-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 d7467435de..c89f50b816 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/barebox-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-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 2727fd63d1..f1b3b07172 100644
--- a/arch/arm/mach-omap/omap3_clock.c
+++ b/arch/arm/mach-omap/omap3_clock.c
@@ -12,10 +12,10 @@
* This critical path is handled by relocating the relevant functions in
* omap3_clock_core.S to OMAP's ISRAM and executing it there.
*
- * @warning: IMPORTANT: These functions run from ISRAM stack, so no bss sections
- * should be used: functions cannot use global variables/switch constructs.
+ * @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/barebox-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
* (C) Copyright 2006-2008
diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c
index e5a2addff5..05c5c198bd 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/barebox-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
* (C) Copyright 2006-2008
diff --git a/arch/arm/mach-omap/syslib.c b/arch/arm/mach-omap/syslib.c
index e966d8e7c5..2b25dc153c 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/barebox-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
* (C) Copyright 2006-2008
diff --git a/commands/xyzModem.c b/commands/xyzModem.c
index e034658eb9..1dd255d8e3 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 barebox V1 xyzModem.c
+ * Originally from u-boot xyzModem.c
*/
/*
* 2008 - Nishanth Menon <x0nishan@ti.com>
diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c
index 079a7eabc6..32fd026de5 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 - barebox-v2 SPI Framework
+ * - spi.c - barebox SPI Framework
* Copyright (C) 2008 Sascha Hauer, Pengutronix
* - Linux SPI Framework
* Copyright (C) 2005 David Brownell
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index de316f9a47..1385bda028 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 barebox V1 drivers/serial.c and drivers/ns16550.c
+ * Modified from u-boot 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
*/
@@ -49,7 +49,7 @@
/*********** Private Functions **********************************/
/**
- * @brief ns16550_calc_divisor - compute the divisor for a baud rate
+ * @brief Compute the divisor for a baud rate
*
* @param[in] cdev pointer to console device
* @param[in] baudrate baud rate
@@ -87,7 +87,7 @@ static unsigned int ns16550_calc_divisor(struct console_device *cdev,
}
/**
- * @brief ns16550_serial_init_port - initialize the device
+ * @brief Initialize the device
*
* @param[in] cdev pointer to console device
*/
@@ -120,7 +120,7 @@ static void ns16550_serial_init_port(struct console_device *cdev)
/*********** Exposed Functions **********************************/
/**
- * @brief ns16550_putc- put a character to the serial port
+ * @brief Put a character to the serial port
*
* @param[in] cdev pointer to console device
* @param[in] c character to put
@@ -136,7 +136,7 @@ static void ns16550_putc(struct console_device *cdev, char c)
}
/**
- * @brief ns16550_getc - retrieve a character from serial port
+ * @brief Retrieve a character from serial port
*
* @param[in] cdev pointer to console device
*
@@ -153,7 +153,7 @@ static int ns16550_getc(struct console_device *cdev)
}
/**
- * @brief ns16550_tstc - test if character is available
+ * @brief Test if character is available
*
* @param[in] cdev pointer to console device
*
@@ -168,7 +168,7 @@ static int ns16550_tstc(struct console_device *cdev)
}
/**
- * @brief ns16550_setbaudrate - set the baudrate for the uart port
+ * @brief Set the baudrate for the uart port
*
* @param[in] cdev console device
* @param[in] baud_rate baud rate to set
@@ -192,7 +192,7 @@ static int ns16550_setbaudrate(struct console_device *cdev, int baud_rate)
}
/**
- * @brief ns16550_probe - Probe entry point -called on the first match for device
+ * @brief Probe entry point -called on the first match for device
*
* @param[in] dev matched device
*
@@ -237,7 +237,7 @@ static struct driver_d ns16550_serial_driver = {
};
/**
- * @brief ns16550_serial_init - driver initialization function
+ * @brief driver initialization function
*
* @return result of register_driver
*/
diff --git a/include/i2c/i2c.h b/include/i2c/i2c.h
index 6b0e585094..5447a79bfe 100644
--- a/include/i2c/i2c.h
+++ b/include/i2c/i2c.h
@@ -1,5 +1,5 @@
/*
- * i2c.h - definitions for the barebox-v2 i2c framework
+ * i2c.h - definitions for the barebox i2c framework
*
* Copyricht (C) 2009 by Marc Kleine-Budde <mkl@pengutronix.de>
*
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 20:42:30 +0000