Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-05 03:03:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs: Fix SPL build if SPL_FS_LOADER is enabled and FS_LOADER is disabled

Browse source 
When SPL_FS_LOADER is set to y and FS_LOADER is not enabled, the SPL build
fails with the following errors:

  AR      spl/boot/built-in.o
  LD      spl/u-boot-spl
arm-none-linux-gnueabihf-ld.bfd: drivers/misc/fs_loader.o: in function
`fw_get_filesystem_firmware':
/u-boot/drivers/misc/fs_loader.c:162: undefined reference to
`fs_set_blk_dev'
arm-none-linux-gnueabihf-ld.bfd: /home/frh/tdx/src/u-boot/drivers/misc/
fs_loader.c:185: undefined reference to `fs_read'
arm-none-linux-gnueabihf-ld.bfd: drivers/misc/fs_loader.o: in function
`select_fs_dev':
/u-boot/drivers/misc/fs_loader.c:89: undefined reference to
`fs_set_blk_dev_with_part'
make[1]: *** [scripts/Makefile.spl:527: spl/u-boot-spl] Error 1
make: *** [Makefile:2055: spl/u-boot-spl] Error 2

Fix it by replacing the FS_LOADER with SPL_FS_LOADER in the Makefile, so
the fs.c with the necessary function definitions are compiled.

Fixes: b071a07743 ("drivers: misc: Makefile: Enable fs_loader compilation at SPL Level")
Suggested-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
This commit is contained in:
Hiago De Franco 2024-09-16 15:03:36 +02:00 • committed by Tom Rini
parent eeeb35bfb6
commit a280368b48
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configs/sandbox_noinst_defconfig
View file

@ -187,6 +187,7 @@ CONFIG_P2SB=y
CONFIG_PWRSEQ=y CONFIG_PWRSEQ=y
CONFIG_SPL_PWRSEQ=y CONFIG_SPL_PWRSEQ=y
CONFIG_FS_LOADER=y CONFIG_FS_LOADER=y
CONFIG_SPL_FS_LOADER=y
CONFIG_MMC_SANDBOX=y CONFIG_MMC_SANDBOX=y
CONFIG_DM_MTD=y CONFIG_DM_MTD=y
CONFIG_MTD_CONCAT=y CONFIG_MTD_CONCAT=y

2
drivers/block/Kconfig
View file

@ -109,7 +109,7 @@ config EFI_MEDIA
config SPL_BLK_FS config SPL_BLK_FS
bool "Load images from filesystems on block devices" bool "Load images from filesystems on block devices"
depends on SPL_BLK depends on SPL_BLK && SPL_FS_LOADER
help help
Use generic support to load images from fat/ext filesystems on Use generic support to load images from fat/ext filesystems on
different types of block devices such as NVMe. different types of block devices such as NVMe.

2
fs/Makefile
View file

@ -5,7 +5,7 @@
# Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. # Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_FS_LOADER) += fs.o obj-$(CONFIG_SPL_FS_LOADER) += fs.o
obj-$(CONFIG_SPL_FS_FAT) += fat/ obj-$(CONFIG_SPL_FS_FAT) += fat/
obj-$(CONFIG_SPL_FS_EXT4) += ext4/ obj-$(CONFIG_SPL_FS_EXT4) += ext4/
obj-$(CONFIG_SPL_FS_CBFS) += cbfs/ obj-$(CONFIG_SPL_FS_CBFS) += cbfs/