From mboxrd@z Thu Jan 1 00:00:00 1970 From: drEagle Date: Sat, 03 Jan 2015 17:07:17 +0100 Subject: [U-Boot] [PATCH v2 1/1] marvell: kirkwood: guruplug refresh for newer kernel In-Reply-To: <54996866.3080409@doukki.net> References: <1418973189-17432-1-git-send-email-dreagle@doukki.net> <1418973657-17638-1-git-send-email-dreagle@doukki.net> <54996866.3080409@doukki.net> Message-ID: <54A813B5.8000008@doukki.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Prafulla, Any news of this patch ? Regards, G?rald Le 23/12/2014 14:04, drEagle a ?crit : > Hi Prafulla, > > Is it okay also for this patch which is a GuruPlug refresh for same config as the SheevaPlug one. > > Regards, > G?rald > > Le 19/12/2014 08:20, Gerald Kerma a ?crit : >> Refresh for newer kernel. >> Prepare ENV settings for guruplugs to be OpenWRT ready. >> >> +----------+ >> | UBOOT | >> 896 Kb (7x128) = uboot >> +----------+ >> | ENV | >> 128 Kb = uboot_env >> +----------+ >> | ROOT(FS) | >> 511 Mb @ 1 Mb = root -> rootfs (ubifs) >> +----------+ >> >> With (CC) TRUNK OpenWRT build (QUICK HOWTO) : >> >> >> Marvell>> nand erase.part root >> Marvell>> ubi part root >> Marvell>> ubi remove rootfs >> Marvell>> ubi create rootfs >> Marvell>> usb start >> Marvell>> fatload usb 2:1 0x800000 guruplug/openwrt/openwrt-kirkwood-guruplugserverplus-rootfs.ubifs >> Marvell>> ubi write 0x800000 rootfs ${filesize} >> Marvell>> reset >> >> Changes in v2: >> - Fix commit comments >> >> Changes in v1: >> - ADD generic board define >> - ADD FDT support >> - ADD HUSH interpreter >> - Define new NAND partition mapping >> >> Signed-off-by: Gerald Kerma >> --- >> include/configs/guruplug.h | 84 ++++++++++++++++++++++++++++++++++++---------- >> 1 file changed, 67 insertions(+), 17 deletions(-) >> >> diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h >> index a56a4cb..8e53af8 100644 >> --- a/include/configs/guruplug.h >> +++ b/include/configs/guruplug.h >> @@ -1,5 +1,6 @@ >> /* >> - * (C) Copyright 2009 >> + * (C) Copyright 2009-2014 >> + * Gerald Kerma >> * Marvell Semiconductor >> * Written-by: Siddarth Gore >> * >> @@ -9,6 +10,8 @@ >> #ifndef _CONFIG_GURUPLUG_H >> #define _CONFIG_GURUPLUG_H >> >> +#define CONFIG_SYS_GENERIC_BOARD >> + >> /* >> * Version number information >> */ >> @@ -23,17 +26,36 @@ >> #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ >> >> /* >> + * Compression configuration >> + */ >> +#define CONFIG_BZIP2 >> +#define CONFIG_LZMA >> +#define CONFIG_LZO >> + >> +/* >> + * Enable device tree support >> + */ >> +#define CONFIG_OF_LIBFDT >> + >> +/* >> + * Miscellaneous configurable options >> + */ >> +#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ >> + >> +/* >> * Commands configuration >> */ >> #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ >> #include >> +#define CONFIG_CMD_BOOTZ >> #define CONFIG_CMD_DHCP >> #define CONFIG_CMD_ENV >> -#define CONFIG_CMD_FAT >> +#define CONFIG_CMD_IDE >> +#define CONFIG_CMD_MII >> #define CONFIG_CMD_NAND >> #define CONFIG_CMD_PING >> #define CONFIG_CMD_USB >> -#define CONFIG_CMD_IDE >> +#define CONFIG_CMD_FAT >> >> /* >> * mv-common.h should be defined after CMD configs since it used them >> @@ -55,24 +77,38 @@ >> * it has to be rounded to sector size >> */ >> #define CONFIG_ENV_SIZE 0x20000 /* 128k */ >> -#define CONFIG_ENV_ADDR 0x60000 >> -#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ >> +#define CONFIG_ENV_OFFSET 0xE0000 /* env starts here */ >> >> /* >> * Default environment variables >> */ >> -#define CONFIG_BOOTCOMMAND "setenv ethact egiga0; " \ >> - "${x_bootcmd_ethernet}; setenv ethact egiga1; " \ >> - "${x_bootcmd_ethernet}; ${x_bootcmd_usb}; ${x_bootcmd_kernel}; "\ >> - "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ >> - "bootm 0x6400000;" >> - >> -#define CONFIG_EXTRA_ENV_SETTINGS \ >> - "x_bootcmd_ethernet=ping 192.168.2.1\0" \ >> - "x_bootcmd_usb=usb start\0" \ >> - "x_bootcmd_kernel=nand read.e 0x6400000 0x100000 0x400000\0" \ >> - "x_bootargs=console=ttyS0,115200\0" \ >> - "x_bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0" >> +#define CONFIG_BOOTCOMMAND \ >> + "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ >> + "ubi part root; " \ >> + "ubifsmount ubi:rootfs; " \ >> + "ubifsload 0x800000 ${kernel}; " \ >> + "ubifsload 0x700000 ${fdt}; " \ >> + "ubifsumount; " \ >> + "fdt addr 0x700000; fdt resize; fdt chosen; " \ >> + "bootz 0x800000 - 0x700000" >> + >> +#define CONFIG_MTDPARTS \ >> + "mtdparts=orion_nand:" \ >> + "896K(uboot),128K(uboot_env)," \ >> + "- at 1M(root)\0" >> + >> +#define CONFIG_EXTRA_ENV_SETTINGS \ >> + "console=console=ttyS0,115200\0" \ >> + "mtdids=nand0=orion_nand\0" \ >> + "mtdparts="CONFIG_MTDPARTS \ >> + "kernel=/boot/zImage\0" \ >> + "fdt=/boot/guruplug-server-plus.dtb\0" \ >> + "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0" >> + >> +#define MTDIDS_DEFAULT "nand0=orion_nand" >> + >> +#define MTDPARTS_DEFAULT \ >> + "mtdparts="CONFIG_MTDPARTS >> >> /* >> * Ethernet Driver configuration >> @@ -89,6 +125,20 @@ >> #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET >> #endif /*CONFIG_MVSATA_IDE*/ >> >> +/* >> + * File system >> + */ >> +#define CONFIG_CMD_EXT2 >> +#define CONFIG_CMD_EXT4 >> +#define CONFIG_CMD_FAT >> +#define CONFIG_CMD_JFFS2 >> +#define CONFIG_CMD_UBI >> +#define CONFIG_CMD_UBIFS >> +#define CONFIG_RBTREE >> +#define CONFIG_MTD_DEVICE >> +#define CONFIG_MTD_PARTITIONS >> +#define CONFIG_CMD_MTDPARTS >> + >> #define CONFIG_SYS_ALT_MEMTEST >> >> #endif /* _CONFIG_GURUPLUG_H */ >> > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot >