Skip to content

Commit

Permalink
Use correct spelling of "U-Boot"
Browse files Browse the repository at this point in the history
Correct spelling of "U-Boot" shall be used in all written text
(documentation, comments in source files etc.).

Signed-off-by: Bin Meng <[email protected]>
Reviewed-by: Heiko Schocher <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Reviewed-by: Minkyu Kang <[email protected]>
  • Loading branch information
lbmeng authored and vdsao committed Feb 6, 2016
1 parent 94985cc commit a187559
Show file tree
Hide file tree
Showing 318 changed files with 606 additions and 606 deletions.
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ The following options need to be configured:

CONFIG_SYS_CPC_REINIT_F
This CONFIG is defined when the CPC is configured as SRAM at the
time of U-boot entry and is required to be re-initialized.
time of U-Boot entry and is required to be re-initialized.

CONFIG_DEEP_SLEEP
Indicates this SoC supports deep sleep feature. If deep sleep is
Expand Down Expand Up @@ -2963,7 +2963,7 @@ CBFS (Coreboot Filesystem) support
- Parallel Flash support:
CONFIG_SYS_NO_FLASH

Traditionally U-boot was run on systems with parallel NOR
Traditionally U-Boot was run on systems with parallel NOR
flash. This option is used to disable support for parallel NOR
flash. This option should be defined if the board does not have
parallel flash.
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void reset_cpu(ulong addr)
int arch_cpu_init(void)
{
/*
* It might be necessary to flush data cache, if U-boot is loaded
* It might be necessary to flush data cache, if U-Boot is loaded
* from kickstart bootloader, e.g. from S1L loader
*/
flush_dcache_all();
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ lowlevel_init:
orr r0, #0x00000004
str r0, [r1]

/* Return to U-boot via saved link register */
/* Return to U-Boot via saved link register */
mov pc, lr
2 changes: 1 addition & 1 deletion arch/arm/cpu/armv7/nonsec_virt.S
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ _monitor_vectors:

/*
* secure monitor handler
* U-boot calls this "software interrupt" in start.S
* U-Boot calls this "software interrupt" in start.S
* This is executed on a "smc" instruction, we use a "smc #0" to switch
* to non-secure state.
* r0, r1, r2: passed to the callee
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/armv8/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if ARM64

config ARMV8_MULTIENTRY
boolean "Enable multiple CPUs to enter into U-boot"
boolean "Enable multiple CPUs to enter into U-Boot"

endif
2 changes: 1 addition & 1 deletion arch/arm/dts/uniphier-ph1-ld4-ref.dts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
status = "okay";
};

/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/uniphier-ph1-ld6b-ref.dts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
status = "okay";
};

/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/uniphier-ph1-pro4-ref.dts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
status = "okay";
};

/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
status = "okay";
};

/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/uniphier-ph1-sld3-ref.dts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
status = "okay";
};

/* for U-boot only */
/* for U-Boot only */
&serial0 {
u-boot,dm-pre-reloc;
};
2 changes: 1 addition & 1 deletion arch/arm/dts/uniphier-ph1-sld8-ref.dts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
status = "okay";
};

/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/uniphier-proxstream2-gentil.dts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
status = "okay";
};

/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/uniphier-proxstream2-vodka.dts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
status = "okay";
};

/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/mach-exynos/include/mach/spl.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ struct spl_machine_param {
u32 mem_iv_size; /* Memory channel interleaving size */
enum ddr_mode mem_type; /* Type of on-board memory */
/*
* U-boot size - The iROM mmc copy function used by the SPL takes a
* block count paramter to describe the u-boot size unlike the spi
* boot copy function which just uses the u-boot size directly. Align
* the u-boot size to block size (512 bytes) when populating the SPL
* U-Boot size - The iROM mmc copy function used by the SPL takes a
* block count paramter to describe the U-Boot size unlike the spi
* boot copy function which just uses the U-Boot size directly. Align
* the U-Boot size to block size (512 bytes) when populating the SPL
* table only for mmc boot.
*/
u32 uboot_size;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-exynos/sec_boot.S
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ relocate_wait_code:
* because that comes out to be the last 4KB of the iRAM
* (Base Address - 0x02020000, Limit Address - 0x020740000).
*
* U-boot and kernel are aware of this code and flags by the simple
* U-Boot and kernel are aware of this code and flags by the simple
* fact that we are implementing a workaround in the last 4KB
* of the iRAM and we have already defined these flag and address
* values in both kernel and U-boot for our use.
* values in both kernel and U-Boot for our use.
*/
code_base:
b 1f
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-exynos/spl_boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ static void exynos_spi_copy(unsigned int uboot_size, unsigned int uboot_addr)
#endif

/*
* Copy U-boot from mmc to RAM:
* Copy U-Boot from mmc to RAM:
* COPY_BL2_FNPTR_ADDR: Address in iRAM, which Contains
* Pointer to API (Data transfer from mmc to ram)
*/
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-orion5x/lowlevel_init.S
Original file line number Diff line number Diff line change
Expand Up @@ -283,5 +283,5 @@ lowlevel_init:

#endif /* CONFIG_SPL_BUILD */

/* Return to U-boot via saved link register */
/* Return to U-Boot via saved link register */
mov pc, lr
2 changes: 1 addition & 1 deletion arch/blackfin/cpu/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/cpu/cpu.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - cpu.c CPU specific functions
* U-Boot - cpu.c CPU specific functions
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/cpu/cpu.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - cpu.h
* U-Boot - cpu.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/cpu/interrupts.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - interrupts.c Interrupt related routines
* U-Boot - interrupts.c Interrupt related routines
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*
Expand Down
4 changes: 2 additions & 2 deletions arch/blackfin/cpu/start.S
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - start.S Startup file for Blackfin u-boot
* U-Boot - start.S Startup file for Blackfin U-Boot
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*
Expand Down Expand Up @@ -51,7 +51,7 @@ ENTRY(_start)
#ifdef CONFIG_HW_WATCHDOG
/* Program the watchdog with default timeout of ~5 seconds.
* That should be long enough to bootstrap ourselves up and
* then the common u-boot code can take over.
* then the common U-Boot code can take over.
*/
r1 = WDDIS;
# ifdef __ADSPBF60x__
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/cpu/traps.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - traps.c Routines related to interrupts and exceptions
* U-Boot - traps.c Routines related to interrupts and exceptions
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/cpu/u-boot.lds
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - u-boot.lds.S
* U-Boot - u-boot.lds.S
*
* Copyright (c) 2005-2010 Analog Device Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/bitops.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - bitops.h Routines for bit operations
* U-Boot - bitops.h Routines for bit operations
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/blackfin_local.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - blackfin_local.h
* U-Boot - blackfin_local.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/byteorder.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - byteorder.h
* U-Boot - byteorder.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/deferred.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - deferred register layout
* U-Boot - deferred register layout
*
* Copyright 2004-2009 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/delay.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - delay.h Routines for introducing delays
* U-Boot - delay.h Routines for introducing delays
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/global_data.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - global_data.h Declarations for global data of u-boot
* U-Boot - global_data.h Declarations for global data of U-Boot
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/io.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - io.h IO routines
* U-Boot - io.h IO routines
*
* Copyright 2004-2009 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/linkage.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - linkage.h
* U-Boot - linkage.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/posix_types.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - posix_types.h
* U-Boot - posix_types.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/processor.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - processor.h
* U-Boot - processor.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/shared_resources.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - setup.h
* U-Boot - setup.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/soft_switch.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2008-2012 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/string.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - string.h String functions
* U-Boot - string.h String functions
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/system.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - system.h
* U-Boot - system.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/types.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - types.h
* U-Boot - types.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/u-boot.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - u-boot.h Structure declarations for board specific data
* U-Boot - u-boot.h Structure declarations for board specific data
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/lib/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# U-boot Makefile
# U-Boot Makefile
#
# Copyright (c) 2005-2008 Analog Devices Inc.
#
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/lib/boot.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - boot.c - misc boot helper functions
* U-Boot - boot.c - misc boot helper functions
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/lib/cache.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - cache.c
* U-Boot - cache.c
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/lib/cmd_cache_dump.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - cmd_cache_dump.c
* U-Boot - cmd_cache_dump.c
*
* Copyright (c) 2007-2008 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/lib/kgdb.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - architecture specific kgdb code
* U-Boot - architecture specific kgdb code
*
* Copyright 2009 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/lib/muldi3.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - muldi3.c contains routines for mult and div
* U-Boot - muldi3.c contains routines for mult and div
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/lib/sections.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - section.c
* U-Boot - section.c
*
* Copyright (c) 2014 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/lib/string.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - string.c Contains library routines.
* U-Boot - string.c Contains library routines.
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/lib/muldi3.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* U-boot - muldi3.c contains routines for mult and div
* U-Boot - muldi3.c contains routines for mult and div
*
*
* SPDX-License-Identifier: GPL-2.0+
Expand Down
Loading

0 comments on commit a187559

Please sign in to comment.