diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/at91sam9260ek.h | 18 | ||||
| -rw-r--r-- | include/configs/at91sam9261ek.h | 19 | ||||
| -rw-r--r-- | include/configs/at91sam9263ek.h | 17 | ||||
| -rw-r--r-- | include/configs/at91sam9m10g45ek.h | 16 | ||||
| -rw-r--r-- | include/configs/at91sam9x5ek.h | 11 | 
5 files changed, 41 insertions, 40 deletions
| diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 392a818de..ebcc69afa 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -215,16 +215,16 @@  /* bootstrap + u-boot + env + linux in nandflash */  #define CONFIG_ENV_IS_IN_NAND	1 -#define CONFIG_ENV_OFFSET		0x60000 -#define CONFIG_ENV_OFFSET_REDUND	0x80000 +#define CONFIG_ENV_OFFSET		0xc0000 +#define CONFIG_ENV_OFFSET_REDUND	0x100000  #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */ -#define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0xA0000 0x200000; bootm" -#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\ -				"root=/dev/mtdblock5 "			\ -				"mtdparts=atmel_nand:128k(bootstrap)ro,"	\ -				"256k(uboot)ro,128k(env1)ro,"		\ -				"128k(env2)ro,2M(linux),-(root) "	\ -				"rw rootfstype=jffs2" +#define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm" +#define CONFIG_BOOTARGS							\ +	"console=ttyS0,115200 earlyprintk "				\ +	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\ +	"256k(env),256k(env_redundant),256k(spare),"			\ +	"512k(dtb),6M(kernel)ro,-(rootfs) "				\ +	"root=/dev/mtdblock7 rw rootfstype=jffs2"  #endif diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 611e3e253..cabff9a9f 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -212,17 +212,16 @@  /* bootstrap + u-boot + env + linux in nandflash */  #define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET		0x60000 -#define CONFIG_ENV_OFFSET_REDUND	0x80000 +#define CONFIG_ENV_OFFSET		0xc0000 +#define CONFIG_ENV_OFFSET_REDUND	0x100000  #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */ -#define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0xA0000 0x200000; bootm" -#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\ -				"root=/dev/mtdblock5 "			\ -				"mtdparts=atmel_nand:128k(bootstrap)ro,"	\ -				"256k(uboot)ro,128k(env1)ro,"		\ -				"128k(env2)ro,2M(linux),-(root) "	\ -				"rw rootfstype=jffs2" - +#define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm" +#define CONFIG_BOOTARGS							\ +	"console=ttyS0,115200 earlyprintk "				\ +	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\ +	"256k(env),256k(env_redundant),256k(spare),"			\ +	"512k(dtb),6M(kernel)ro,-(rootfs) "				\ +	"root=/dev/mtdblock7 rw rootfstype=jffs2"  #endif  #define CONFIG_SYS_PROMPT		"U-Boot> " diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index da2a93111..1ab9c3048 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -327,15 +327,16 @@  /* bootstrap + u-boot + env + linux in nandflash */  #define CONFIG_ENV_IS_IN_NAND		1 -#define CONFIG_ENV_OFFSET		0x60000 -#define CONFIG_ENV_OFFSET_REDUND	0x80000 +#define CONFIG_ENV_OFFSET		0xc0000 +#define CONFIG_ENV_OFFSET_REDUND	0x100000  #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */ -#define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0xA0000 0x200000; bootm" -#define CONFIG_BOOTARGS		"console=ttyS0,115200 " \ -				"root=/dev/mtdblock5 " \ -				"mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \ -				"rw rootfstype=jffs2" - +#define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm" +#define CONFIG_BOOTARGS							\ +	"console=ttyS0,115200 earlyprintk "				\ +	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\ +	"256k(env),256k(env_redundant),256k(spare),"			\ +	"512k(dtb),6M(kernel)ro,-(rootfs) "				\ +	"root=/dev/mtdblock7 rw rootfstype=jffs2"  #endif  #define CONFIG_SYS_PROMPT		"U-Boot> " diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index f1a4db30c..07e1c9f89 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -150,19 +150,19 @@  /* bootstrap + u-boot + env in nandflash */  #define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET		0x60000 -#define CONFIG_ENV_OFFSET_REDUND	0x80000 +#define CONFIG_ENV_OFFSET		0xc0000 +#define CONFIG_ENV_OFFSET_REDUND	0x100000  #define CONFIG_ENV_SIZE			0x20000 -#define CONFIG_BOOTCOMMAND	"nand read 0x70000000 0x100000 0x200000;" \ +#define CONFIG_BOOTCOMMAND						\ +	"nand read 0x70000000 0x200000 0x300000;"			\  	"bootm 0x70000000"  #define CONFIG_BOOTARGS							\  	"console=ttyS0,115200 earlyprintk "				\ -	"root=/dev/mtdblock5 "						\ -	"mtdparts=atmel_nand:128k(bootstrap)ro,"			\ -	"256k(uboot)ro,128k(env1)ro,128k(env2)ro,"			\ -	"2M@1M(linux),-(root) "						\ -	"rw rootfstype=jffs2" +	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\ +	"256k(env),256k(env_redundant),256k(spare),"			\ +	"512k(dtb),6M(kernel)ro,-(rootfs) "				\ +	"root=/dev/mtdblock7 rw rootfstype=jffs2"  #define CONFIG_BAUDRATE			115200 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 1bc56a5b7..ee6e3fcde 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -232,11 +232,12 @@  				"root=/dev/mmcblk0p2 " \  				"rw rootfstype=ext4 rootwait"  #else -#define CONFIG_BOOTARGS		"mem=128M console=ttyS0,115200 " \ -				"mtdparts=atmel_nand:" \ -				"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \ -				"root=/dev/mtdblock1 rw " \ -				"rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs" +#define CONFIG_BOOTARGS							\ +	"console=ttyS0,115200 earlyprintk "				\ +	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\ +	"256k(env),256k(env_redundant),256k(spare),"			\ +	"512k(dtb),6M(kernel)ro,-(rootfs) "				\ +	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw"  #endif  #define CONFIG_BAUDRATE		115200 |