ARM: at91: change nand flash table
Change nand flash partition table according to www.at91.com/linux4sam more information: http://www.at91.com/linux4sam/bin/view/Linux4SAM/GettingStarted#Linux4SAM_NandFlash_demo_Memory Signed-off-by: Bo Shen <voice.shen@atmel.com> [minor commit message changes] Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
This commit is contained in:
		
							parent
							
								
									f9129fe338
								
							
						
					
					
						commit
						0c58cfa9dd
					
				|  | @ -215,16 +215,16 @@ | ||||||
| 
 | 
 | ||||||
| /* bootstrap + u-boot + env + linux in nandflash */ | /* bootstrap + u-boot + env + linux in nandflash */ | ||||||
| #define CONFIG_ENV_IS_IN_NAND	1 | #define CONFIG_ENV_IS_IN_NAND	1 | ||||||
| #define CONFIG_ENV_OFFSET		0x60000 | #define CONFIG_ENV_OFFSET		0xc0000 | ||||||
| #define CONFIG_ENV_OFFSET_REDUND	0x80000 | #define CONFIG_ENV_OFFSET_REDUND	0x100000 | ||||||
| #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */ | #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */ | ||||||
| #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0xA0000 0x200000; bootm" | #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm" | ||||||
| #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\ | #define CONFIG_BOOTARGS							\ | ||||||
| 				"root=/dev/mtdblock5 "			\ | 	"console=ttyS0,115200 earlyprintk "				\ | ||||||
| 				"mtdparts=atmel_nand:128k(bootstrap)ro,"	\ | 	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\ | ||||||
| 				"256k(uboot)ro,128k(env1)ro,"		\ | 	"256k(env),256k(env_redundant),256k(spare),"			\ | ||||||
| 				"128k(env2)ro,2M(linux),-(root) "	\ | 	"512k(dtb),6M(kernel)ro,-(rootfs) "				\ | ||||||
| 				"rw rootfstype=jffs2" | 	"root=/dev/mtdblock7 rw rootfstype=jffs2" | ||||||
| 
 | 
 | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -212,17 +212,16 @@ | ||||||
| 
 | 
 | ||||||
| /* bootstrap + u-boot + env + linux in nandflash */ | /* bootstrap + u-boot + env + linux in nandflash */ | ||||||
| #define CONFIG_ENV_IS_IN_NAND | #define CONFIG_ENV_IS_IN_NAND | ||||||
| #define CONFIG_ENV_OFFSET		0x60000 | #define CONFIG_ENV_OFFSET		0xc0000 | ||||||
| #define CONFIG_ENV_OFFSET_REDUND	0x80000 | #define CONFIG_ENV_OFFSET_REDUND	0x100000 | ||||||
| #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */ | #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */ | ||||||
| #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0xA0000 0x200000; bootm" | #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm" | ||||||
| #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\ | #define CONFIG_BOOTARGS							\ | ||||||
| 				"root=/dev/mtdblock5 "			\ | 	"console=ttyS0,115200 earlyprintk "				\ | ||||||
| 				"mtdparts=atmel_nand:128k(bootstrap)ro,"	\ | 	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\ | ||||||
| 				"256k(uboot)ro,128k(env1)ro,"		\ | 	"256k(env),256k(env_redundant),256k(spare),"			\ | ||||||
| 				"128k(env2)ro,2M(linux),-(root) "	\ | 	"512k(dtb),6M(kernel)ro,-(rootfs) "				\ | ||||||
| 				"rw rootfstype=jffs2" | 	"root=/dev/mtdblock7 rw rootfstype=jffs2" | ||||||
| 
 |  | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_PROMPT		"U-Boot> " | #define CONFIG_SYS_PROMPT		"U-Boot> " | ||||||
|  |  | ||||||
|  | @ -327,15 +327,16 @@ | ||||||
| 
 | 
 | ||||||
| /* bootstrap + u-boot + env + linux in nandflash */ | /* bootstrap + u-boot + env + linux in nandflash */ | ||||||
| #define CONFIG_ENV_IS_IN_NAND		1 | #define CONFIG_ENV_IS_IN_NAND		1 | ||||||
| #define CONFIG_ENV_OFFSET		0x60000 | #define CONFIG_ENV_OFFSET		0xc0000 | ||||||
| #define CONFIG_ENV_OFFSET_REDUND	0x80000 | #define CONFIG_ENV_OFFSET_REDUND	0x100000 | ||||||
| #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */ | #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */ | ||||||
| #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0xA0000 0x200000; bootm" | #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm" | ||||||
| #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \ | #define CONFIG_BOOTARGS							\ | ||||||
| 				"root=/dev/mtdblock5 " \ | 	"console=ttyS0,115200 earlyprintk "				\ | ||||||
| 				"mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \ | 	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\ | ||||||
| 				"rw rootfstype=jffs2" | 	"256k(env),256k(env_redundant),256k(spare),"			\ | ||||||
| 
 | 	"512k(dtb),6M(kernel)ro,-(rootfs) "				\ | ||||||
|  | 	"root=/dev/mtdblock7 rw rootfstype=jffs2" | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_PROMPT		"U-Boot> " | #define CONFIG_SYS_PROMPT		"U-Boot> " | ||||||
|  |  | ||||||
|  | @ -150,19 +150,19 @@ | ||||||
| 
 | 
 | ||||||
| /* bootstrap + u-boot + env in nandflash */ | /* bootstrap + u-boot + env in nandflash */ | ||||||
| #define CONFIG_ENV_IS_IN_NAND | #define CONFIG_ENV_IS_IN_NAND | ||||||
| #define CONFIG_ENV_OFFSET		0x60000 | #define CONFIG_ENV_OFFSET		0xc0000 | ||||||
| #define CONFIG_ENV_OFFSET_REDUND	0x80000 | #define CONFIG_ENV_OFFSET_REDUND	0x100000 | ||||||
| #define CONFIG_ENV_SIZE			0x20000 | #define CONFIG_ENV_SIZE			0x20000 | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTCOMMAND	"nand read 0x70000000 0x100000 0x200000;" \ | #define CONFIG_BOOTCOMMAND						\ | ||||||
|  | 	"nand read 0x70000000 0x200000 0x300000;"			\ | ||||||
| 	"bootm 0x70000000" | 	"bootm 0x70000000" | ||||||
| #define CONFIG_BOOTARGS							\ | #define CONFIG_BOOTARGS							\ | ||||||
| 	"console=ttyS0,115200 earlyprintk "				\ | 	"console=ttyS0,115200 earlyprintk "				\ | ||||||
| 	"root=/dev/mtdblock5 "						\ | 	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\ | ||||||
| 	"mtdparts=atmel_nand:128k(bootstrap)ro,"			\ | 	"256k(env),256k(env_redundant),256k(spare),"			\ | ||||||
| 	"256k(uboot)ro,128k(env1)ro,128k(env2)ro,"			\ | 	"512k(dtb),6M(kernel)ro,-(rootfs) "				\ | ||||||
| 	"2M@1M(linux),-(root) "						\ | 	"root=/dev/mtdblock7 rw rootfstype=jffs2" | ||||||
| 	"rw rootfstype=jffs2" |  | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BAUDRATE			115200 | #define CONFIG_BAUDRATE			115200 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -232,11 +232,12 @@ | ||||||
| 				"root=/dev/mmcblk0p2 " \ | 				"root=/dev/mmcblk0p2 " \ | ||||||
| 				"rw rootfstype=ext4 rootwait" | 				"rw rootfstype=ext4 rootwait" | ||||||
| #else | #else | ||||||
| #define CONFIG_BOOTARGS		"mem=128M console=ttyS0,115200 " \ | #define CONFIG_BOOTARGS							\ | ||||||
| 				"mtdparts=atmel_nand:" \ | 	"console=ttyS0,115200 earlyprintk "				\ | ||||||
| 				"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \ | 	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\ | ||||||
| 				"root=/dev/mtdblock1 rw " \ | 	"256k(env),256k(env_redundant),256k(spare),"			\ | ||||||
| 				"rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs" | 	"512k(dtb),6M(kernel)ro,-(rootfs) "				\ | ||||||
|  | 	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw" | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BAUDRATE		115200 | #define CONFIG_BAUDRATE		115200 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue