Falcon mode loads a kernel file and an args file which is the device-tree. However in the case of kernel file being a FIT that contains the device-tree within it, loading the args file is not required.
Therefore, this patch introduces a new SPL_OS_BOOT_ARGS config options that allows us to enable or disable loading of the args file in falcon mode. Signed-off-by: Anshul Dalal <[email protected]> --- common/spl/Kconfig | 21 ++++++++++++++------- common/spl/spl.c | 8 ++++++-- common/spl/spl_ext.c | 4 ++++ common/spl/spl_fat.c | 5 +++++ common/spl/spl_nand.c | 5 ++++- common/spl/spl_spi.c | 5 +++++ common/spl/spl_ubi.c | 4 ++++ include/system-constants.h | 2 +- 8 files changed, 43 insertions(+), 11 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f20651c3769..22ef43c3a6e 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -803,7 +803,7 @@ config SPL_FS_LOAD_KERNEL_NAME config SPL_FS_LOAD_ARGS_NAME string "File to load for the OS kernel argument parameters from the filesystem" - depends on (SPL_FS_EXT4 || SPL_FS_FAT || SPL_FS_SQUASHFS) && SPL_OS_BOOT + depends on (SPL_FS_EXT4 || SPL_FS_FAT || SPL_FS_SQUASHFS) && SPL_OS_BOOT_ARGS default "args" help Filename to read to load for the OS kernel argument parameters from @@ -1121,7 +1121,7 @@ config SPL_UBI_LOAD_KERNEL_ID config SPL_UBI_LOAD_ARGS_ID int "id of kernel args volume" - depends on SPL_OS_BOOT + depends on SPL_OS_BOOT_ARGS help The UBI volume id from which to load the device tree @@ -1214,9 +1214,16 @@ config SPL_OS_BOOT_SECURE to use falcon mode by disabling certain inherently non-securable options in the SPL boot flow. +config SPL_OS_BOOT_ARGS + bool "Allow SPL to load args for kernel in falcon mode" + depends on SPL_OS_BOOT || SPL_LOAD_FIT_OPENSBI_OS_BOOT + help + This option enables the SPL to load an args file (usually the FDT) + alongside the kernel image in falcon boot mode. + config SPL_PAYLOAD_ARGS_ADDR hex "Address in memory to load 'args' file for Falcon Mode to" - depends on SPL_OS_BOOT || SPL_LOAD_FIT_OPENSBI_OS_BOOT + depends on SPL_OS_BOOT_ARGS default 0x88000000 if ARCH_OMAP2PLUS default 0x99000000 if ARCH_SC5XX && SC59X_64 default 0xA0000000 if ARCH_SC5XX && TARGET_SC594_SOM_EZKIT @@ -1256,7 +1263,7 @@ config SYS_MMCSD_RAW_MODE_KERNEL_SECTOR config SYS_MMCSD_RAW_MODE_ARGS_SECTOR hex "Falcon mode: Sector to load 'args' from MMC" - depends on SPL_FALCON_BOOT_MMCSD + depends on SPL_FALCON_BOOT_MMCSD && SPL_OS_BOOT_ARGS help When Falcon mode is used with an MMC or SD media, SPL needs to know where to look for the OS 'args', typically a device tree. The @@ -1266,7 +1273,7 @@ config SYS_MMCSD_RAW_MODE_ARGS_SECTOR config SYS_MMCSD_RAW_MODE_ARGS_SECTORS hex "Falcon mode: Number of sectors to load for 'args' from MMC" - depends on SPL_FALCON_BOOT_MMCSD && SYS_MMCSD_RAW_MODE_ARGS_SECTOR != 0x0 + depends on SPL_FALCON_BOOT_MMCSD && SPL_OS_BOOT_ARGS config SPL_PAYLOAD string "SPL payload" @@ -1502,14 +1509,14 @@ config SYS_SPI_KERNEL_OFFS config SYS_SPI_ARGS_OFFS hex "Falcon mode: address of args payload in SPI flash" - depends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT + depends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT_ARGS help Address within SPI-Flash from where the args payload (usually the dtb) is fetched in falcon boot. config SYS_SPI_ARGS_SIZE hex "Falcon mode: size of args payload in SPI flash" - depends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT + depends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT_ARGS config SPL_THERMAL bool "Driver support for thermal devices" diff --git a/common/spl/spl.c b/common/spl/spl.c index 55ad497c86d..f1a1785beef 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -692,6 +692,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_jump_to_image_t jumper = &jump_to_image; struct spl_image_info spl_image; int ret, os; + void *fdt; debug(">>" PHASE_PROMPT "board_init_r()\n"); @@ -793,8 +794,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2) jumper = &spl_invoke_opensbi; } else if (CONFIG_IS_ENABLED(OS_BOOT) && os == IH_OS_LINUX) { debug("Jumping to Linux\n"); - if (IS_ENABLED(CONFIG_SPL_OS_BOOT)) - spl_fixup_fdt((void *)SPL_PAYLOAD_ARGS_ADDR); + if (CONFIG_IS_ENABLED(OS_BOOT_ARGS)) + fdt = (void *)SPL_PAYLOAD_ARGS_ADDR; + else + fdt = spl_image_fdt_addr(&spl_image); + spl_fixup_fdt(fdt); spl_board_prepare_for_linux(); jumper = &jump_to_image_linux; } else { diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index a3925d38d52..834977f82f5 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -105,6 +105,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, goto defaults; } +#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS) ext4fs_set_blk_dev(block_dev, &part_info); ext4fs_mount(); file = env_get("falcon_args_file"); @@ -125,6 +126,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, } else { puts("spl: falcon_args_file not set in environment, falling back to default\n"); } +#endif } else { puts("spl: falcon_image_file not set in environment, falling back to default\n"); } @@ -137,6 +139,7 @@ defaults: if (err) return err; +#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS) ext4fs_set_blk_dev(block_dev, &part_info); ext4fs_mount(); err = ext4fs_open(CONFIG_SPL_FS_LOAD_ARGS_NAME, &filelen); @@ -153,6 +156,7 @@ defaults: #endif return -1; } +#endif return 0; } diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 80e800b4755..d66b2f7d5e7 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -131,6 +131,7 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image, goto defaults; } +#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS) file = env_get("falcon_args_file"); if (file) { err = file_fat_read( @@ -143,6 +144,8 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image, return 0; } else puts("spl: falcon_args_file not set in environment, falling back to default\n"); +#endif + } else puts("spl: falcon_image_file not set in environment, falling back to default\n"); @@ -154,6 +157,7 @@ defaults: if (err) return err; +#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS) err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME, (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0); if (err <= 0) { @@ -161,6 +165,7 @@ defaults: CONFIG_SPL_FS_LOAD_ARGS_NAME, err); return err; } +#endif return 0; } diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 93ef2d1c02c..1e5c0fd5be9 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -79,7 +79,7 @@ static int spl_nand_load_element(struct spl_image_info *spl_image, static int spl_nand_load_image_os(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { - int *src, *dst, err; + int err; struct legacy_img_hdr *header = spl_get_load_buffer(0, sizeof(*header)); /* load linux */ @@ -101,12 +101,14 @@ static int spl_nand_load_image_os(struct spl_image_info *spl_image, if (err) return err; +#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS) /* * load parameter image load to temp position since nand_spl_load_image * reads a whole block which is typically larger than * CONFIG_CMD_SPL_WRITE_SIZE therefore may overwrite following sections * like BSS */ + int *src, *dst; nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS, CONFIG_CMD_SPL_WRITE_SIZE, (void *)CONFIG_TEXT_BASE); /* copy to destintion */ @@ -116,6 +118,7 @@ static int spl_nand_load_image_os(struct spl_image_info *spl_image, src++, dst++) { writel(readl(src), dst); } +#endif return 0; } diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index cbc864809fe..e3b2074b527 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -61,10 +61,15 @@ static int spl_spi_load_image_os(struct spl_image_info *spl_image, if (err) return err; +#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS) /* Read device tree. */ return spi_flash_read(flash, CONFIG_SYS_SPI_ARGS_OFFS, CONFIG_SYS_SPI_ARGS_SIZE, (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR); +#else + return 0; +#endif + } #endif diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c index 3c6f80de7d9..a66ada2166c 100644 --- a/common/spl/spl_ubi.c +++ b/common/spl/spl_ubi.c @@ -22,10 +22,14 @@ int spl_ubi_load_image_os(struct spl_image_info *spl_image, volumes[0].vol_id = CONFIG_SPL_UBI_LOAD_KERNEL_ID; volumes[0].load_addr = (void *)CONFIG_SYS_LOAD_ADDR; +#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS) volumes[1].vol_id = CONFIG_SPL_UBI_LOAD_ARGS_ID; volumes[1].load_addr = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR; err = ubispl_load_volumes(info, volumes, 2); +#else + err = ubispl_load_volumes(info, volumes, 1); +#endif if (err) return err; diff --git a/include/system-constants.h b/include/system-constants.h index e09fc418a47..908bf16d0b4 100644 --- a/include/system-constants.h +++ b/include/system-constants.h @@ -37,7 +37,7 @@ IF_ENABLED_INT(CONFIG_SPL_SYS_MALLOC, CONFIG_SPL_SYS_MALLOC_SIZE) /* deal with an optional value */ -#ifdef CONFIG_SPL_OS_BOOT +#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS) #define SPL_PAYLOAD_ARGS_ADDR CONFIG_SPL_PAYLOAD_ARGS_ADDR #else #define SPL_PAYLOAD_ARGS_ADDR 0 -- 2.51.0
