Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion arch/arm/mach-snapdragon/capsule_update.c
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,8 @@ void qcom_configure_capsule_updates(void)
}
memset(partitions, 0, sizeof(qcom_partitions));

if (IS_ENABLED(CONFIG_SCSI)) {
if (IS_ENABLED(CONFIG_SCSI) && !uclass_id_count(UCLASS_SCSI)) {
/* Scan for SCSI devices, unless already scanned earlier in boot */
ret = scsi_scan(false);
if (ret) {
debug("Failed to scan SCSI devices: %d\n", ret);
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-snapdragon/qcom_fit_multidtb.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <lmb.h>
#include <log.h>
#include <malloc.h>
#include <memalign.h>
#include <part.h>
#include <linux/errno.h>
#include <linux/kernel.h>
Expand Down Expand Up @@ -642,7 +643,7 @@ static int qcom_load_fit_image(const char *filename, const char *partname,
if (!ret) {
fat_size(filename, &file_size);

fit_buf = malloc(file_size);
fit_buf = malloc_cache_aligned(file_size);
if (!fit_buf)
return -ENOMEM;

Expand Down
1 change: 1 addition & 0 deletions configs/qcom_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CONFIG_BUTTON_CMD=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_QCOM_FIT_MULTIDTB=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_BOOTSTD_FULL=y
# CONFIG_BOOTMETH_VBE is not set
CONFIG_BOOTDELAY=1
Expand Down
4 changes: 4 additions & 0 deletions lib/efi_loader/efi_disk.c
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,12 @@ static efi_status_t efi_disk_add_dev(
/*
* On partitions or whole disks without partitions install the
* simple file system protocol if a file system is available.
*
* Skip the filesystem probe for non-ESP GPT partitions: only the ESP
* is ever opened as a filesystem before boot.
*/
if ((part || desc->part_type == PART_TYPE_UNKNOWN) &&
(!part_info || (part_info->bootable & PART_EFI_SYSTEM_PARTITION)) &&
efi_fs_exists(desc, part)) {
ret = efi_create_simple_file_system(desc, part, diskobj->dp,
&diskobj->volume);
Expand Down
Loading