mirror of
				https://source.denx.de/u-boot/u-boot.git
				synced 2025-10-31 08:21:36 +01:00 
			
		
		
		
	At present fdt blob or argument address being passed to kernel is fixed at compile time using macro CONFIG_SYS_SPL_ARGS_ADDR. FDT blob from different media like nand, nor flash are copied to the address pointed by the macro. The problem is, it makes args/fdt blob compulsory to copy which is not required in cases like for NOR Flash. This patch removes this limitation. Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
		
			
				
	
	
		
			69 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			69 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (C) 2012 Stefan Roese <sr@denx.de>
 | |
|  *
 | |
|  * SPDX-License-Identifier:	GPL-2.0+
 | |
|  */
 | |
| 
 | |
| #include <common.h>
 | |
| #include <spl.h>
 | |
| 
 | |
| static int spl_nor_load_image(struct spl_image_info *spl_image,
 | |
| 			      struct spl_boot_device *bootdev)
 | |
| {
 | |
| 	int ret;
 | |
| 	/*
 | |
| 	 * Loading of the payload to SDRAM is done with skipping of
 | |
| 	 * the mkimage header in this SPL NOR driver
 | |
| 	 */
 | |
| 	spl_image->flags |= SPL_COPY_PAYLOAD_ONLY;
 | |
| 
 | |
| #ifdef CONFIG_SPL_OS_BOOT
 | |
| 	if (!spl_start_uboot()) {
 | |
| 		const struct image_header *header;
 | |
| 
 | |
| 		/*
 | |
| 		 * Load Linux from its location in NOR flash to its defined
 | |
| 		 * location in SDRAM
 | |
| 		 */
 | |
| 		header = (const struct image_header *)CONFIG_SYS_OS_BASE;
 | |
| 
 | |
| 		if (image_get_os(header) == IH_OS_LINUX) {
 | |
| 			/* happy - was a Linux */
 | |
| 
 | |
| 			ret = spl_parse_image_header(spl_image, header);
 | |
| 			if (ret)
 | |
| 				return ret;
 | |
| 
 | |
| 			memcpy((void *)spl_image->load_addr,
 | |
| 			       (void *)(CONFIG_SYS_OS_BASE +
 | |
| 					sizeof(struct image_header)),
 | |
| 			       spl_image->size);
 | |
| 
 | |
| 			spl_image->arg = (void *)CONFIG_SYS_FDT_BASE;
 | |
| 
 | |
| 			return 0;
 | |
| 		} else {
 | |
| 			puts("The Expected Linux image was not found.\n"
 | |
| 			     "Please check your NOR configuration.\n"
 | |
| 			     "Trying to start u-boot now...\n");
 | |
| 		}
 | |
| 	}
 | |
| #endif
 | |
| 
 | |
| 	/*
 | |
| 	 * Load real U-Boot from its location in NOR flash to its
 | |
| 	 * defined location in SDRAM
 | |
| 	 */
 | |
| 	ret = spl_parse_image_header(spl_image,
 | |
| 			(const struct image_header *)CONFIG_SYS_UBOOT_BASE);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	memcpy((void *)(unsigned long)spl_image->load_addr,
 | |
| 	       (void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)),
 | |
| 	       spl_image->size);
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| SPL_LOAD_IMAGE_METHOD("NOR", 0, BOOT_DEVICE_NOR, spl_nor_load_image);
 |