diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-12 17:27:44 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-12 17:27:44 +0100 |
| commit | 1acba3345c6f707195d8f1cbac834436445279b3 (patch) | |
| tree | 87bfb4c157d998f88fee99e196a6f36a6b483903 /include/configs/at91sam9x5ek.h | |
| parent | 76b40ab41eff1f402ee52ba768b09daad293b9bb (diff) | |
| parent | 08f0533a147ca37546a6539b43fce3916e82811a (diff) | |
| download | talos-obmc-uboot-1acba3345c6f707195d8f1cbac834436445279b3.tar.gz talos-obmc-uboot-1acba3345c6f707195d8f1cbac834436445279b3.zip | |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/at91sam9x5ek.h')
| -rw-r--r-- | include/configs/at91sam9x5ek.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 6fac5ac4eb..ee6e3fcdec 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -42,6 +42,7 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DISPLAY_CPUINFO +#define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT /* general purpose I/O */ @@ -231,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 |
