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

drivers: misc: Makefile: Enable fs_loader compilation at SPL Level

Browse source 
Enable fs_loader compilation at SPL Level.

Signed-off-by: Keerthy <j-keerthy@ti.com>
[Amjad: fix compilation failures for J721e platform]
Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.com>
This commit is contained in:
Keerthy 2022-01-27 13:16:53 +01:00 • committed by Tom Rini
parent 0197909dd1
commit b071a07743
8 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/mach-k3/common.c
View file

@ -156,13 +156,15 @@ void init_env(void)
#endif #endif
} }
#ifdef CONFIG_FS_LOADER
int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr) int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr)
{ {
struct udevice *fsdev; struct udevice *fsdev;
char *name = NULL; char *name = NULL;
int size = 0; int size = 0;
if (!IS_ENABLED(CONFIG_FS_LOADER))
return 0;
*loadaddr = 0; *loadaddr = 0;
#ifdef CONFIG_SPL_ENV_SUPPORT #ifdef CONFIG_SPL_ENV_SUPPORT
switch (spl_boot_device()) { switch (spl_boot_device()) {
@ -186,12 +188,6 @@ int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr)
return size; return size;
} }
#else
int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr)
{
return 0;
}
#endif
__weak void release_resources_for_core_shutdown(void) __weak void release_resources_for_core_shutdown(void)
{ {

1
configs/j7200_evm_r5_defconfig
View file

@ -91,6 +91,7 @@ CONFIG_SYS_I2C_OMAP24XX=y
CONFIG_DM_MAILBOX=y CONFIG_DM_MAILBOX=y
CONFIG_K3_SEC_PROXY=y CONFIG_K3_SEC_PROXY=y
CONFIG_FS_LOADER=y CONFIG_FS_LOADER=y
CONFIG_SPL_FS_LOADER=y
CONFIG_K3_AVS0=y CONFIG_K3_AVS0=y
CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_SPL_MMC_HS400_SUPPORT=y CONFIG_SPL_MMC_HS400_SUPPORT=y

1
configs/j721e_evm_r5_defconfig
View file

@ -88,6 +88,7 @@ CONFIG_SYS_I2C_OMAP24XX=y
CONFIG_DM_MAILBOX=y CONFIG_DM_MAILBOX=y
CONFIG_K3_SEC_PROXY=y CONFIG_K3_SEC_PROXY=y
CONFIG_FS_LOADER=y CONFIG_FS_LOADER=y
CONFIG_SPL_FS_LOADER=y
CONFIG_ESM_K3=y CONFIG_ESM_K3=y
CONFIG_K3_AVS0=y CONFIG_K3_AVS0=y
CONFIG_ESM_PMIC=y CONFIG_ESM_PMIC=y

1
configs/j721e_hs_evm_r5_defconfig
View file

@ -82,6 +82,7 @@ CONFIG_SYS_I2C_OMAP24XX=y
CONFIG_DM_MAILBOX=y CONFIG_DM_MAILBOX=y
CONFIG_K3_SEC_PROXY=y CONFIG_K3_SEC_PROXY=y
CONFIG_FS_LOADER=y CONFIG_FS_LOADER=y
CONFIG_SPL_FS_LOADER=y
CONFIG_K3_AVS0=y CONFIG_K3_AVS0=y
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
CONFIG_SPL_MMC_SDHCI_ADMA=y CONFIG_SPL_MMC_SDHCI_ADMA=y

1
configs/j721s2_evm_r5_defconfig
View file

@ -90,6 +90,7 @@ CONFIG_SYS_I2C_OMAP24XX=y
CONFIG_DM_MAILBOX=y CONFIG_DM_MAILBOX=y
CONFIG_K3_SEC_PROXY=y CONFIG_K3_SEC_PROXY=y
CONFIG_FS_LOADER=y CONFIG_FS_LOADER=y
CONFIG_SPL_FS_LOADER=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_SPL_MMC_HS400_SUPPORT=y CONFIG_SPL_MMC_HS400_SUPPORT=y

1
configs/socfpga_arria10_defconfig
View file

@ -41,6 +41,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_DWAPB_GPIO=y CONFIG_DWAPB_GPIO=y
CONFIG_FS_LOADER=y CONFIG_FS_LOADER=y
CONFIG_SPL_FS_LOADER=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y

9
drivers/misc/Kconfig
View file

@ -453,6 +453,15 @@ config FS_LOADER
The consumer driver would then use this loader to program whatever, The consumer driver would then use this loader to program whatever,
ie. the FPGA device. ie. the FPGA device.
config SPL_FS_LOADER
bool "Enable loader driver for file system"
help
This is file system generic loader which can be used to load
the file image from the storage into target such as memory.
The consumer driver would then use this loader to program whatever,
ie. the FPGA device.
config GDSYS_SOC config GDSYS_SOC
bool "Enable gdsys SOC driver" bool "Enable gdsys SOC driver"
depends on MISC depends on MISC

2
drivers/misc/Makefile
View file

@ -37,7 +37,7 @@ obj-$(CONFIG_FSL_IFC) += fsl_ifc.o
obj-$(CONFIG_FSL_IIM) += fsl_iim.o obj-$(CONFIG_FSL_IIM) += fsl_iim.o
obj-$(CONFIG_FSL_MC9SDZ60) += mc9sdz60.o obj-$(CONFIG_FSL_MC9SDZ60) += mc9sdz60.o
obj-$(CONFIG_FSL_SEC_MON) += fsl_sec_mon.o obj-$(CONFIG_FSL_SEC_MON) += fsl_sec_mon.o
obj-$(CONFIG_FS_LOADER) += fs_loader.o obj-$(CONFIG_$(SPL_)FS_LOADER) += fs_loader.o
obj-$(CONFIG_GDSYS_IOEP) += gdsys_ioep.o obj-$(CONFIG_GDSYS_IOEP) += gdsys_ioep.o
obj-$(CONFIG_GDSYS_RXAUI_CTRL) += gdsys_rxaui_ctrl.o obj-$(CONFIG_GDSYS_RXAUI_CTRL) += gdsys_rxaui_ctrl.o
obj-$(CONFIG_GDSYS_SOC) += gdsys_soc.o obj-$(CONFIG_GDSYS_SOC) += gdsys_soc.o