Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-18 10:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

global: Use proper project name U-Boot

Browse source 
Use proper project name in comments, Kconfig, readmes.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/0dbdf0432405c1c38ffca55703b6737a48219e79.1684307818.git.michal.simek@amd.com
This commit is contained in:
Michal Simek 2023-05-17 09:17:16 +02:00
parent 6fe46936a3
commit 1be82afa80
66 changed files with 103 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/Kconfig.nxp
View file

@ -90,7 +90,7 @@ config SPL_UBOOT_KEY_HASH
default "" default ""
help help
Set the key hash for U-Boot here if public/private key pair used to 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 of a key hash is
41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b. 41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b.
Otherwise leave this empty. Otherwise leave this empty.

2
arch/arc/include/asm/io.h
View file

@ -80,7 +80,7 @@ static inline void sync(void)
/* /*
* We add memory barriers for __raw_readX / __raw_writeX accessors same way as * 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. * __raw_readX / __raw_writeX instead of proper accessor with barrier.
*/ */
#define __raw_writeb(v, c) ({ __iowmb(); __arch_putb(v, c); }) #define __raw_writeb(v, c) ({ __iowmb(); __arch_putb(v, c); })

2
arch/arm/cpu/armv7/Kconfig
View file

@ -110,7 +110,7 @@ config ARMV7_LPAE
config ARMV7_SET_CORTEX_SMPEN config ARMV7_SET_CORTEX_SMPEN
bool bool
help 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 config SPL_ARMV7_SET_CORTEX_SMPEN
bool bool

2
arch/arm/cpu/armv8/Kconfig
View file

@ -145,7 +145,7 @@ config ARMV8_PSCI
bool "Enable PSCI support" if EXPERT bool "Enable PSCI support" if EXPERT
help help
PSCI is Power State Coordination Interface defined by ARM. 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. can implement their own specific PSCI functions.
Say Y here to enable PSCI support on ARMv8 platform. Say Y here to enable PSCI support on ARMv8 platform.

2
arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3
View file

@ -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 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 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 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. console independently.
The variable needs to be set from the console once and then on The variable needs to be set from the console once and then on
rebooting the parameters set in the variable will automatically be rebooting the parameters set in the variable will automatically be

2
arch/arm/dts/fsl-ls1028a.dtsi
View file

@ -51,7 +51,7 @@
idle-states { 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. * parts if it determines to use PSCI.
*/ */
entry-method = "psci"; entry-method = "psci";

2
arch/arm/dts/meson-g12-common-u-boot.dtsi
View file

@ -5,7 +5,7 @@
*/ */
/ { / {
/* Keep HW order from U-boot */ /* Keep HW order from U-Boot */
aliases { aliases {
/delete-property/ mmc0; /delete-property/ mmc0;
/delete-property/ mmc1; /delete-property/ mmc1;

2
arch/arm/dts/meson-gx-u-boot.dtsi
View file

@ -5,7 +5,7 @@
*/ */
/ { / {
/* Keep HW order from U-boot */ /* Keep HW order from U-Boot */
aliases { aliases {
/delete-property/ mmc0; /delete-property/ mmc0;
/delete-property/ mmc1; /delete-property/ mmc1;

2
arch/arm/dts/rk3328-evb-u-boot.dtsi
View file

@ -41,7 +41,7 @@
}; };
&gmac2phy { &gmac2phy {
/* Integrated PHY unsupported by U-boot */ /* Integrated PHY unsupported by U-Boot */
status = "broken"; status = "broken";
}; };

2
arch/arm/dts/rk3328.dtsi
View file

@ -984,7 +984,7 @@
}; };
/* /*
* U-boot Specific Change * U-Boot Specific Change
* *
* The OTG controller must come after the USB host pair for it * 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 * to work. This is likely due to lack of support for the USB

2
arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch2.h
View file

@ -22,7 +22,7 @@
* *
* -PCIe * -PCIe
* -there is a range of stream IDs set aside for PCI in this * -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 * -allocate a streamID
* -set a PEXn LUT table entry mapping 'requester ID' to 'stream ID' * -set a PEXn LUT table entry mapping 'requester ID' to 'stream ID'
* -set a msi-map entry in the PEXn controller node in the * -set a msi-map entry in the PEXn controller node in the

2
arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch3.h
View file

@ -23,7 +23,7 @@
* *
* -PCIe * -PCIe
* -there is a range of stream IDs set aside for PCI in this * -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 * -allocate a streamID
* -set a PEXn LUT table entry mapping 'requester ID' to 'stream ID' * -set a PEXn LUT table entry mapping 'requester ID' to 'stream ID'
* -set a msi-map entry in the PEXn controller node in the * -set a msi-map entry in the PEXn controller node in the

2
board/bosch/acc/acc.c
View file

@ -559,7 +559,7 @@ int board_mmc_init(struct bd_info *bis)
gpio_direction_input(USDHC2_CD_GPIO); gpio_direction_input(USDHC2_CD_GPIO);
/* /*
* According to the board_mmc_init() the following map is done: * 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 * mmc0 USDHC2
* mmc1 USDHC4 * mmc1 USDHC4
*/ */

2
board/bosch/shc/README
View file

@ -68,7 +68,7 @@ Netboot
- see also doc/SPL/README.am335x-network - see also doc/SPL/README.am335x-network
- set the jumper into netboot mode - set the jumper into netboot mode
- compile the U-boot sources with: - compile the U-Boot sources with:
make am335x_shc_netboot_defconfig make am335x_shc_netboot_defconfig
make all make all
- copy the images into your tftp boot directory - copy the images into your tftp boot directory

2
board/compulab/cl-som-imx7/cl-som-imx7.c
View file

@ -86,7 +86,7 @@ int board_mmc_init(struct bd_info *bis)
int i, ret; int i, ret;
/* /*
* According to the board_mmc_init() the following map is done: * 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 * mmc0 USDHC1
* mmc2 USDHC3 (eMMC) * mmc2 USDHC3 (eMMC)
*/ */

2
board/hisilicon/poplar/README
View file

@ -30,7 +30,7 @@ CONNECTORS One connector for Smart Card One connector for TSI
Note of warning: 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. repositories.
The boot sequence is: The boot sequence is:

2
board/isee/igep003x/board.c
View file

@ -37,7 +37,7 @@ DECLARE_GLOBAL_DATA_PTR;
/* GPIO0_27 and GPIO0_26 are used to read board revision from IGEP003x boards /* GPIO0_27 and GPIO0_26 are used to read board revision from IGEP003x boards
* and control IGEP0034 green and red LEDs. * 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-LITE = 0b00
* IGEP0034 (FULL) = 0b01 * IGEP0034 (FULL) = 0b01
* IGEP0033 = 0b1X * IGEP0033 = 0b1X

2
board/isee/igep00x0/igep00x0.c
View file

@ -47,7 +47,7 @@ U_BOOT_DRVINFO(igep_uart) = {
* IGEP00x0 boards. First of all, it is necessary to reset USB transceiver from * IGEP00x0 boards. First of all, it is necessary to reset USB transceiver from
* IGEP0030 in order to read GPIO_IGEP00X0_BOARD_DETECTION correctly, because * IGEP0030 in order to read GPIO_IGEP00X0_BOARD_DETECTION correctly, because
* this functionality is shared by USB HOST. * 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: * detect board and revision:
* IGEP0020-RF = 0b00 * IGEP0020-RF = 0b00
* IGEP0020-RC = 0b01 * IGEP0020-RC = 0b01

8
board/keymile/Kconfig
View file

@ -123,7 +123,7 @@ config SYS_IVM_EEPROM_PAGE_LEN
Page size of inventory in EEPROM. Page size of inventory in EEPROM.
config PG_WCOM_UBOOT_UPDATE_SUPPORTED 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 select EVENT
default n default n
help help
@ -132,7 +132,7 @@ config PG_WCOM_UBOOT_UPDATE_SUPPORTED
from parallel NOR flash. from parallel NOR flash.
config PG_WCOM_UBOOT_BOOTPACKAGE 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 default n
help help
Indicates that u-boot will be a part of the factory programmed Indicates that u-boot will be a part of the factory programmed
@ -140,7 +140,7 @@ config PG_WCOM_UBOOT_BOOTPACKAGE
Has to be set for original u-boot programmed at factory. Has to be set for original u-boot programmed at factory.
config PG_WCOM_UBOOT_UPDATE_TEXT_BASE 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 default 0xFFFFFFFF
help help
Text base of an updated u-boot that is not factory programmed but Text base of an updated u-boot that is not factory programmed but
@ -148,7 +148,7 @@ config PG_WCOM_UBOOT_UPDATE_TEXT_BASE
Has to be set for original u-boot programmed at factory. Has to be set for original u-boot programmed at factory.
config PG_WCOM_UBOOT_UPDATE 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 default n
help help
Indicates that u-boot will be a part of the embedded software and Indicates that u-boot will be a part of the embedded software and

2
board/keymile/README
View file

@ -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 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. of FOX and XMC products that are rolled out in the field.

2
board/kontron/sl-mx6ul/spl.c
View file

@ -101,7 +101,7 @@ int board_mmc_init(struct bd_info *bis)
/* /*
* According to the board_mmc_init() the following map is done: * 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 * mmc0 USDHC1
* mmc1 USDHC2 * mmc1 USDHC2
*/ */

18
board/phytec/pcm058/README
View file

@ -37,12 +37,12 @@ not supported.
Flashing U-Boot onto an SD card 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: 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 $ 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=SPL of=/dev/mmcblk0 bs=1k seek=1
$ sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 bs=1k seek=197 $ sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 bs=1k seek=197
@ -50,11 +50,11 @@ $ 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 The default bootscripts expect a kernel fit-image file named "fitImage" in the
first partition and Linux ext4 rootfs in the second partition. 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 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 SPI flash. Boot U-Boot from the SD card as above, and stop at the autoboot.
Then, clear the SPI flash: Then, clear the SPI flash:
@ -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 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 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 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: totalling 0xA0000 bytes. Adding these together:
=> mmc read ${loadaddr} 0x2 0x688 => mmc read ${loadaddr} 0x2 0x688
=> sf write ${loadaddr} 0x400 0xD1000 => 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 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: above, with networking and TFTP correctly configured, the equivalent of:
@ -84,7 +84,7 @@ image) and "root" (which contains a ubifs root filesystem).
The "bootm_size" variable in the environment 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 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. device tree to below this address instead.

14
board/synopsys/hsdk/hsdk.c
View file

@ -583,7 +583,7 @@ enum hsdk_axi_masters {
* *
* Please read ARC HS Development IC Specification, section 17.2 for more * Please read ARC HS Development IC Specification, section 17.2 for more
* information about apertures configuration. * 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". * are specified in "Table 111 CREG Address Decoder register reset values".
*/ */
@ -942,7 +942,7 @@ static int do_hsdk_go(struct cmd_tbl *cmdtp, int flag, int argc,
int ret; int ret;
if (board_mismatch()) { 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; return CMD_RET_FAILURE;
} }
@ -983,10 +983,10 @@ U_BOOT_CMD(
/* /*
* We may simply use static variable here to store init status, but we also want * 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 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 * 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) #define INIT_MARKER_REGISTER ((void __iomem *)CREG_CPU_0_ENTRY)
/* must be equal to INIT_MARKER_REGISTER reset value */ /* must be equal to INIT_MARKER_REGISTER reset value */
@ -1008,7 +1008,7 @@ static int do_hsdk_init(struct cmd_tbl *cmdtp, int flag, int argc,
int ret; int ret;
if (board_mismatch()) { 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; return CMD_RET_FAILURE;
} }
@ -1258,11 +1258,11 @@ int checkboard(void)
printf("Board: Synopsys %s\n", board_name(get_board_type_runtime())); printf("Board: Synopsys %s\n", board_name(get_board_type_runtime()));
if (board_mismatch()) 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())); board_name(get_board_type_config()));
reg = readl(CREG_AXI_M_HS_CORE_BOOT) & CREG_CORE_BOOT_IMAGE; 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; return 0;
}; };

2
boot/boot_fit.c
View file

@ -67,7 +67,7 @@ void *locate_dtb_in_fit(const void *fit)
header = (struct legacy_img_hdr *)fit; header = (struct legacy_img_hdr *)fit;
if (image_get_magic(header) != FDT_MAGIC) { 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; return NULL;
} }

2
cmd/ufs.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+ // 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 * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com
* *

2
common/spl/spl.c
View file

@ -321,7 +321,7 @@ static int spl_load_fit_image(struct spl_image_info *spl_image,
spl_image->fdt_addr = (void *)dt_data; spl_image->fdt_addr = (void *)dt_data;
if (spl_image->os == IH_OS_U_BOOT) { 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 = spl_image->load_addr + spl_image->size;
fdt_hack = (fdt_hack + 3) & ~3; fdt_hack = (fdt_hack + 3) & ~3;
debug("Relocating FDT to %p\n", spl_image->fdt_addr); debug("Relocating FDT to %p\n", spl_image->fdt_addr);

2
common/spl/spl_mmc.c
View file

@ -250,7 +250,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
return ret; return ret;
if (spl_image->os != IH_OS_LINUX && spl_image->os != IH_OS_TEE) { 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; return -ENOENT;
} }

2
doc/README.pcap
View file

@ -1,6 +1,6 @@
PCAP: 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. This is enabled by CONFIG_CMD_PCAP.
The capture is stored on physical memory, and should be copied to The capture is stored on physical memory, and should be copied to

2
doc/README.s5p4418
View file

@ -38,7 +38,7 @@ The source code for (the used?) LUbuntu 16.04 can be found at [5].
Links Links
===== =====
[1] FriendlyArm U-boot v2016.01: [1] FriendlyArm U-Boot v2016.01:
https://github.com/friendlyarm/u-boot/tree/nanopi2-v2016.01 https://github.com/friendlyarm/u-boot/tree/nanopi2-v2016.01

4
doc/SPL/README.spl-secure-boot
View file

@ -12,7 +12,7 @@ Methodology
The SPL image is responsible for loading the next stage boot loader, which is 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 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 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. control to it.

2
doc/board/amlogic/p201.rst
View file

@ -56,7 +56,7 @@ image but sources have been shared by Linux development contractor, Baylibre:
$ make $ make
$ export FIPDIR=$PWD/fip $ 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 .. code-block:: bash

2
doc/board/amlogic/p212.rst
View file

@ -50,7 +50,7 @@ the git tree published by the board vendor:
$ make $ make
$ export FIPDIR=$PWD/fip $ 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 .. code-block:: bash

2
doc/board/amlogic/s400.rst
View file

@ -56,7 +56,7 @@ image but sources have been shared by Linux development contractor, Baylibre:
$ make $ make
$ export FIPDIR=$PWD/fip $ 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 .. code-block:: bash

2
doc/board/emulation/qemu-arm.rst
View file

@ -54,7 +54,7 @@ Note that for some odd reason qemu-system-aarch64 needs to be explicitly
told to use a 64-bit CPU or it will boot in 32-bit mode. The -nographic argument told to use a 64-bit CPU or it will boot in 32-bit mode. The -nographic argument
ensures that output appears on the terminal. Use Ctrl-A X to quit. ensures that output appears on the terminal. Use Ctrl-A X to quit.
Additional persistent U-boot environment support can be added as follows: Additional persistent U-Boot environment support can be added as follows:
- Create envstore.img using qemu-img:: - Create envstore.img using qemu-img::

2
doc/board/nxp/ls1046ardb.rst
View file

@ -150,7 +150,7 @@ Then, launch openocd like::
openocd -f u-boot.tcl openocd -f u-boot.tcl
You should see the U-boot SPL banner followed by the banner for U-Boot proper You should see the U-Boot SPL banner followed by the banner for U-Boot proper
in the output of openocd. The CMSIS-DAP adapter is slow, so this can take a in the output of openocd. The CMSIS-DAP adapter is slow, so this can take a
long time. If you don't see it, something has gone wrong. After a while, you long time. If you don't see it, something has gone wrong. After a while, you
should see the prompt. You can load an image using semihosting by running:: should see the prompt. You can load an image using semihosting by running::

2
doc/board/nxp/mx6sabresd.rst
View file

@ -53,7 +53,7 @@ This will generate the SPL and u-boot-dtb.img binaries.
- Boot first from SD card as shown in the previous section - Boot first from SD card as shown in the previous section
In U-boot change the eMMC partition config:: In U-Boot change the eMMC partition config::
=> mmc partconf 2 1 0 0 => mmc partconf 2 1 0 0

6
doc/board/rockchip/rockchip.rst
View file

@ -333,12 +333,12 @@ Note:
Unlike later SoC models the rk3066 BootROM doesn't have SDMMC support. Unlike later SoC models the rk3066 BootROM doesn't have SDMMC support.
If all other boot options fail then it enters into a BootROM mode on the USB OTG port. If all other boot options fail then it enters into a BootROM mode on the USB OTG port.
This method loads TPL/SPL on NAND with U-boot and kernel on SD card. This method loads TPL/SPL on NAND with U-Boot and kernel on SD card.
SD Card SD Card
^^^^^^^ ^^^^^^^
U-boot expects a GPT partition map and a boot directory structure with files on the SD card. U-Boot expects a GPT partition map and a boot directory structure with files on the SD card.
.. code-block:: none .. code-block:: none
@ -363,7 +363,7 @@ Boot partition:
zImage zImage
rk3066a-mk808.dtb rk3066a-mk808.dtb
To write a U-boot image to the SD card (assumed to be /dev/sda): To write a U-Boot image to the SD card (assumed to be /dev/sda):
.. code-block:: bash .. code-block:: bash

2
doc/board/sifive/unmatched.rst
View file

@ -558,7 +558,7 @@ for partitions one through three respectively.
--new=3:10280:10535 --change-name=3:env --typecode=3:3DE21764-95BD-54BD-A5C3-4ABE786F38A8 \ --new=3:10280:10535 --change-name=3:env --typecode=3:3DE21764-95BD-54BD-A5C3-4ABE786F38A8 \
/dev/mtdblock0 /dev/mtdblock0
Write U-boot SPL and U-boot to their partitions. Write U-Boot SPL and U-Boot to their partitions.
.. code-block:: none .. code-block:: none

2
doc/board/st/stm32mp1.rst
View file

@ -345,7 +345,7 @@ Build Procedure
- BL33=u-boot-nodtb.bin - BL33=u-boot-nodtb.bin
- BL33_CFG=u-boot.dtb - BL33_CFG=u-boot.dtb
You can also update a existing FIP after U-boot compilation with fiptool, You can also update a existing FIP after U-Boot compilation with fiptool,
a tool provided by TF-A_:: a tool provided by TF-A_::
# fiptool update --nt-fw u-boot-nodtb.bin --hw-config u-boot.dtb fip-stm32mp157c-ev1.bin # fiptool update --nt-fw u-boot-nodtb.bin --hw-config u-boot.dtb fip-stm32mp157c-ev1.bin

10
doc/board/xen/xenguest_arm64.rst
View file

@ -6,7 +6,7 @@ Xen guest ARM64 board
This board specification This board specification
------------------------ ------------------------
This board is to be run as a virtual Xen [1] guest with U-boot as its primary This board is to be run as a virtual Xen [1] guest with U-Boot as its primary
bootloader. Xen is a type 1 hypervisor that allows multiple operating systems bootloader. Xen is a type 1 hypervisor that allows multiple operating systems
to run simultaneously on a single physical server. Xen is capable of running to run simultaneously on a single physical server. Xen is capable of running
virtual machines in both full virtualization and para-virtualization (PV) virtual machines in both full virtualization and para-virtualization (PV)
@ -16,7 +16,7 @@ Paravirtualized drivers are a special type of device drivers that are used in
a guest system in the Xen domain and perform I/O operations using a special a guest system in the Xen domain and perform I/O operations using a special
interface provided by the virtualization system and the host system. interface provided by the virtualization system and the host system.
Xen support for U-boot is implemented by introducing a new Xen guest ARM64 Xen support for U-Boot is implemented by introducing a new Xen guest ARM64
board and porting essential drivers from MiniOS [3] as well as some of the work board and porting essential drivers from MiniOS [3] as well as some of the work
previously done by NXP [4]: previously done by NXP [4]:
@ -39,7 +39,7 @@ previously done by NXP [4]:
Board limitations Board limitations
----------------- -----------------
1. U-boot runs without MMU enabled at the early stages. 1. U-Boot runs without MMU enabled at the early stages.
According to Xen on ARM ABI (xen/include/public/arch-arm.h): all memory According to Xen on ARM ABI (xen/include/public/arch-arm.h): all memory
which is shared with other entities in the system (including the hypervisor which is shared with other entities in the system (including the hypervisor
and other guests) must reside in memory which is mapped as Normal Inner and other guests) must reside in memory which is mapped as Normal Inner
@ -54,14 +54,14 @@ Board limitations
2. No serial console until MMU is up. 2. No serial console until MMU is up.
Because data cache maintenance is required until the MMU setup the Because data cache maintenance is required until the MMU setup the
early/debug serial console is not implemented. Therefore, we do not have early/debug serial console is not implemented. Therefore, we do not have
usual prints like U-boot’s banner etc. until the serial driver is usual prints like U-Boot’s banner etc. until the serial driver is
initialized. initialized.
3. Single RAM bank supported. 3. Single RAM bank supported.
If a Xen guest is given much memory it is possible that Xen allocates two If a Xen guest is given much memory it is possible that Xen allocates two
memory banks for it. The first one is allocated under 4GB address space and memory banks for it. The first one is allocated under 4GB address space and
in some cases may represent the whole guest’s memory. It is assumed that in some cases may represent the whole guest’s memory. It is assumed that
U-boot most likely won’t require high memory bank for its work andlaunching U-Boot most likely won’t require high memory bank for its work andlaunching
OS, so it is enough to take the first one. OS, so it is enough to take the first one.

2
doc/develop/driver-model/bind.rst
View file

@ -7,7 +7,7 @@ Binding/unbinding a driver
This document aims to describe the bind and unbind commands. This document aims to describe the bind and unbind commands.
For debugging purpose, it should be useful to bind or unbind a driver from For debugging purpose, it should be useful to bind or unbind a driver from
the U-boot command line. the U-Boot command line.
The unbind command calls the remove device driver callback and unbind the The unbind command calls the remove device driver callback and unbind the
device from its driver. device from its driver.

6
doc/develop/driver-model/fs_firmware_loader.rst
View file

@ -92,9 +92,9 @@ For example of getting DT phandle from /chosen and creating instance:
if (ret) if (ret)
return ret; return ret;
Firmware loader driver is also designed to support U-boot environment Firmware loader driver is also designed to support U-Boot environment
variables, so all these data from FDT can be overwritten variables, so all these data from FDT can be overwritten
through the U-boot environment variable during run time. through the U-Boot environment variable during run time.
For examples: For examples:
@ -110,7 +110,7 @@ fw_ubi_volume:
When above environment variables are set, environment values would be When above environment variables are set, environment values would be
used instead of data from FDT. used instead of data from FDT.
The benefit of this design allows user to change storage attribute data The benefit of this design allows user to change storage attribute data
at run time through U-boot console and saving the setting as default at run time through U-Boot console and saving the setting as default
environment values in the storage for the next power cycle, so no environment values in the storage for the next power cycle, so no
compilation is required for both driver and FDT. compilation is required for both driver and FDT.

2
doc/develop/uefi/uefi.rst
View file

@ -330,7 +330,7 @@ bit in OsIndications variable with
=> setenv -e -nv -bs -rt -v OsIndications =0x0000000000000004 => setenv -e -nv -bs -rt -v OsIndications =0x0000000000000004
Since U-boot doesn't currently support SetVariable at runtime, its value Since U-Boot doesn't currently support SetVariable at runtime, its value
won't be taken over across the reboot. If this is the case, you can skip won't be taken over across the reboot. If this is the case, you can skip
this feature check with the Kconfig option (CONFIG_EFI_IGNORE_OSINDICATIONS) this feature check with the Kconfig option (CONFIG_EFI_IGNORE_OSINDICATIONS)
set. set.

2
doc/usage/cmd/source.rst
View file

@ -161,7 +161,7 @@ The boot scripts (boot.scr) is created with:
mkimage -T script -n 'Test script' -d boot.txt boot.scr mkimage -T script -n 'Test script' -d boot.txt boot.scr
The script can be execute in U-boot like this: The script can be execute in U-Boot like this:
.. code-block:: .. code-block::

2
doc/usage/dfu.rst
View file

@ -9,7 +9,7 @@ Overview
The Device Firmware Upgrade (DFU) allows to download and upload firmware The Device Firmware Upgrade (DFU) allows to download and upload firmware
to/from U-Boot connected over USB. to/from U-Boot connected over USB.
U-boot follows the Universal Serial Bus Device Class Specification for U-Boot follows the Universal Serial Bus Device Class Specification for
Device Firmware Upgrade Version 1.1 the USB forum (DFU v1.1 in www.usb.org). Device Firmware Upgrade Version 1.1 the USB forum (DFU v1.1 in www.usb.org).
U-Boot implements this DFU capability (CONFIG_DFU) with the command dfu U-Boot implements this DFU capability (CONFIG_DFU) with the command dfu

2
drivers/clk/clk-mux.c
View file

@ -184,7 +184,7 @@ struct clk *clk_hw_register_mux_table(struct device *dev, const char *name,
if (!mux) if (!mux)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
/* U-boot specific assignments */ /* U-Boot specific assignments */
mux->parent_names = parent_names; mux->parent_names = parent_names;
mux->num_parents = num_parents; mux->num_parents = num_parents;

2
drivers/gpio/gpio-fxl6408.c
View file

@ -27,7 +27,7 @@
* https://patchwork.kernel.org/patch/9148419/ * https://patchwork.kernel.org/patch/9148419/
* - the Toradex version by Max Krummenacher <max.krummenacher@toradex.com>: * - the Toradex version by Max Krummenacher <max.krummenacher@toradex.com>:
* http://git.toradex.com/cgit/linux-toradex.git/tree/drivers/gpio/gpio-fxl6408.c?h=toradex_5.4-2.3.x-imx * http://git.toradex.com/cgit/linux-toradex.git/tree/drivers/gpio/gpio-fxl6408.c?h=toradex_5.4-2.3.x-imx
* - the U-boot PCA953x driver by Peng Fan <van.freenix@gmail.com>: * - the U-Boot PCA953x driver by Peng Fan <van.freenix@gmail.com>:
* drivers/gpio/pca953x_gpio.c * drivers/gpio/pca953x_gpio.c
* *
* TODO: * TODO:

6
drivers/mtd/nand/raw/Kconfig
View file

@ -553,7 +553,7 @@ config NAND_ZYNQ_USE_BOOTLOADER1_TIMINGS
bool "Enable use of 1st stage bootloader timing for NAND" bool "Enable use of 1st stage bootloader timing for NAND"
depends on NAND_ZYNQ depends on NAND_ZYNQ
help help
This flag prevent U-boot reconfigure NAND flash controller and reuse This flag prevent U-Boot reconfigure NAND flash controller and reuse
the NAND timing from 1st stage bootloader. the NAND timing from 1st stage bootloader.
config NAND_OCTEONTX config NAND_OCTEONTX
@ -732,10 +732,10 @@ config SYS_NAND_BAD_BLOCK_POS
default 5 if HAS_NAND_SMALL_BADBLOCK_POS default 5 if HAS_NAND_SMALL_BADBLOCK_POS
config SYS_NAND_U_BOOT_LOCATIONS config SYS_NAND_U_BOOT_LOCATIONS
bool "Define U-boot binaries locations in NAND" bool "Define U-Boot binaries locations in NAND"
help help
Enable CONFIG_SYS_NAND_U_BOOT_OFFS though Kconfig. Enable CONFIG_SYS_NAND_U_BOOT_OFFS though Kconfig.
This option should not be enabled when compiling U-boot for boards This option should not be enabled when compiling U-Boot for boards
defining CONFIG_SYS_NAND_U_BOOT_OFFS in their include/configs/<board>.h defining CONFIG_SYS_NAND_U_BOOT_OFFS in their include/configs/<board>.h
file. file.

4
drivers/mtd/nand/raw/fsl_ifc_spl.c
View file

@ -275,8 +275,8 @@ void nand_boot(void)
#ifdef CONFIG_CHAIN_OF_TRUST #ifdef CONFIG_CHAIN_OF_TRUST
/* /*
* U-Boot header is appended at end of U-boot image, so * U-Boot header is appended at end of U-Boot image, so
* calculate U-boot header address using U-boot header size. * calculate U-Boot header address using U-Boot header size.
*/ */
#define FSL_U_BOOT_HDR_ADDR \ #define FSL_U_BOOT_HDR_ADDR \
((CFG_SYS_NAND_U_BOOT_START + \ ((CFG_SYS_NAND_U_BOOT_START + \

2
drivers/net/pfe_eth/pfe_hw.c
View file

@ -814,7 +814,7 @@ static inline void class_set_config(struct class_cfg *cfg)
writel(0x1, CLASS_AXI_CTRL); writel(0x1, CLASS_AXI_CTRL);
/*Make Util AXI transactions non-bufferable */ /*Make Util AXI transactions non-bufferable */
/*Util is disabled in U-boot, do it from here */ /*Util is disabled in U-Boot, do it from here */
writel(0x1, UTIL_AXI_CTRL); writel(0x1, UTIL_AXI_CTRL);
} }

2
drivers/phy/marvell/comphy_cp110.c
View file

@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define MV_SIP_COMPHY_PLL_LOCK 0x82000003 #define MV_SIP_COMPHY_PLL_LOCK 0x82000003
#define MV_SIP_COMPHY_XFI_TRAIN 0x82000004 #define MV_SIP_COMPHY_XFI_TRAIN 0x82000004
/* Used to distinguish between different possible callers (U-boot/Linux) */ /* Used to distinguish between different possible callers (U-Boot/Linux) */
#define COMPHY_CALLER_UBOOT (0x1 << 21) #define COMPHY_CALLER_UBOOT (0x1 << 21)
#define COMPHY_FW_MODE_FORMAT(mode) ((mode) << 12) #define COMPHY_FW_MODE_FORMAT(mode) ((mode) << 12)

2
drivers/spi/spi-qup.c
View file

@ -9,7 +9,7 @@
* Author: Robert Marko <robert.marko@sartura.hr> * Author: Robert Marko <robert.marko@sartura.hr>
* Author: Luka Kovacic <luka.kovacic@sartura.hr> * Author: Luka Kovacic <luka.kovacic@sartura.hr>
* *
* Based on stock U-boot and Linux drivers * Based on stock U-Boot and Linux drivers
*/ */
#include <asm/gpio.h> #include <asm/gpio.h>

4
dts/Kconfig
View file

@ -171,7 +171,7 @@ config OF_LIST
default DEFAULT_DEVICE_TREE default DEFAULT_DEVICE_TREE
help help
This option specifies a list of device tree files to use for DT This option specifies a list of device tree files to use for DT
control. These will be packaged into a FIT. At run-time, U-boot control. These will be packaged into a FIT. At run-time, U-Boot
or SPL will select the correct DT to use by examining the or SPL will select the correct DT to use by examining the
hardware (e.g. reading a board ID value). This is a list of hardware (e.g. reading a board ID value). This is a list of
device tree files (without the directory or .dtb suffix) device tree files (without the directory or .dtb suffix)
@ -254,7 +254,7 @@ config DTB_RESELECT
config MULTI_DTB_FIT config MULTI_DTB_FIT
bool "Support embedding several DTBs in a FIT image for u-boot" bool "Support embedding several DTBs in a FIT image for u-boot"
help help
This option provides hooks to allow U-boot to parse an This option provides hooks to allow U-Boot to parse an
appended FIT image and enable board specific code to then select appended FIT image and enable board specific code to then select
the correct DTB to be used. Use this if you need to support the correct DTB to be used. Use this if you need to support
multiple DTBs but don't use the SPL. multiple DTBs but don't use the SPL.

2
fs/btrfs/compat.h
View file

@ -46,7 +46,7 @@
/* /*
* Read data from device specified by @desc and @part * Read data from device specified by @desc and @part
* *
* U-boot equivalent of pread(). * U-Boot equivalent of pread().
* *
* Return the bytes of data read. * Return the bytes of data read.
* Return <0 for error. * Return <0 for error.

2
fs/btrfs/extent-io.h
View file

@ -8,7 +8,7 @@
* Use pointer to provide better alignment. * Use pointer to provide better alignment.
* - Remove max_cache_size related interfaces * - Remove max_cache_size related interfaces
* Includes free_extent_buffer_nocache() * Includes free_extent_buffer_nocache()
* As we don't cache eb in U-boot. * As we don't cache eb in U-Boot.
* - Include headers * - Include headers
* *
* Write related functions are kept as we still need to modify dummy extent * Write related functions are kept as we still need to modify dummy extent

4
include/fsl_validate.h
View file

@ -275,9 +275,9 @@ int fsl_check_boot_mode_secure(void);
int fsl_setenv_chain_of_trust(void); int fsl_setenv_chain_of_trust(void);
/* /*
* This function is used to validate the main U-boot binary from * This function is used to validate the main U-Boot binary from
* SPL just before passing control to it using QorIQ Trust * SPL just before passing control to it using QorIQ Trust
* Architecture header (appended to U-boot image). * Architecture header (appended to U-Boot image).
*/ */
void spl_validate_uboot(uint32_t hdr_addr, uintptr_t img_addr); void spl_validate_uboot(uint32_t hdr_addr, uintptr_t img_addr);

2
include/zynqmp_firmware.h
View file

@ -35,7 +35,7 @@ enum pm_api_id {
PM_FPGA_LOAD = 22, PM_FPGA_LOAD = 22,
PM_FPGA_GET_STATUS = 23, PM_FPGA_GET_STATUS = 23,
PM_GET_CHIPID = 24, PM_GET_CHIPID = 24,
/* ID 25 is been used by U-boot to process secure boot images */ /* ID 25 is been used by U-Boot to process secure boot images */
/* Secure library generic API functions */ /* Secure library generic API functions */
PM_SECURE_SHA = 26, PM_SECURE_SHA = 26,
PM_SECURE_RSA = 27, PM_SECURE_RSA = 27,

2
test/py/tests/test_android/test_avb.py
View file

@ -5,7 +5,7 @@
# Android Verified Boot 2.0 Test # Android Verified Boot 2.0 Test
""" """
This tests Android Verified Boot 2.0 support in U-boot: This tests Android Verified Boot 2.0 support in U-Boot:
For additional details about how to build proper vbmeta partition For additional details about how to build proper vbmeta partition
check doc/android/avb2.rst check doc/android/avb2.rst

2
test/py/tests/test_cat/conftest.py
View file

@ -13,7 +13,7 @@ def cat_data(u_boot_config):
"""Set up a file system to be used in cat tests """Set up a file system to be used in cat tests
Args: Args:
u_boot_config -- U-boot configuration. u_boot_config -- U-Boot configuration.
""" """
mnt_point = u_boot_config.persistent_data_dir + '/test_cat' mnt_point = u_boot_config.persistent_data_dir + '/test_cat'
image_path = u_boot_config.persistent_data_dir + '/cat.img' image_path = u_boot_config.persistent_data_dir + '/cat.img'

2
test/py/tests/test_efi_bootmgr/conftest.py
View file

@ -12,7 +12,7 @@ def efi_bootmgr_data(u_boot_config):
"""Set up a file system to be used in UEFI bootmanager tests. """Set up a file system to be used in UEFI bootmanager tests.
Args: Args:
u_boot_config -- U-boot configuration. u_boot_config -- U-Boot configuration.
Return: Return:
A path to disk image to be used for testing A path to disk image to be used for testing

2
test/py/tests/test_efi_capsule/conftest.py
View file

@ -17,7 +17,7 @@ def efi_capsule_data(request, u_boot_config):
for testing. for testing.
request -- Pytest request object. request -- Pytest request object.
u_boot_config -- U-boot configuration. u_boot_config -- U-Boot configuration.
""" """
mnt_point = u_boot_config.persistent_data_dir + '/test_efi_capsule' mnt_point = u_boot_config.persistent_data_dir + '/test_efi_capsule'
data_dir = mnt_point + CAPSULE_DATA_DIR data_dir = mnt_point + CAPSULE_DATA_DIR

4
test/py/tests/test_efi_secboot/conftest.py
View file

@ -14,7 +14,7 @@ def efi_boot_env(request, u_boot_config):
Args: Args:
request: Pytest request object. request: Pytest request object.
u_boot_config: U-boot configuration. u_boot_config: U-Boot configuration.
Return: Return:
A path to disk image to be used for testing A path to disk image to be used for testing
@ -139,7 +139,7 @@ def efi_boot_env_intca(request, u_boot_config):
Args: Args:
request: Pytest request object. request: Pytest request object.
u_boot_config: U-boot configuration. u_boot_config: U-Boot configuration.
Return: Return:
A path to disk image to be used for testing A path to disk image to be used for testing

2
test/py/tests/test_eficonfig/conftest.py
View file

@ -14,7 +14,7 @@ def efi_eficonfig_data(u_boot_config):
tests tests
Args: Args:
u_boot_config -- U-boot configuration. u_boot_config -- U-Boot configuration.
Return: Return:
A path to disk image to be used for testing A path to disk image to be used for testing

12
test/py/tests/test_fs/conftest.py
View file

@ -97,7 +97,7 @@ def pytest_generate_tests(metafunc):
# Helper functions # Helper functions
# #
def fstype_to_ubname(fs_type): def fstype_to_ubname(fs_type):
"""Convert a file system type to an U-boot specific string """Convert a file system type to an U-Boot specific string
A generated string can be used as part of file system related commands A generated string can be used as part of file system related commands
or a config name in u-boot. Currently fat16 and fat32 are handled or a config name in u-boot. Currently fat16 and fat32 are handled
@ -217,7 +217,7 @@ def fs_obj_basic(request, u_boot_config):
Args: Args:
request: Pytest request object. request: Pytest request object.
u_boot_config: U-boot configuration. u_boot_config: U-Boot configuration.
Return: Return:
A fixture for basic fs test, i.e. a triplet of file system type, A fixture for basic fs test, i.e. a triplet of file system type,
@ -339,7 +339,7 @@ def fs_obj_ext(request, u_boot_config):
Args: Args:
request: Pytest request object. request: Pytest request object.
u_boot_config: U-boot configuration. u_boot_config: U-Boot configuration.
Return: Return:
A fixture for extended fs test, i.e. a triplet of file system type, A fixture for extended fs test, i.e. a triplet of file system type,
@ -440,7 +440,7 @@ def fs_obj_mkdir(request, u_boot_config):
Args: Args:
request: Pytest request object. request: Pytest request object.
u_boot_config: U-boot configuration. u_boot_config: U-Boot configuration.
Return: Return:
A fixture for mkdir test, i.e. a duplet of file system type and A fixture for mkdir test, i.e. a duplet of file system type and
@ -471,7 +471,7 @@ def fs_obj_unlink(request, u_boot_config):
Args: Args:
request: Pytest request object. request: Pytest request object.
u_boot_config: U-boot configuration. u_boot_config: U-Boot configuration.
Return: Return:
A fixture for unlink test, i.e. a duplet of file system type and A fixture for unlink test, i.e. a duplet of file system type and
@ -551,7 +551,7 @@ def fs_obj_symlink(request, u_boot_config):
Args: Args:
request: Pytest request object. request: Pytest request object.
u_boot_config: U-boot configuration. u_boot_config: U-Boot configuration.
Return: Return:
A fixture for basic fs test, i.e. a triplet of file system type, A fixture for basic fs test, i.e. a triplet of file system type,

2
test/py/tests/test_scp03.py
View file

@ -5,7 +5,7 @@
# SCP03 command test # SCP03 command test
""" """
This tests SCP03 command in U-boot. This tests SCP03 command in U-Boot.
For additional details check doc/usage/scp03.rst For additional details check doc/usage/scp03.rst
""" """

2
test/py/tests/test_xxd/conftest.py
View file

@ -13,7 +13,7 @@ def xxd_data(u_boot_config):
"""Set up a file system to be used in xxd tests """Set up a file system to be used in xxd tests
Args: Args:
u_boot_config -- U-boot configuration. u_boot_config -- U-Boot configuration.
""" """
mnt_point = u_boot_config.persistent_data_dir + '/test_xxd' mnt_point = u_boot_config.persistent_data_dir + '/test_xxd'
image_path = u_boot_config.persistent_data_dir + '/xxd.img' image_path = u_boot_config.persistent_data_dir + '/xxd.img'