> -----Original Message----- > From: Luka Perkov [mailto:l...@openwrt.org] > Sent: 31 October 2013 08:35 > To: u-boot@lists.denx.de > Cc: Luka Perkov; Prafulla Wadaskar > Subject: [PATCH] kirkwood: ib62x0: use device tree and > update config > > Signed-off-by: Luka Perkov <l...@openwrt.org> > CC: Prafulla Wadaskar <prafu...@marvell.com> > --- > v1->v2: > > * keep CONFIG_MACH_TYPE define for backwards > compatibility > --- > include/configs/ib62x0.h | 38 +++++++++++++++++++++++- > -------------- > 1 file changed, 23 insertions(+), 15 deletions(-) > > diff --git a/include/configs/ib62x0.h > b/include/configs/ib62x0.h > index 7fa0c53..186fd35 100644 > --- a/include/configs/ib62x0.h > +++ b/include/configs/ib62x0.h > @@ -28,6 +28,11 @@ > #define CONFIG_MACH_TYPE MACH_TYPE_NAS6210 > > /* > + * Enable device tree support > + */ > +#define CONFIG_OF_LIBFDT > + > +/* > * Compression configuration > */ > #define CONFIG_BZIP2 > @@ -41,6 +46,7 @@ > #define CONFIG_SYS_MVFS > #include <config_cmd_default.h> > #define CONFIG_CMD_ENV > +#define CONFIG_CMD_BOOTZ > #define CONFIG_CMD_IDE > #define CONFIG_CMD_MII > #define CONFIG_CMD_NAND > @@ -66,7 +72,7 @@ > #define CONFIG_ENV_IS_NOWHERE > #endif > #define CONFIG_ENV_SIZE 0x20000 > -#define CONFIG_ENV_OFFSET 0x80000 > +#define CONFIG_ENV_OFFSET 0xe0000 > > /* > * Default environment variables > @@ -74,24 +80,26 @@ > #define CONFIG_BOOTCOMMAND \ > "setenv bootargs ${console} ${mtdparts} > ${bootargs_root}; " \ > "ubi part root; " \ > - "ubifsmount ubi:root; " \ > + "ubifsmount ubi:rootfs; " \ > "ubifsload 0x800000 ${kernel}; " \ > - "ubifsload 0x1100000 ${initrd}; " \ > - "bootm 0x800000 0x1100000" > - > -#define CONFIG_MTDPARTS \ > - "mtdparts=orion_nand:" \ > - "0x80000@0x0(uboot)," \ > - "0x20000@0x80000(uboot_env)," \ > - "-@0xa0000(root)\0" > - > -#define CONFIG_EXTRA_ENV_SETTINGS \ > + "ubifsload 0x700000 ${fdt}; " \ > + "ubifsumount; " \ > + "fdt addr 0x700000; fdt resize; fdt chosen; " > \ > + "bootz 0x800000 - 0x700000" > + > +#define CONFIG_MTDPARTS \ > + "mtdparts=orion_nand:" \ > + "0xe0000@0x0(uboot)," \ > + "0x20000@0xe0000(uboot_env)," \ > + "-@0x100000(root)\0" > + > +#define CONFIG_EXTRA_ENV_SETTINGS \ > "console=console=ttyS0,115200\0" \ > "mtdids=nand0=orion_nand\0" \ > "mtdparts="CONFIG_MTDPARTS \ > - "kernel=/boot/uImage\0" \ > - "initrd=/boot/uInitrd\0" \ > - "bootargs_root=ubi.mtd=2 root=ubi0:root > rootfstype=ubifs\0" > + "kernel=/boot/zImage\0" \ > + "fdt=/boot/ib62x0.dtb\0" \ > + "bootargs_root=ubi.mtd=2 root=ubi0:rootfs > rootfstype=ubifs rw\0" > > /* > * Ethernet driver configuration > --
Acked-By: Prafulla Wadaskar <prafu...@marvell.com> Regards... Prafulla . . . _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
