smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cherry-d532df3a614' into 'master'

Browse Source 
[pickman] Merge tag 'doc-2025-01-rc6' of https://source.denx.de/u-boot/custodians/u-boot-efi

See merge request u-boot/u-boot!263
This commit is contained in:
Simon Glass
2025-12-20 15:15:23 +00:00
parent 3dc01c1e3b b5d9a76d55
commit 8a0ff2031a
13 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
board/freescale/ls1088a/ls1088a.c
View File

@@ -690,7 +690,7 @@ int get_serdes_volt(void)
dm_i2c_read(dev, PMBUS_CMD_READ_VOUT, (void *)&vcode, 2);
#endif
if (ret) {
printf("VID: failed to read the volatge\n");
printf("VID: failed to read the voltage\n");
return ret;
}
@@ -716,11 +716,11 @@ int set_serdes_volt(int svdd)
(void *)&buff, 5);
#endif
if (ret) {
printf("VID: I2C failed to write to the volatge regulator\n");
printf("VID: I2C failed to write to the voltage regulator\n");
return -1;
}
/* Wait for the volatge to get to the desired value */
/* Wait for the voltage to get to the desired value */
do {
vdd_last = get_serdes_volt();
if (vdd_last < 0) {
@@ -778,7 +778,7 @@ int set_serdes_volt(int svdd)
return -1;
}
/* Wait for the volatge to get to the desired value */
/* Wait for the voltage to get to the desired value */
udelay(10000);
return 1;

2
cmd/bootmenu.c
View File

@@ -239,7 +239,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu,
/**
* prepare_uefi_bootorder_entry() - generate the uefi bootmenu entries
*
* This function read the "BootOrder" UEFI variable
* This function reads the "BootOrder" UEFI variable
* and generate the bootmenu entries in the order of "BootOrder".
*
* @menu: pointer to the bootmenu structure

4
cmd/rng.c
View File

@@ -75,6 +75,6 @@ static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
U_BOOT_CMD(
rng, 3, 0, do_rng,
"print bytes from the hardware random number generator",
"list - list all the probed rng devices\n"
"rng [dev] [n] - print n random bytes(max 64) read from dev\n"
"list - list all probed rng devices\n"
"rng [dev [n]] - print n random bytes (max 64) read from dev\n"
);

2
configs/ls1028ardb_tfa_defconfig
View File

@@ -67,6 +67,7 @@ CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_PCA954x=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y
CONFIG_FSL_ESDHC_SUPPORT_ADMA2=y
CONFIG_MTD=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -101,4 +102,3 @@ CONFIG_USB_ETHER_ASIX88179=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_WDT=y
CONFIG_WDT_SP805=y
CONFIG_FSL_ESDHC_SUPPORT_ADMA2=y

4
configs/rpi_3_b_plus_defconfig
View File

@@ -10,6 +10,8 @@ CONFIG_ENV_SIZE=0x4000
CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b-plus"
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_SYS_LOAD_ADDR=0x1000000
CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
CONFIG_BOOTSTD_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_FDT_SIMPLEFB=y
@@ -55,5 +57,3 @@ CONFIG_VIDEO_BCM2835=y
CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y
# CONFIG_HEXDUMP is not set
CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y

4
configs/rpi_3_defconfig
View File

@@ -10,6 +10,8 @@ CONFIG_ENV_SIZE=0x4000
CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_SYS_LOAD_ADDR=0x1000000
CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
CONFIG_BOOTSTD_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_FDT_SIMPLEFB=y
@@ -55,5 +57,3 @@ CONFIG_VIDEO_BCM2835=y
CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y
# CONFIG_HEXDUMP is not set
CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y

4
configs/rpi_4_defconfig
View File

@@ -10,6 +10,8 @@ CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_DM_RESET=y
CONFIG_SYS_LOAD_ADDR=0x1000000
CONFIG_PCI=y
CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
CONFIG_BOOTSTD_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_FDT_SIMPLEFB=y
@@ -68,5 +70,3 @@ CONFIG_VIDEO_BCM2835=y
CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y
# CONFIG_HEXDUMP is not set
CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y

4
configs/rpi_arm64_defconfig
View File

@@ -8,6 +8,8 @@ CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_DM_RESET=y
CONFIG_SYS_LOAD_ADDR=0x1000000
CONFIG_PCI=y
CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
CONFIG_BOOTSTD_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_FDT_SIMPLEFB=y
@@ -62,5 +64,3 @@ CONFIG_VIDEO_BCM2835=y
CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y
# CONFIG_HEXDUMP is not set
CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y

2
doc/develop/release_cycle.rst
View File

@@ -75,7 +75,7 @@ For the next scheduled release, release candidates were made on::
* U-Boot v2025.01-rc4 was released on Mon 09 December 2024.
.. * U-Boot v2025.01-rc5 was released on Mon 23 December 2024.
* U-Boot v2025.01-rc5 was released on Mon 23 December 2024.
.. * U-Boot v2025.01-rc6 was released on Mon 30 December 2024.

4
doc/usage/cmd/rng.rst
View File

@@ -12,14 +12,14 @@ Synopsis
::
rng list
rng [dev] [n]
rng [dev [n]]
rng list
--------
List all the probed rng devices.
rng [dev] [n]
rng [dev [n]]
-------------
The *rng* command reads the random number generator(RNG) device and

2
drivers/crypto/fsl/jr.c
View File

@@ -654,7 +654,7 @@ static int rng_init(uint8_t sec_idx, ccsr_sec_t *sec)
ret = instantiate_rng(sec_idx, sec, gen_sk);
/*
* entropy delay is calculated via self-test method.
* self-test are run across different volatge, temp.
* self-test are run across different voltage, temp.
* if worst case value for ent_dly is identified,
* loop can be skipped for that platform.
*/

1
scripts/spelling.txt
View File

@@ -1584,6 +1584,7 @@ virtaul||virtual
virtiual||virtual
visiters||visitors
vitual||virtual
volatge||voltage
vunerable||vulnerable
wakeus||wakeups
wathdog||watchdog