mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-31 10:26:10 +01:00 
			
		
		
		
	ARM: at91: sama5: move the sd/mmc env config to at91-sama5_common.h
As almost all sama5 sd/mmc env configurations are same, so move them to
at91-sama5_common.h.
Also define CONFIG_ENV_VARS_UBOOT_CONFIG to have the varaible: $board_name.
Then we can use 'at91-${board_name}.dtb' as the dtb name.
TODO: since sama5d3xek has different dtb name, we need to some extra
stuff to make it work on sama5d3xek boards.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
			
			
This commit is contained in:
		
				
					committed by
					
						 Andreas Bießmann
						Andreas Bießmann
					
				
			
			
				
	
			
			
			
						parent
						
							bfc37f3cb8
						
					
				
				
					commit
					372ca03fcd
				
			| @@ -27,6 +27,7 @@ | |||||||
| #define CONFIG_BOARD_EARLY_INIT_F | #define CONFIG_BOARD_EARLY_INIT_F | ||||||
| #define CONFIG_DISPLAY_CPUINFO | #define CONFIG_DISPLAY_CPUINFO | ||||||
|  |  | ||||||
|  | #define CONFIG_ENV_VARS_UBOOT_CONFIG | ||||||
| #define CONFIG_CMD_BOOTZ | #define CONFIG_CMD_BOOTZ | ||||||
| #define CONFIG_OF_LIBFDT		/* Device Tree support */ | #define CONFIG_OF_LIBFDT		/* Device Tree support */ | ||||||
|  |  | ||||||
| @@ -52,6 +53,17 @@ | |||||||
| #define CONFIG_CMD_DHCP | #define CONFIG_CMD_DHCP | ||||||
|  |  | ||||||
| #ifdef CONFIG_SYS_USE_MMC | #ifdef CONFIG_SYS_USE_MMC | ||||||
|  | /* u-boot env in sd/mmc card */ | ||||||
|  | #define CONFIG_ENV_IS_IN_FAT | ||||||
|  | #define CONFIG_FAT_WRITE | ||||||
|  | #define FAT_ENV_INTERFACE	"mmc" | ||||||
|  | #define FAT_ENV_DEVICE_AND_PART	"0" | ||||||
|  | #define FAT_ENV_FILE		"uboot.env" | ||||||
|  | #define CONFIG_ENV_SIZE		0x4000 | ||||||
|  |  | ||||||
|  | #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 at91-${board_name}.dtb; " \ | ||||||
|  | 				"fatload mmc 0:1 0x22000000 zImage; "	\ | ||||||
|  | 				"bootz 0x22000000 - 0x21000000" | ||||||
| #define CONFIG_BOOTARGS							\ | #define CONFIG_BOOTARGS							\ | ||||||
| 	"console=ttyS0,115200 earlyprintk "				\ | 	"console=ttyS0,115200 earlyprintk "				\ | ||||||
| 	"root=/dev/mmcblk0p2 rw rootwait" | 	"root=/dev/mmcblk0p2 rw rootwait" | ||||||
|   | |||||||
| @@ -124,15 +124,7 @@ | |||||||
| 				"nand read 0x22000000 0x200000 0x600000;" \ | 				"nand read 0x22000000 0x200000 0x600000;" \ | ||||||
| 				"bootz 0x22000000 - 0x21000000" | 				"bootz 0x22000000 - 0x21000000" | ||||||
| #elif CONFIG_SYS_USE_MMC | #elif CONFIG_SYS_USE_MMC | ||||||
| /* bootstrap + u-boot + env in sd card */ | /* override the bootcmd, bootargs and other configuration for sd/mmc env */ | ||||||
| #define CONFIG_ENV_IS_IN_FAT |  | ||||||
| #define FAT_ENV_INTERFACE	"mmc" |  | ||||||
| #define FAT_ENV_FILE		"uboot.env" |  | ||||||
| #define FAT_ENV_DEVICE_AND_PART	"0" |  | ||||||
| #define CONFIG_ENV_SIZE		0x4000 |  | ||||||
| #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 at91-sama5d3_xplained.dtb; " \ |  | ||||||
| 				"fatload mmc 0:1 0x22000000 zImage; " \ |  | ||||||
| 				"bootz 0x22000000 - 0x21000000" |  | ||||||
| #else | #else | ||||||
| #define CONFIG_ENV_IS_NOWHERE | #define CONFIG_ENV_IS_NOWHERE | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -171,15 +171,7 @@ | |||||||
| 				"nand read 0x22000000 0x200000 0x600000;" \ | 				"nand read 0x22000000 0x200000 0x600000;" \ | ||||||
| 				"bootm 0x22000000 - 0x21000000" | 				"bootm 0x22000000 - 0x21000000" | ||||||
| #elif CONFIG_SYS_USE_MMC | #elif CONFIG_SYS_USE_MMC | ||||||
| /* bootstrap + u-boot + env in sd card */ | /* override the bootcmd, bootargs and other configuration for sd/mmc env */ | ||||||
| #define CONFIG_ENV_IS_IN_FAT |  | ||||||
| #define FAT_ENV_INTERFACE	"mmc" |  | ||||||
| #define FAT_ENV_FILE		"uboot.env" |  | ||||||
| #define FAT_ENV_DEVICE_AND_PART	"0" |  | ||||||
| #define CONFIG_ENV_SIZE		0x4000 |  | ||||||
| #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 dtb; " \ |  | ||||||
| 				"fatload mmc 0:1 0x22000000 uImage; " \ |  | ||||||
| 				"bootm 0x22000000 - 0x21000000" |  | ||||||
| #else | #else | ||||||
| #define CONFIG_ENV_IS_NOWHERE | #define CONFIG_ENV_IS_NOWHERE | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -138,25 +138,9 @@ | |||||||
| 				"nand read 0x22000000 0x200000 0x600000;" \ | 				"nand read 0x22000000 0x200000 0x600000;" \ | ||||||
| 				"bootz 0x22000000 - 0x21000000" | 				"bootz 0x22000000 - 0x21000000" | ||||||
| #elif CONFIG_SYS_USE_MMC | #elif CONFIG_SYS_USE_MMC | ||||||
| /* bootstrap + u-boot + env in sd card */ | /* override the bootcmd, bootargs and other configuration for sd/mmc env */ | ||||||
| #define CONFIG_ENV_IS_IN_FAT |  | ||||||
| #define CONFIG_FAT_WRITE |  | ||||||
| #define FAT_ENV_INTERFACE	"mmc" |  | ||||||
| /* |  | ||||||
|  * We don't specify the part number, if device 0 has partition table, it means |  | ||||||
|  * the first partition; it no partition table, then take whole device as a |  | ||||||
|  * FAT file system. |  | ||||||
|  */ |  | ||||||
| #define FAT_ENV_DEVICE_AND_PART	"0" |  | ||||||
| #define FAT_ENV_FILE		"uboot.env" |  | ||||||
| #define CONFIG_ENV_SIZE		0x4000 |  | ||||||
| #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 at91-sama5d4_xplained.dtb; " \ |  | ||||||
| 				"fatload mmc 0:1 0x22000000 zImage; " \ |  | ||||||
| 				"bootz 0x22000000 - 0x21000000" |  | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| /* SPL */ | /* SPL */ | ||||||
| #define CONFIG_SPL_FRAMEWORK | #define CONFIG_SPL_FRAMEWORK | ||||||
| #define CONFIG_SPL_TEXT_BASE		0x200000 | #define CONFIG_SPL_TEXT_BASE		0x200000 | ||||||
|   | |||||||
| @@ -136,21 +136,7 @@ | |||||||
| 				"nand read 0x22000000 0x200000 0x600000;" \ | 				"nand read 0x22000000 0x200000 0x600000;" \ | ||||||
| 				"bootz 0x22000000 - 0x21000000" | 				"bootz 0x22000000 - 0x21000000" | ||||||
| #elif CONFIG_SYS_USE_MMC | #elif CONFIG_SYS_USE_MMC | ||||||
| /* bootstrap + u-boot + env in sd card */ | /* override the bootcmd, bootargs and other configuration for sd/mmc env */ | ||||||
| #define CONFIG_ENV_IS_IN_FAT |  | ||||||
| #define CONFIG_FAT_WRITE |  | ||||||
| #define FAT_ENV_INTERFACE	"mmc" |  | ||||||
| /* |  | ||||||
|  * We don't specify the part number, if device 0 has partition table, it means |  | ||||||
|  * the first partition; it no partition table, then take whole device as a |  | ||||||
|  * FAT file system. |  | ||||||
|  */ |  | ||||||
| #define FAT_ENV_DEVICE_AND_PART	"0" |  | ||||||
| #define FAT_ENV_FILE		"uboot.env" |  | ||||||
| #define CONFIG_ENV_SIZE		0x4000 |  | ||||||
| #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 sama5d4ek.dtb; " \ |  | ||||||
| 				"fatload mmc 0:1 0x22000000 zImage; " \ |  | ||||||
| 				"bootz 0x22000000 - 0x21000000" |  | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| /* SPL */ | /* SPL */ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user