Skip to content

Commit

Permalink
global: Use proper project name U-Boot
Browse files Browse the repository at this point in the history
Use proper project name in comments, Kconfig, readmes.

Reviewed-by: Neil Armstrong <[email protected]>
Acked-by: Ilias Apalodimas <[email protected]>
Reviewed-by: Stefan Roese <[email protected]>
Reviewed-by: Qu Wenruo <[email protected]>
Signed-off-by: Michal Simek <[email protected]>
Link: https://lore.kernel.org/r/0dbdf0432405c1c38ffca55703b6737a48219e79.1684307818.git.michal.simek@amd.com
  • Loading branch information
michalsimek committed Jun 12, 2023
1 parent 6fe4693 commit 1be82af
Show file tree
Hide file tree
Showing 66 changed files with 103 additions and 103 deletions.
2 changes: 1 addition & 1 deletion arch/Kconfig.nxp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ config SPL_UBOOT_KEY_HASH
default ""
help
Set the key hash for U-Boot here if public/private key pair used to
sign U-boot are different from the SRK hash put in the fuse. Example
sign U-Boot are different from the SRK hash put in the fuse. Example
of a key hash is
41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b.
Otherwise leave this empty.
Expand Down
2 changes: 1 addition & 1 deletion arch/arc/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static inline void sync(void)

/*
* We add memory barriers for __raw_readX / __raw_writeX accessors same way as
* it is done for readX and writeX accessors as lots of U-boot driver uses
* it is done for readX and writeX accessors as lots of U-Boot driver uses
* __raw_readX / __raw_writeX instead of proper accessor with barrier.
*/
#define __raw_writeb(v, c) ({ __iowmb(); __arch_putb(v, c); })
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/armv7/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ config ARMV7_LPAE
config ARMV7_SET_CORTEX_SMPEN
bool
help
Enable the ARM Cortex ACTLR.SMP enable bit in U-boot.
Enable the ARM Cortex ACTLR.SMP enable bit in U-Boot.

config SPL_ARMV7_SET_CORTEX_SMPEN
bool
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/armv8/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ config ARMV8_PSCI
bool "Enable PSCI support" if EXPERT
help
PSCI is Power State Coordination Interface defined by ARM.
The PSCI in U-boot provides a general framework and each platform
The PSCI in U-Boot provides a general framework and each platform
can implement their own specific PSCI functions.
Say Y here to enable PSCI support on ARMv8 platform.

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ mcinitcmd: This environment variable is defined to initiate MC and DPL deploymen
from the location where it is stored(NOR, NAND, SD, SATA, USB)during
u-boot booting.If this variable is not defined then MC_BOOT_ENV_VAR
will be null and MC will not be booted and DPL will not be applied
during U-boot booting.However the MC, DPC and DPL can be applied from
during U-Boot booting.However the MC, DPC and DPL can be applied from
console independently.
The variable needs to be set from the console once and then on
rebooting the parameters set in the variable will automatically be
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/fsl-ls1028a.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

idle-states {
/*
* PSCI node is not added default, U-boot will add missing
* PSCI node is not added default, U-Boot will add missing
* parts if it determines to use PSCI.
*/
entry-method = "psci";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/meson-g12-common-u-boot.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

/ {
/* Keep HW order from U-boot */
/* Keep HW order from U-Boot */
aliases {
/delete-property/ mmc0;
/delete-property/ mmc1;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/meson-gx-u-boot.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

/ {
/* Keep HW order from U-boot */
/* Keep HW order from U-Boot */
aliases {
/delete-property/ mmc0;
/delete-property/ mmc1;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/rk3328-evb-u-boot.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
};

&gmac2phy {
/* Integrated PHY unsupported by U-boot */
/* Integrated PHY unsupported by U-Boot */
status = "broken";
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/rk3328.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@
};

/*
* U-boot Specific Change
* U-Boot Specific Change
*
* The OTG controller must come after the USB host pair for it
* to work. This is likely due to lack of support for the USB
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch2.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*
* -PCIe
* -there is a range of stream IDs set aside for PCI in this
* file. U-boot will scan the PCI bus and for each device discovered:
* file. U-Boot will scan the PCI bus and for each device discovered:
* -allocate a streamID
* -set a PEXn LUT table entry mapping 'requester ID' to 'stream ID'
* -set a msi-map entry in the PEXn controller node in the
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch3.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*
* -PCIe
* -there is a range of stream IDs set aside for PCI in this
* file. U-boot will scan the PCI bus and for each device discovered:
* file. U-Boot will scan the PCI bus and for each device discovered:
* -allocate a streamID
* -set a PEXn LUT table entry mapping 'requester ID' to 'stream ID'
* -set a msi-map entry in the PEXn controller node in the
Expand Down
2 changes: 1 addition & 1 deletion board/bosch/acc/acc.c
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ int board_mmc_init(struct bd_info *bis)
gpio_direction_input(USDHC2_CD_GPIO);
/*
* According to the board_mmc_init() the following map is done:
* (U-boot device node) (Physical Port)
* (U-Boot device node) (Physical Port)
* mmc0 USDHC2
* mmc1 USDHC4
*/
Expand Down
2 changes: 1 addition & 1 deletion board/bosch/shc/README
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Netboot
- see also doc/SPL/README.am335x-network

- set the jumper into netboot mode
- compile the U-boot sources with:
- compile the U-Boot sources with:
make am335x_shc_netboot_defconfig
make all
- copy the images into your tftp boot directory
Expand Down
2 changes: 1 addition & 1 deletion board/compulab/cl-som-imx7/cl-som-imx7.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ int board_mmc_init(struct bd_info *bis)
int i, ret;
/*
* According to the board_mmc_init() the following map is done:
* (U-boot device node) (Physical Port)
* (U-Boot device node) (Physical Port)
* mmc0 USDHC1
* mmc2 USDHC3 (eMMC)
*/
Expand Down
2 changes: 1 addition & 1 deletion board/hisilicon/poplar/README
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ CONNECTORS One connector for Smart Card One connector for TSI
Note of warning:
================

U-boot has a *strong* dependency with the l-loader and the arm trusted firmware
U-Boot has a *strong* dependency with the l-loader and the arm trusted firmware
repositories.

The boot sequence is:
Expand Down
2 changes: 1 addition & 1 deletion board/isee/igep003x/board.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ DECLARE_GLOBAL_DATA_PTR;

/* GPIO0_27 and GPIO0_26 are used to read board revision from IGEP003x boards
* and control IGEP0034 green and red LEDs.
* U-boot configures these pins as input pullup to detect board revision:
* U-Boot configures these pins as input pullup to detect board revision:
* IGEP0034-LITE = 0b00
* IGEP0034 (FULL) = 0b01
* IGEP0033 = 0b1X
Expand Down
2 changes: 1 addition & 1 deletion board/isee/igep00x0/igep00x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ U_BOOT_DRVINFO(igep_uart) = {
* IGEP00x0 boards. First of all, it is necessary to reset USB transceiver from
* IGEP0030 in order to read GPIO_IGEP00X0_BOARD_DETECTION correctly, because
* this functionality is shared by USB HOST.
* Once USB reset is applied, U-boot configures these pins as input pullup to
* Once USB reset is applied, U-Boot configures these pins as input pullup to
* detect board and revision:
* IGEP0020-RF = 0b00
* IGEP0020-RC = 0b01
Expand Down
8 changes: 4 additions & 4 deletions board/keymile/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ config SYS_IVM_EEPROM_PAGE_LEN
Page size of inventory in EEPROM.

config PG_WCOM_UBOOT_UPDATE_SUPPORTED
bool "Enable U-boot Field Fail-Safe Update Functionality"
bool "Enable U-Boot Field Fail-Safe Update Functionality"
select EVENT
default n
help
Expand All @@ -132,23 +132,23 @@ config PG_WCOM_UBOOT_UPDATE_SUPPORTED
from parallel NOR flash.

config PG_WCOM_UBOOT_BOOTPACKAGE
bool "U-boot Is Part Of Factory Boot-Package Image"
bool "U-Boot Is Part Of Factory Boot-Package Image"
default n
help
Indicates that u-boot will be a part of the factory programmed
boot-package image.
Has to be set for original u-boot programmed at factory.

config PG_WCOM_UBOOT_UPDATE_TEXT_BASE
hex "Text Base For U-boot Programmed Outside Factory"
hex "Text Base For U-Boot Programmed Outside Factory"
default 0xFFFFFFFF
help
Text base of an updated u-boot that is not factory programmed but
later when the unit is rolled out on the field.
Has to be set for original u-boot programmed at factory.

config PG_WCOM_UBOOT_UPDATE
bool "U-boot Is Part Of Factory Boot-Package Image"
bool "U-Boot Is Part Of Factory Boot-Package Image"
default n
help
Indicates that u-boot will be a part of the embedded software and
Expand Down
2 changes: 1 addition & 1 deletion board/keymile/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Field Fail-Save U-boot Update
Field Fail-Save U-Boot Update
-----------------------------
Field Fail-Save u-boot update is a feature that allows save u-boot update
of FOX and XMC products that are rolled out in the field.
Expand Down
2 changes: 1 addition & 1 deletion board/kontron/sl-mx6ul/spl.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ int board_mmc_init(struct bd_info *bis)

/*
* According to the board_mmc_init() the following map is done:
* (U-boot device node) (Physical Port)
* (U-Boot device node) (Physical Port)
* mmc0 USDHC1
* mmc1 USDHC2
*/
Expand Down
18 changes: 9 additions & 9 deletions board/phytec/pcm058/README
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@ not supported.
Flashing U-Boot onto an SD card
-------------------------------

After a successful build, the generated SPL and U-boot binaries can be copied
After a successful build, the generated SPL and U-Boot binaries can be copied
to an SD card. Adjust the SD card device as necessary:

$ sudo dd if=u-boot-with-spl.imx of=/dev/mmcblk0 bs=1k seek=1

This is equivalent to separately copying the SPL and U-boot using:
This is equivalent to separately copying the SPL and U-Boot using:

$ sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1
$ sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 bs=1k seek=197

The default bootscripts expect a kernel fit-image file named "fitImage" in the
first partition and Linux ext4 rootfs in the second partition.

Flashing U-boot to the SPI Flash, for booting Linux from NAND
Flashing U-Boot to the SPI Flash, for booting Linux from NAND
-------------------------------------------------------------

The SD card created above can also be used to install the SPL and U-boot into
the SPI flash. Boot U-boot from the SD card as above, and stop at the autoboot.
The SD card created above can also be used to install the SPL and U-Boot into
the SPI flash. Boot U-Boot from the SD card as above, and stop at the autoboot.

Then, clear the SPI flash:

Expand All @@ -64,13 +64,13 @@ Then, clear the SPI flash:
Load the equivalent of u-boot-with-spl.imx from the raw MMC into memory and
copy to the SPI. The SPL is expected at an offset of 0x400, and its size is
maximum 392*512-byte blocks in size, therefore 0x188 blocks, totaling 0x31000
bytes. Assume U-boot should fit into 640KiB, therefore 0x500 512-byte blocks,
bytes. Assume U-Boot should fit into 640KiB, therefore 0x500 512-byte blocks,
totalling 0xA0000 bytes. Adding these together:

=> mmc read ${loadaddr} 0x2 0x688
=> sf write ${loadaddr} 0x400 0xD1000

The SPL is located at offset 0x400, and U-boot at 0x31400 in SPI flash, as to
The SPL is located at offset 0x400, and U-Boot at 0x31400 in SPI flash, as to
match the SD Card layout. This would allow, instead of reading from the SD Card
above, with networking and TFTP correctly configured, the equivalent of:

Expand All @@ -84,7 +84,7 @@ image) and "root" (which contains a ubifs root filesystem).
The "bootm_size" variable in the environment
--------------------------------------------

By default, U-boot relocates the device tree towards the upper end of the RAM,
By default, U-Boot relocates the device tree towards the upper end of the RAM,
which kernels using CONFIG_HIGHMEM=y may not be able to access during early
boot. With the bootm_size variable set to 0x30000000, U-boot relocates the
boot. With the bootm_size variable set to 0x30000000, U-Boot relocates the
device tree to below this address instead.
14 changes: 7 additions & 7 deletions board/synopsys/hsdk/hsdk.c
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ enum hsdk_axi_masters {
*
* Please read ARC HS Development IC Specification, section 17.2 for more
* information about apertures configuration.
* NOTE: we intentionally modify default settings in U-boot. Default settings
* NOTE: we intentionally modify default settings in U-Boot. Default settings
* are specified in "Table 111 CREG Address Decoder register reset values".
*/

Expand Down Expand Up @@ -942,7 +942,7 @@ static int do_hsdk_go(struct cmd_tbl *cmdtp, int flag, int argc,
int ret;

if (board_mismatch()) {
printf("ERR: U-boot is not configured for this board!\n");
printf("ERR: U-Boot is not configured for this board!\n");
return CMD_RET_FAILURE;
}

Expand Down Expand Up @@ -983,10 +983,10 @@ U_BOOT_CMD(

/*
* We may simply use static variable here to store init status, but we also want
* to avoid the situation when we reload U-boot via MDB after previous
* to avoid the situation when we reload U-Boot via MDB after previous
* init is done but HW reset (board reset) isn't done. So let's store the
* init status in any unused register (i.e CREG_CPU_0_ENTRY) so status will
* survive after U-boot is reloaded via MDB.
* survive after U-Boot is reloaded via MDB.
*/
#define INIT_MARKER_REGISTER ((void __iomem *)CREG_CPU_0_ENTRY)
/* must be equal to INIT_MARKER_REGISTER reset value */
Expand All @@ -1008,7 +1008,7 @@ static int do_hsdk_init(struct cmd_tbl *cmdtp, int flag, int argc,
int ret;

if (board_mismatch()) {
printf("ERR: U-boot is not configured for this board!\n");
printf("ERR: U-Boot is not configured for this board!\n");
return CMD_RET_FAILURE;
}

Expand Down Expand Up @@ -1258,11 +1258,11 @@ int checkboard(void)
printf("Board: Synopsys %s\n", board_name(get_board_type_runtime()));

if (board_mismatch())
printf("WARN: U-boot is configured NOT for this board but for %s!\n",
printf("WARN: U-Boot is configured NOT for this board but for %s!\n",
board_name(get_board_type_config()));

reg = readl(CREG_AXI_M_HS_CORE_BOOT) & CREG_CORE_BOOT_IMAGE;
printf("U-boot autostart: %s\n", reg ? "enabled" : "disabled");
printf("U-Boot autostart: %s\n", reg ? "enabled" : "disabled");

return 0;
};
2 changes: 1 addition & 1 deletion boot/boot_fit.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void *locate_dtb_in_fit(const void *fit)
header = (struct legacy_img_hdr *)fit;

if (image_get_magic(header) != FDT_MAGIC) {
debug("No FIT image appended to U-boot\n");
debug("No FIT image appended to U-Boot\n");
return NULL;
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/ufs.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/**
* ufs.c - UFS specific U-boot commands
* ufs.c - UFS specific U-Boot commands
*
* Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com
*
Expand Down
2 changes: 1 addition & 1 deletion common/spl/spl.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ static int spl_load_fit_image(struct spl_image_info *spl_image,
spl_image->fdt_addr = (void *)dt_data;

if (spl_image->os == IH_OS_U_BOOT) {
/* HACK: U-boot expects FDT at a specific address */
/* HACK: U-Boot expects FDT at a specific address */
fdt_hack = spl_image->load_addr + spl_image->size;
fdt_hack = (fdt_hack + 3) & ~3;
debug("Relocating FDT to %p\n", spl_image->fdt_addr);
Expand Down
2 changes: 1 addition & 1 deletion common/spl/spl_mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
return ret;

if (spl_image->os != IH_OS_LINUX && spl_image->os != IH_OS_TEE) {
puts("Expected image is not found. Trying to start U-boot\n");
puts("Expected image is not found. Trying to start U-Boot\n");
return -ENOENT;
}

Expand Down
2 changes: 1 addition & 1 deletion doc/README.pcap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PCAP:

U-boot supports live Ethernet packet capture in PCAP(2.4) format.
U-Boot supports live Ethernet packet capture in PCAP(2.4) format.
This is enabled by CONFIG_CMD_PCAP.

The capture is stored on physical memory, and should be copied to
Expand Down
2 changes: 1 addition & 1 deletion doc/README.s5p4418
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The source code for (the used?) LUbuntu 16.04 can be found at [5].
Links
=====

[1] FriendlyArm U-boot v2016.01:
[1] FriendlyArm U-Boot v2016.01:

https://github.com/friendlyarm/u-boot/tree/nanopi2-v2016.01

Expand Down
4 changes: 2 additions & 2 deletions doc/SPL/README.spl-secure-boot
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Methodology

The SPL image is responsible for loading the next stage boot loader, which is
the main u-boot image. For secure boot process on these platforms ROM verifies
SPL image, so to continue chain of trust SPL image verifies U-boot image using
SPL image, so to continue chain of trust SPL image verifies U-Boot image using
spl_validate_uboot(). This function uses QorIQ Trust Architecture header
(appended to U-boot image) to validate the U-boot binary just before passing
(appended to U-Boot image) to validate the U-Boot binary just before passing
control to it.
2 changes: 1 addition & 1 deletion doc/board/amlogic/p201.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ image but sources have been shared by Linux development contractor, Baylibre:
$ make
$ export FIPDIR=$PWD/fip
Go back to mainline U-boot source tree then :
Go back to mainline U-Boot source tree then :

.. code-block:: bash
Expand Down
Loading

0 comments on commit 1be82af

Please sign in to comment.