mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-09-03 21:12:10 +02:00
Merge branch '2023-10-30-assorted-general-updates'
- Two Kconfig content fixes, fix some issues reported by Coverity, resync get_maintainer.pl (two small fixees), update i2c_eeprom, and fix an off by one in addrmap_set_entry
This commit is contained in:
commit
cbba1b7766
@ -54,7 +54,6 @@ config SYS_SOC
|
|||||||
|
|
||||||
config SPL_MXS_PMU_MINIMAL_VDD5V_CURRENT
|
config SPL_MXS_PMU_MINIMAL_VDD5V_CURRENT
|
||||||
bool "Force minimal current draw from VDD5V by MX28 PMU"
|
bool "Force minimal current draw from VDD5V by MX28 PMU"
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
After setting this option, the current drawn from VDD5V
|
After setting this option, the current drawn from VDD5V
|
||||||
by the PMU is reduced to zero - the DCDC_BATT is used as
|
by the PMU is reduced to zero - the DCDC_BATT is used as
|
||||||
@ -62,7 +61,6 @@ config SPL_MXS_PMU_MINIMAL_VDD5V_CURRENT
|
|||||||
|
|
||||||
config SPL_MXS_PMU_DISABLE_BATT_CHARGE
|
config SPL_MXS_PMU_DISABLE_BATT_CHARGE
|
||||||
bool "Disable Battery Charging in MX28 PMU"
|
bool "Disable Battery Charging in MX28 PMU"
|
||||||
default n
|
|
||||||
|
|
||||||
config SPL_MXS_PMU_ENABLE_4P2_LINEAR_REGULATOR
|
config SPL_MXS_PMU_ENABLE_4P2_LINEAR_REGULATOR
|
||||||
bool "Enable the 4P2 linear regulator in MX28 PMU"
|
bool "Enable the 4P2 linear regulator in MX28 PMU"
|
||||||
|
@ -450,7 +450,6 @@ config ROCKCHIP_BOOT_MODE_REG
|
|||||||
config ROCKCHIP_RK8XX_DISABLE_BOOT_ON_POWERON
|
config ROCKCHIP_RK8XX_DISABLE_BOOT_ON_POWERON
|
||||||
bool "Disable device boot on power plug-in"
|
bool "Disable device boot on power plug-in"
|
||||||
depends on PMIC_RK8XX
|
depends on PMIC_RK8XX
|
||||||
default n
|
|
||||||
---help---
|
---help---
|
||||||
Say Y here to prevent the device from booting up because of a plug-in
|
Say Y here to prevent the device from booting up because of a plug-in
|
||||||
event. When set, the device will boot briefly to determine why it was
|
event. When set, the device will boot briefly to determine why it was
|
||||||
|
@ -14,7 +14,6 @@ config SPL_SYS_MALLOC_F_LEN
|
|||||||
|
|
||||||
config SDM845
|
config SDM845
|
||||||
bool "Qualcomm Snapdragon 845 SoC"
|
bool "Qualcomm Snapdragon 845 SoC"
|
||||||
default n
|
|
||||||
select LINUX_KERNEL_IMAGE_HEADER
|
select LINUX_KERNEL_IMAGE_HEADER
|
||||||
|
|
||||||
config LNX_KRNL_IMG_TEXT_OFFSET_BASE
|
config LNX_KRNL_IMG_TEXT_OFFSET_BASE
|
||||||
|
@ -811,7 +811,6 @@ config AXP_GPIO
|
|||||||
config AXP_DISABLE_BOOT_ON_POWERON
|
config AXP_DISABLE_BOOT_ON_POWERON
|
||||||
bool "Disable device boot on power plug-in"
|
bool "Disable device boot on power plug-in"
|
||||||
depends on AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER
|
depends on AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER
|
||||||
default n
|
|
||||||
---help---
|
---help---
|
||||||
Say Y here to prevent the device from booting up because of a plug-in
|
Say Y here to prevent the device from booting up because of a plug-in
|
||||||
event. When set, the device will boot into the SPL briefly to
|
event. When set, the device will boot into the SPL briefly to
|
||||||
|
@ -18,7 +18,6 @@ config TEGRA_CLKRST
|
|||||||
config TEGRA_CRYPTO
|
config TEGRA_CRYPTO
|
||||||
bool "Tegra AES128 crypto module"
|
bool "Tegra AES128 crypto module"
|
||||||
select AES
|
select AES
|
||||||
default n
|
|
||||||
|
|
||||||
config TEGRA_GP_PADCTRL
|
config TEGRA_GP_PADCTRL
|
||||||
bool
|
bool
|
||||||
|
@ -200,7 +200,6 @@ source "board/sysam/stmark2/Kconfig"
|
|||||||
|
|
||||||
config M68K_QEMU
|
config M68K_QEMU
|
||||||
bool "Build with workarounds for incomplete QEMU emulation"
|
bool "Build with workarounds for incomplete QEMU emulation"
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
QEMU 8.x currently does not implement RAMBAR accesses and
|
QEMU 8.x currently does not implement RAMBAR accesses and
|
||||||
DMA timers. Enable this option for U-Boot CI purposes only
|
DMA timers. Enable this option for U-Boot CI purposes only
|
||||||
|
@ -68,7 +68,6 @@ config SPL_SYS_DCACHE_OFF
|
|||||||
config SPL_ZERO_MEM_BEFORE_USE
|
config SPL_ZERO_MEM_BEFORE_USE
|
||||||
bool "Zero memory before use"
|
bool "Zero memory before use"
|
||||||
depends on SPL
|
depends on SPL
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Zero stack/GD/malloc area in SPL before using them, this is needed for
|
Zero stack/GD/malloc area in SPL before using them, this is needed for
|
||||||
Sifive core devices that uses L2 cache to store SPL.
|
Sifive core devices that uses L2 cache to store SPL.
|
||||||
|
@ -12,11 +12,9 @@ config SYS_CONFIG_NAME
|
|||||||
config GROUPER_TPS65911
|
config GROUPER_TPS65911
|
||||||
bool "Enable support TI TPS65911 PMIC"
|
bool "Enable support TI TPS65911 PMIC"
|
||||||
select CMD_POWEROFF
|
select CMD_POWEROFF
|
||||||
default n
|
|
||||||
|
|
||||||
config GROUPER_MAX77663
|
config GROUPER_MAX77663
|
||||||
bool "Enable support MAXIM MAX77663 PMIC"
|
bool "Enable support MAXIM MAX77663 PMIC"
|
||||||
select CMD_POWEROFF
|
select CMD_POWEROFF
|
||||||
default n
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -14,7 +14,6 @@ config TRANSFORMER_SPI_BOOT
|
|||||||
select TEGRA20_SLINK
|
select TEGRA20_SLINK
|
||||||
select DM_SPI_FLASH
|
select DM_SPI_FLASH
|
||||||
select SPI_FLASH_WINBOND
|
select SPI_FLASH_WINBOND
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Tegra 3 based Transformers with Windows RT have core
|
Tegra 3 based Transformers with Windows RT have core
|
||||||
boot sequence (BCT and EBT) on separate SPI FLASH
|
boot sequence (BCT and EBT) on separate SPI FLASH
|
||||||
|
@ -125,7 +125,6 @@ config SYS_IVM_EEPROM_PAGE_LEN
|
|||||||
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
|
|
||||||
help
|
help
|
||||||
Indicates that field fail-safe u-boot update is supported.
|
Indicates that field fail-safe u-boot update is supported.
|
||||||
This functionality works only for designs that are booting
|
This functionality works only for designs that are booting
|
||||||
@ -133,7 +132,6 @@ config PG_WCOM_UBOOT_UPDATE_SUPPORTED
|
|||||||
|
|
||||||
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
|
|
||||||
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
|
||||||
boot-package image.
|
boot-package image.
|
||||||
@ -149,7 +147,6 @@ config PG_WCOM_UBOOT_UPDATE_TEXT_BASE
|
|||||||
|
|
||||||
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
|
|
||||||
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
|
||||||
programmed at field.
|
programmed at field.
|
||||||
|
@ -11,14 +11,12 @@ config SYS_CONFIG_NAME
|
|||||||
|
|
||||||
config DEVICE_P880
|
config DEVICE_P880
|
||||||
bool "Enable support for LG Optimus 4X HD"
|
bool "Enable support for LG Optimus 4X HD"
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
LG Optimus 4X HD derives from x3 board but has slight
|
LG Optimus 4X HD derives from x3 board but has slight
|
||||||
differences.
|
differences.
|
||||||
|
|
||||||
config DEVICE_P895
|
config DEVICE_P895
|
||||||
bool "Enable support for LG Optimus Vu"
|
bool "Enable support for LG Optimus Vu"
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
LG Optimus Vu derives from x3 board but has slight
|
LG Optimus Vu derives from x3 board but has slight
|
||||||
differences.
|
differences.
|
||||||
|
@ -246,7 +246,6 @@ config CMD_BOOTM_PRE_LOAD
|
|||||||
bool "enable pre-load on bootm"
|
bool "enable pre-load on bootm"
|
||||||
depends on CMD_BOOTM
|
depends on CMD_BOOTM
|
||||||
depends on IMAGE_PRE_LOAD
|
depends on IMAGE_PRE_LOAD
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Enable support of stage pre-load for the bootm command.
|
Enable support of stage pre-load for the bootm command.
|
||||||
This stage allow to check or modify the image provided
|
This stage allow to check or modify the image provided
|
||||||
@ -2360,7 +2359,6 @@ config CMD_VIDCONSOLE
|
|||||||
config CMD_SELECT_FONT
|
config CMD_SELECT_FONT
|
||||||
bool "select font size"
|
bool "select font size"
|
||||||
depends on VIDEO
|
depends on VIDEO
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Enabling this will provide 'font' command.
|
Enabling this will provide 'font' command.
|
||||||
Allows font selection at runtime.
|
Allows font selection at runtime.
|
||||||
@ -2880,7 +2878,6 @@ config CMD_UBIFS
|
|||||||
config MMC_SPEED_MODE_SET
|
config MMC_SPEED_MODE_SET
|
||||||
bool "set speed mode using mmc command"
|
bool "set speed mode using mmc command"
|
||||||
depends on CMD_MMC
|
depends on CMD_MMC
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Enable setting speed mode using mmc rescan and mmc dev commands.
|
Enable setting speed mode using mmc rescan and mmc dev commands.
|
||||||
The speed mode is provided as the last argument in these commands
|
The speed mode is provided as the last argument in these commands
|
||||||
|
@ -28,26 +28,26 @@ config CONSOLE_RECORD_OUT_SIZE
|
|||||||
depends on CONSOLE_RECORD
|
depends on CONSOLE_RECORD
|
||||||
default 0x400 if CONSOLE_RECORD
|
default 0x400 if CONSOLE_RECORD
|
||||||
help
|
help
|
||||||
Set the size of the console output buffer. When this fills up, no
|
Set the size of the console recording output buffer. When this fills
|
||||||
more data will be recorded until some is removed. The buffer is
|
up, no more data will be recorded until some is removed. The buffer
|
||||||
allocated immediately after the malloc() region is ready.
|
is allocated immediately after the malloc() region is ready.
|
||||||
|
|
||||||
config CONSOLE_RECORD_OUT_SIZE_F
|
config CONSOLE_RECORD_OUT_SIZE_F
|
||||||
hex "Output buffer size before relocation"
|
hex "Output buffer size before relocation"
|
||||||
depends on CONSOLE_RECORD
|
depends on CONSOLE_RECORD
|
||||||
default 0x400 if CONSOLE_RECORD
|
default 0x400 if CONSOLE_RECORD
|
||||||
help
|
help
|
||||||
Set the size of the console output buffer before relocation. When
|
Set the size of the console recording output buffer before
|
||||||
this fills up, no more data will be recorded until some is removed.
|
relocation. When this fills up, no more data will be recorded until
|
||||||
The buffer is allocated immediately after the early malloc() region is
|
some is removed. The buffer is allocated immediately after the early
|
||||||
ready.
|
malloc() region is ready.
|
||||||
|
|
||||||
config CONSOLE_RECORD_IN_SIZE
|
config CONSOLE_RECORD_IN_SIZE
|
||||||
hex "Input buffer size"
|
hex "Input buffer size"
|
||||||
depends on CONSOLE_RECORD
|
depends on CONSOLE_RECORD
|
||||||
default 0x100 if CONSOLE_RECORD
|
default 0x100 if CONSOLE_RECORD
|
||||||
help
|
help
|
||||||
Set the size of the console input buffer. When this contains data,
|
Set the size of the console recording input buffer. When this contains data,
|
||||||
tstc() and getc() will use this in preference to real device input.
|
tstc() and getc() will use this in preference to real device input.
|
||||||
The buffer is allocated immediately after the malloc() region is
|
The buffer is allocated immediately after the malloc() region is
|
||||||
ready.
|
ready.
|
||||||
|
@ -77,7 +77,6 @@ endif
|
|||||||
config FSL_DCP_RNG
|
config FSL_DCP_RNG
|
||||||
bool "Enable Random Number Generator support"
|
bool "Enable Random Number Generator support"
|
||||||
depends on DM_RNG
|
depends on DM_RNG
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Enable support for the hardware based random number generator
|
Enable support for the hardware based random number generator
|
||||||
module of the DCP. It uses the True Random Number Generator (TRNG)
|
module of the DCP. It uses the True Random Number Generator (TRNG)
|
||||||
|
@ -144,8 +144,6 @@ static int ffa_print_error_log(u32 ffa_id, int ffa_errno)
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
abi_idx = FFA_ID_TO_ERRMAP_ID(ffa_id);
|
abi_idx = FFA_ID_TO_ERRMAP_ID(ffa_id);
|
||||||
if (abi_idx < 0 || abi_idx >= FFA_ERRMAP_COUNT)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (!err_msg_map[abi_idx].err_str[err_idx])
|
if (!err_msg_map[abi_idx].err_str[err_idx])
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -61,7 +61,6 @@ config TI_GPMC
|
|||||||
if TI_GPMC
|
if TI_GPMC
|
||||||
config TI_GPMC_DEBUG
|
config TI_GPMC_DEBUG
|
||||||
bool "Debug Texas Instruments GPMC timings"
|
bool "Debug Texas Instruments GPMC timings"
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Enable this to print GPMC timings before and after the GPMC registers
|
Enable this to print GPMC timings before and after the GPMC registers
|
||||||
are programmed. This should not be left enabled on production systems.
|
are programmed. This should not be left enabled on production systems.
|
||||||
|
@ -375,7 +375,6 @@ config SPL_MXC_OCOTP
|
|||||||
config NPCM_OTP
|
config NPCM_OTP
|
||||||
bool "Nnvoton NPCM BMC On-Chip OTP Memory Support"
|
bool "Nnvoton NPCM BMC On-Chip OTP Memory Support"
|
||||||
depends on (ARM && ARCH_NPCM)
|
depends on (ARM && ARCH_NPCM)
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Support NPCM BMC OTP memory (fuse).
|
Support NPCM BMC OTP memory (fuse).
|
||||||
To compile this driver as a module, choose M here: the module
|
To compile this driver as a module, choose M here: the module
|
||||||
|
@ -60,6 +60,17 @@ static int i2c_eeprom_std_read(struct udevice *dev, int offset, uint8_t *buf,
|
|||||||
return dm_i2c_read(dev, offset, buf, size);
|
return dm_i2c_read(dev, offset, buf, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int i2c_eeprom_len(int offset, int len, int pagesize)
|
||||||
|
{
|
||||||
|
int page_offset = offset & (pagesize - 1);
|
||||||
|
int maxlen = pagesize - page_offset;
|
||||||
|
|
||||||
|
if (len > maxlen)
|
||||||
|
len = maxlen;
|
||||||
|
|
||||||
|
return len;
|
||||||
|
}
|
||||||
|
|
||||||
static int i2c_eeprom_std_write(struct udevice *dev, int offset,
|
static int i2c_eeprom_std_write(struct udevice *dev, int offset,
|
||||||
const uint8_t *buf, int size)
|
const uint8_t *buf, int size)
|
||||||
{
|
{
|
||||||
@ -67,7 +78,7 @@ static int i2c_eeprom_std_write(struct udevice *dev, int offset,
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
while (size > 0) {
|
while (size > 0) {
|
||||||
int write_size = min_t(int, size, priv->pagesize);
|
int write_size = i2c_eeprom_len(offset, size, priv->pagesize);
|
||||||
|
|
||||||
ret = dm_i2c_write(dev, offset, buf, write_size);
|
ret = dm_i2c_write(dev, offset, buf, write_size);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -614,7 +614,6 @@ config ROCKCHIP_NAND
|
|||||||
config ROCKCHIP_NAND_SKIP_BBTSCAN
|
config ROCKCHIP_NAND_SKIP_BBTSCAN
|
||||||
bool "Skip the automatic BBT scan with Rockchip NAND controllers"
|
bool "Skip the automatic BBT scan with Rockchip NAND controllers"
|
||||||
depends on ROCKCHIP_NAND
|
depends on ROCKCHIP_NAND
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Skip the automatic BBT scan with the NAND_SKIP_BBTSCAN
|
Skip the automatic BBT scan with the NAND_SKIP_BBTSCAN
|
||||||
option when data content is not in MTD format or
|
option when data content is not in MTD format or
|
||||||
|
@ -107,7 +107,6 @@ config SPI_FLASH_SMART_HWCAPS
|
|||||||
|
|
||||||
config SPI_NOR_BOOT_SOFT_RESET_EXT_INVERT
|
config SPI_NOR_BOOT_SOFT_RESET_EXT_INVERT
|
||||||
bool "Command extension type is INVERT for Software Reset on boot"
|
bool "Command extension type is INVERT for Software Reset on boot"
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Because of SFDP information can not be get before boot.
|
Because of SFDP information can not be get before boot.
|
||||||
So define command extension type is INVERT when Software Reset on boot only.
|
So define command extension type is INVERT when Software Reset on boot only.
|
||||||
|
@ -4,6 +4,5 @@ config SM
|
|||||||
config MESON_SM
|
config MESON_SM
|
||||||
bool "Amlogic Secure Monitor driver"
|
bool "Amlogic Secure Monitor driver"
|
||||||
select SM
|
select SM
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Say y here to enable the Amlogic secure monitor driver.
|
Say y here to enable the Amlogic secure monitor driver.
|
||||||
|
@ -460,7 +460,6 @@ config SANDBOX_SPI_MAX_CS
|
|||||||
config SPI_ASPEED_SMC
|
config SPI_ASPEED_SMC
|
||||||
bool "ASPEED SPI flash controller driver"
|
bool "ASPEED SPI flash controller driver"
|
||||||
depends on DM_SPI && SPI_MEM
|
depends on DM_SPI && SPI_MEM
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Enable ASPEED SPI flash controller driver for AST2500
|
Enable ASPEED SPI flash controller driver for AST2500
|
||||||
and AST2600 SoCs.
|
and AST2600 SoCs.
|
||||||
|
@ -231,7 +231,6 @@ config USB_EHCI_MXS
|
|||||||
config USB_EHCI_NPCM
|
config USB_EHCI_NPCM
|
||||||
bool "Support for Nuvoton NPCM on-chip EHCI USB controller"
|
bool "Support for Nuvoton NPCM on-chip EHCI USB controller"
|
||||||
depends on ARCH_NPCM
|
depends on ARCH_NPCM
|
||||||
default n
|
|
||||||
---help---
|
---help---
|
||||||
Enables support for the on-chip EHCI controller on
|
Enables support for the on-chip EHCI controller on
|
||||||
Nuvoton NPCM chips.
|
Nuvoton NPCM chips.
|
||||||
@ -368,7 +367,6 @@ config USB_OHCI_DA8XX
|
|||||||
config USB_OHCI_NPCM
|
config USB_OHCI_NPCM
|
||||||
bool "Support for Nuvoton NPCM on-chip OHCI USB controller"
|
bool "Support for Nuvoton NPCM on-chip OHCI USB controller"
|
||||||
depends on ARCH_NPCM
|
depends on ARCH_NPCM
|
||||||
default n
|
|
||||||
---help---
|
---help---
|
||||||
Enables support for the on-chip OHCI controller on
|
Enables support for the on-chip OHCI controller on
|
||||||
Nuvoton NPCM chips.
|
Nuvoton NPCM chips.
|
||||||
|
@ -8,7 +8,6 @@ config UBIFS_SILENCE_MSG
|
|||||||
config UBIFS_SILENCE_DEBUG_DUMP
|
config UBIFS_SILENCE_DEBUG_DUMP
|
||||||
bool "UBIFS silence debug dumps"
|
bool "UBIFS silence debug dumps"
|
||||||
default y if UBIFS_SILENCE_MSG
|
default y if UBIFS_SILENCE_MSG
|
||||||
default n
|
|
||||||
help
|
help
|
||||||
Make the debug dumps from UBIFS stop printing.
|
Make the debug dumps from UBIFS stop printing.
|
||||||
This decreases size of U-Boot binary.
|
This decreases size of U-Boot binary.
|
||||||
|
@ -59,7 +59,7 @@ void *addrmap_phys_to_virt(phys_addr_t paddr)
|
|||||||
void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,
|
void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,
|
||||||
phys_size_t size, int idx)
|
phys_size_t size, int idx)
|
||||||
{
|
{
|
||||||
if (idx > CONFIG_SYS_NUM_ADDR_MAP)
|
if (idx >= CONFIG_SYS_NUM_ADDR_MAP)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
address_map[idx].vaddr = vaddr;
|
address_map[idx].vaddr = vaddr;
|
||||||
|
@ -981,6 +981,7 @@ sub get_maintainers {
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach my $email (@file_emails) {
|
foreach my $email (@file_emails) {
|
||||||
|
$email = mailmap_email($email);
|
||||||
my ($name, $address) = parse_email($email);
|
my ($name, $address) = parse_email($email);
|
||||||
|
|
||||||
my $tmp_email = format_email($name, $address, $email_usename);
|
my $tmp_email = format_email($name, $address, $email_usename);
|
||||||
@ -1718,7 +1719,7 @@ sub vcs_exists {
|
|||||||
%VCS_cmds = %VCS_cmds_hg;
|
%VCS_cmds = %VCS_cmds_hg;
|
||||||
return 2 if eval $VCS_cmds{"available"};
|
return 2 if eval $VCS_cmds{"available"};
|
||||||
%VCS_cmds = ();
|
%VCS_cmds = ();
|
||||||
if (!$printed_novcs) {
|
if (!$printed_novcs && $email_git) {
|
||||||
warn("$P: No supported VCS found. Add --nogit to options?\n");
|
warn("$P: No supported VCS found. Add --nogit to options?\n");
|
||||||
warn("Using a git repository produces better results.\n");
|
warn("Using a git repository produces better results.\n");
|
||||||
warn("Try Linus Torvalds' latest git repository using:\n");
|
warn("Try Linus Torvalds' latest git repository using:\n");
|
||||||
|
@ -99,7 +99,7 @@ static int sfspl_image_extract_subimage(void *ptr,
|
|||||||
{
|
{
|
||||||
struct spl_hdr *hdr = (void *)ptr;
|
struct spl_hdr *hdr = (void *)ptr;
|
||||||
unsigned char *buf = ptr;
|
unsigned char *buf = ptr;
|
||||||
int fd;
|
int fd, ret = EXIT_SUCCESS;
|
||||||
unsigned int hdr_size = le32_to_cpu(hdr->hdr_size);
|
unsigned int hdr_size = le32_to_cpu(hdr->hdr_size);
|
||||||
unsigned int file_size = le32_to_cpu(hdr->file_size);
|
unsigned int file_size = le32_to_cpu(hdr->file_size);
|
||||||
|
|
||||||
@ -110,16 +110,16 @@ static int sfspl_image_extract_subimage(void *ptr,
|
|||||||
|
|
||||||
fd = open(params->outfile, O_WRONLY | O_CREAT | O_TRUNC, 0644);
|
fd = open(params->outfile, O_WRONLY | O_CREAT | O_TRUNC, 0644);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
perror("Can write file");
|
perror("Cannot open file");
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
if (write(fd, &buf[hdr_size], file_size) != file_size) {
|
if (write(fd, &buf[hdr_size], file_size) != file_size) {
|
||||||
perror("Cannot write file");
|
perror("Cannot write file");
|
||||||
return EXIT_FAILURE;
|
ret = EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sfspl_check_image_type(uint8_t type)
|
static int sfspl_check_image_type(uint8_t type)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user