mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-10-31 03:58:17 +00:00 
			
		
		
		
	Implement default versions of falcon mode functions to make the CONFIG_SPL_OS_BOOT check in spl_mmc_load_image() unnecessary, thus reducing its #ifdef complexity. No functional changes. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Paul Kocialkowski <contact@paulk.fr> Cc: Pantelis Antoniou <panto@antoniou-consulting.com> Cc: Tom Rini <trini@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Cc: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Suriyan Ramasami <suriyan.r@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
		
			
				
	
	
		
			146 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			146 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * SPDX-License-Identifier:	GPL-2.0+
 | |
|  */
 | |
| 
 | |
| #include <common.h>
 | |
| #include <spl.h>
 | |
| #include <asm/u-boot.h>
 | |
| #include <ext4fs.h>
 | |
| #include <errno.h>
 | |
| #include <image.h>
 | |
| 
 | |
| #ifdef CONFIG_SPL_EXT_SUPPORT
 | |
| int spl_load_image_ext(block_dev_desc_t *block_dev,
 | |
| 						int partition,
 | |
| 						const char *filename)
 | |
| {
 | |
| 	s32 err;
 | |
| 	struct image_header *header;
 | |
| 	loff_t filelen, actlen;
 | |
| 	disk_partition_t part_info = {};
 | |
| 
 | |
| 	header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
 | |
| 						sizeof(struct image_header));
 | |
| 
 | |
| 	if (get_partition_info(block_dev,
 | |
| 			       partition, &part_info)) {
 | |
| 		printf("spl: no partition table found\n");
 | |
| 		return -1;
 | |
| 	}
 | |
| 
 | |
| 	ext4fs_set_blk_dev(block_dev, &part_info);
 | |
| 
 | |
| 	err = ext4fs_mount(0);
 | |
| 	if (!err) {
 | |
| #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
 | |
| 		printf("%s: ext4fs mount err - %d\n", __func__, err);
 | |
| #endif
 | |
| 		goto end;
 | |
| 	}
 | |
| 
 | |
| 	err = ext4fs_open(filename, &filelen);
 | |
| 	if (err < 0) {
 | |
| 		puts("spl: ext4fs_open failed\n");
 | |
| 		goto end;
 | |
| 	}
 | |
| 	err = ext4fs_read((char *)header, sizeof(struct image_header), &actlen);
 | |
| 	if (err < 0) {
 | |
| 		puts("spl: ext4fs_read failed\n");
 | |
| 		goto end;
 | |
| 	}
 | |
| 
 | |
| 	spl_parse_image_header(header);
 | |
| 
 | |
| 	err = ext4fs_read((char *)spl_image.load_addr, filelen, &actlen);
 | |
| 
 | |
| end:
 | |
| #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
 | |
| 	if (err < 0)
 | |
| 		printf("%s: error reading image %s, err - %d\n",
 | |
| 		       __func__, filename, err);
 | |
| #endif
 | |
| 
 | |
| 	return err < 0;
 | |
| }
 | |
| 
 | |
| #ifdef CONFIG_SPL_OS_BOOT
 | |
| int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition)
 | |
| {
 | |
| 	int err;
 | |
| 	__maybe_unused loff_t filelen, actlen;
 | |
| 	disk_partition_t part_info = {};
 | |
| 	__maybe_unused char *file;
 | |
| 
 | |
| 	if (get_partition_info(block_dev,
 | |
| 			       partition, &part_info)) {
 | |
| 		printf("spl: no partition table found\n");
 | |
| 		return -1;
 | |
| 	}
 | |
| 
 | |
| 	ext4fs_set_blk_dev(block_dev, &part_info);
 | |
| 
 | |
| 	err = ext4fs_mount(0);
 | |
| 	if (!err) {
 | |
| #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
 | |
| 		printf("%s: ext4fs mount err - %d\n", __func__, err);
 | |
| #endif
 | |
| 		return -1;
 | |
| 	}
 | |
| 
 | |
| #if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
 | |
| 	file = getenv("falcon_args_file");
 | |
| 	if (file) {
 | |
| 		err = ext4fs_open(file, &filelen);
 | |
| 		if (err < 0) {
 | |
| 			puts("spl: ext4fs_open failed\n");
 | |
| 			goto defaults;
 | |
| 		}
 | |
| 		err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen);
 | |
| 		if (err < 0) {
 | |
| 			printf("spl: error reading image %s, err - %d, falling back to default\n",
 | |
| 			       file, err);
 | |
| 			goto defaults;
 | |
| 		}
 | |
| 		file = getenv("falcon_image_file");
 | |
| 		if (file) {
 | |
| 			err = spl_load_image_ext(block_dev, partition, file);
 | |
| 			if (err != 0) {
 | |
| 				puts("spl: falling back to default\n");
 | |
| 				goto defaults;
 | |
| 			}
 | |
| 
 | |
| 			return 0;
 | |
| 		} else {
 | |
| 			puts("spl: falcon_image_file not set in environment, falling back to default\n");
 | |
| 		}
 | |
| 	} else {
 | |
| 		puts("spl: falcon_args_file not set in environment, falling back to default\n");
 | |
| 	}
 | |
| 
 | |
| defaults:
 | |
| #endif
 | |
| 
 | |
| 	err = ext4fs_open(CONFIG_SPL_FS_LOAD_ARGS_NAME, &filelen);
 | |
| 	if (err < 0)
 | |
| 		puts("spl: ext4fs_open failed\n");
 | |
| 
 | |
| 	err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen);
 | |
| 	if (err < 0) {
 | |
| #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
 | |
| 		printf("%s: error reading image %s, err - %d\n",
 | |
| 		       __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
 | |
| #endif
 | |
| 		return -1;
 | |
| 	}
 | |
| 
 | |
| 	return spl_load_image_ext(block_dev, partition,
 | |
| 			CONFIG_SPL_FS_LOAD_KERNEL_NAME);
 | |
| }
 | |
| #else
 | |
| int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition)
 | |
| {
 | |
| 	return -ENOSYS;
 | |
| }
 | |
| #endif
 | |
| #endif
 |