powerpc/85xx: add support for env in MMC/SPI on corenet ds boards
Signed-off-by: Shaohui Xie <b21989@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
		
							parent
							
								
									2dd3095d87
								
							
						
					
					
						commit
						be827c7ab0
					
				|  | @ -36,7 +36,9 @@ COBJS-$(CONFIG_FSL_NGPIXIS)	+= ngpixis.o | ||||||
| COBJS-$(CONFIG_PQ_MDS_PIB)	+= pq-mds-pib.o | COBJS-$(CONFIG_PQ_MDS_PIB)	+= pq-mds-pib.o | ||||||
| COBJS-$(CONFIG_ID_EEPROM)	+= sys_eeprom.o | COBJS-$(CONFIG_ID_EEPROM)	+= sys_eeprom.o | ||||||
| COBJS-$(CONFIG_FSL_SGMII_RISER)	+= sgmii_riser.o | COBJS-$(CONFIG_FSL_SGMII_RISER)	+= sgmii_riser.o | ||||||
|  | ifndef CONFIG_RAMBOOT_PBL | ||||||
| COBJS-$(CONFIG_ENV_IS_IN_MMC)	+= sdhc_boot.o | COBJS-$(CONFIG_ENV_IS_IN_MMC)	+= sdhc_boot.o | ||||||
|  | endif | ||||||
| 
 | 
 | ||||||
| COBJS-$(CONFIG_MPC8541CDS)	+= cds_pci_ft.o | COBJS-$(CONFIG_MPC8541CDS)	+= cds_pci_ft.o | ||||||
| COBJS-$(CONFIG_MPC8548CDS)	+= cds_pci_ft.o | COBJS-$(CONFIG_MPC8548CDS)	+= cds_pci_ft.o | ||||||
|  |  | ||||||
|  | @ -572,9 +572,14 @@ P2020RDB_NAND                powerpc     mpc85xx     p1_p2_rdb           freesca | ||||||
| P2020RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,SDCARD | P2020RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,SDCARD | ||||||
| P2020RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,SPIFLASH | P2020RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,SPIFLASH | ||||||
| P3041DS                      powerpc     mpc85xx     corenet_ds          freescale | P3041DS                      powerpc     mpc85xx     corenet_ds          freescale | ||||||
|  | P3041DS_SDCARD		     powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000 | ||||||
|  | P3041DS_SPIFLASH	     powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000 | ||||||
| P4080DS                      powerpc     mpc85xx     corenet_ds          freescale | P4080DS                      powerpc     mpc85xx     corenet_ds          freescale | ||||||
| P4080DS_RAMBOOT_PBL          powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF80000 | P4080DS_SDCARD		     powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000 | ||||||
|  | P4080DS_SPIFLASH	     powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000 | ||||||
| P5020DS                      powerpc     mpc85xx     corenet_ds          freescale | P5020DS                      powerpc     mpc85xx     corenet_ds          freescale | ||||||
|  | P5020DS_SDCARD		     powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000 | ||||||
|  | P5020DS_SPIFLASH	     powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000 | ||||||
| mpq101                       powerpc     mpc85xx     mpq101              mercury        -           mpq101 | mpq101                       powerpc     mpc85xx     mpq101              mercury        -           mpq101 | ||||||
| stxgp3                       powerpc     mpc85xx     stxgp3              stx | stxgp3                       powerpc     mpc85xx     stxgp3              stx | ||||||
| stxssa                       powerpc     mpc85xx     stxssa              stx            -           stxssa | stxssa                       powerpc     mpc85xx     stxssa              stx            -           stxssa | ||||||
|  |  | ||||||
|  | @ -68,17 +68,34 @@ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_ENV_OVERWRITE | #define CONFIG_ENV_OVERWRITE | ||||||
| 
 | 
 | ||||||
| #if defined(CONFIG_RAMBOOT_PBL) |  | ||||||
| 	#define CONFIG_SYS_NO_FLASH	/* Store ENV in memory only */ |  | ||||||
| #endif |  | ||||||
| 
 |  | ||||||
| #ifdef CONFIG_SYS_NO_FLASH | #ifdef CONFIG_SYS_NO_FLASH | ||||||
| #define CONFIG_ENV_IS_NOWHERE | #define CONFIG_ENV_IS_NOWHERE | ||||||
| #else | #else | ||||||
| #define CONFIG_ENV_IS_IN_FLASH |  | ||||||
| #define CONFIG_FLASH_CFI_DRIVER | #define CONFIG_FLASH_CFI_DRIVER | ||||||
| #define CONFIG_SYS_FLASH_CFI | #define CONFIG_SYS_FLASH_CFI | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
|  | #if defined(CONFIG_SPIFLASH) | ||||||
|  | #define CONFIG_SYS_EXTRA_ENV_RELOC | ||||||
|  | #define CONFIG_ENV_IS_IN_SPI_FLASH | ||||||
|  | #define CONFIG_ENV_SPI_BUS              0 | ||||||
|  | #define CONFIG_ENV_SPI_CS               0 | ||||||
|  | #define CONFIG_ENV_SPI_MAX_HZ           10000000 | ||||||
|  | #define CONFIG_ENV_SPI_MODE             0 | ||||||
|  | #define CONFIG_ENV_SIZE                 0x2000          /* 8KB */ | ||||||
|  | #define CONFIG_ENV_OFFSET               0x100000        /* 1MB */ | ||||||
|  | #define CONFIG_ENV_SECT_SIZE            0x10000 | ||||||
|  | #elif defined(CONFIG_SDCARD) | ||||||
|  | #define CONFIG_SYS_EXTRA_ENV_RELOC | ||||||
|  | #define CONFIG_ENV_IS_IN_MMC | ||||||
|  | #define CONFIG_SYS_MMC_ENV_DEV          0 | ||||||
|  | #define CONFIG_ENV_SIZE			0x2000 | ||||||
|  | #define CONFIG_ENV_OFFSET		(512 * 1097) | ||||||
|  | #else | ||||||
|  | #define CONFIG_ENV_IS_IN_FLASH | ||||||
| #define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) | #define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) | ||||||
|  | #define CONFIG_ENV_SIZE		0x2000 | ||||||
|  | #define CONFIG_ENV_SECT_SIZE	0x20000 /* 128K (one sector) */ | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_CLK_FREQ	get_board_sys_clk() /* sysclk for MPC85xx */ | #define CONFIG_SYS_CLK_FREQ	get_board_sys_clk() /* sysclk for MPC85xx */ | ||||||
|  | @ -513,9 +530,6 @@ | ||||||
| /*
 | /*
 | ||||||
|  * Environment |  * Environment | ||||||
|  */ |  */ | ||||||
| #define CONFIG_ENV_SIZE		0x2000 |  | ||||||
| #define CONFIG_ENV_SECT_SIZE	0x20000 /* 128K (one sector) */ |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADS_ECHO		/* echo on for serial download */ | #define CONFIG_LOADS_ECHO		/* echo on for serial download */ | ||||||
| #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */ | #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue