mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-10-31 03:58:17 +00:00 
			
		
		
		
	arch/arm/include/asm/spl.h requires all SoCs to have
arch/arm/include/asm/arch-*/spl.h.
But many of them just define BOOT_DEVICE_* macros.
Those macros are used in the "switch (boot_device) { ... }"
statement in common/spl/spl.c.
So they should not be archtecture specific, but be described as
a simpile enumeration.
This commit merges most of arch/arm/include/asm/arch-*/spl.h
into arch/arm/include/asm/spl.h.
With a little more effort, arch-zynq/spl.h and arch-socfpga/spl.h
will be merged, while I am not sure about OMAP and Exynos.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Tom Warren <twarren@nvidia.com>
CC: Stefano Babic <sbabic@denx.de>
CC: Minkyu Kang <mk7.kang@samsung.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stefano Babic <sbabic@denx.de>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Tim Harvey <tharvey@gateworks.com>
Tested-by: Bo Shen <voice.shen@atmel.com> [on sama5d3xek board for at91 part]
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stefano Babic <sbabic@denx.de> [applying Tim's i.MX6 patches]
Acked-by: Tom Rini <trini@ti.com>
		
	
			
		
			
				
	
	
		
			39 lines
		
	
	
		
			712 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			39 lines
		
	
	
		
			712 B
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * (C) Copyright 2012
 | |
|  * Texas Instruments, <www.ti.com>
 | |
|  *
 | |
|  * SPDX-License-Identifier:	GPL-2.0+
 | |
|  */
 | |
| #ifndef	_ASM_SPL_H_
 | |
| #define	_ASM_SPL_H_
 | |
| 
 | |
| #if defined(CONFIG_OMAP) || defined(CONFIG_SOCFPGA) || defined(CONFIG_ZYNQ) \
 | |
| 	|| defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \
 | |
| 	|| defined(CONFIG_EXYNOS4210)
 | |
| /* Platform-specific defines */
 | |
| #include <asm/arch/spl.h>
 | |
| 
 | |
| #else
 | |
| enum {
 | |
| 	BOOT_DEVICE_RAM,
 | |
| 	BOOT_DEVICE_MMC1,
 | |
| 	BOOT_DEVICE_MMC2,
 | |
| 	BOOT_DEVICE_MMC2_2,
 | |
| 	BOOT_DEVICE_NAND,
 | |
| 	BOOT_DEVICE_ONENAND,
 | |
| 	BOOT_DEVICE_NOR,
 | |
| 	BOOT_DEVICE_UART,
 | |
| 	BOOT_DEVICE_SPI,
 | |
| 	BOOT_DEVICE_SATA,
 | |
| 	BOOT_DEVICE_I2C,
 | |
| 	BOOT_DEVICE_NONE
 | |
| };
 | |
| #endif
 | |
| 
 | |
| /* Linker symbols. */
 | |
| extern char __bss_start[], __bss_end[];
 | |
| 
 | |
| extern gd_t gdata;
 | |
| 
 | |
| #endif
 |