dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-21 18:42:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

marvell: kirkwood: guruplug refresh for newer kernel

Browse Source 
Refresh for newer kernel.
Prepare ENV settings for sheevaplugs 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) :

    <INTERRUPT>
    Marvell>> nand erase.part root
    Marvell>> ubi part root
    Marvell>> ubi remove rootfs
    Marvell>> ubi create rootfs
    Marvell>> usb reset
    Marvell>> fatload usb 2:1 0x800000 guruplug/openwrt/openwrt-kirkwood-guruplug-rootfs.ubifs
    Marvell>> ubi write 0x800000 rootfs ${filesize}
    Marvell>> reset

Changes in v1:
- ADD generic board define
- ADD FDT support
- ADD HUSH interpreter
- Define new NAND partition mapping

Signed-off-by: Gerald Kerma <dreagle@doukki.net>
This commit is contained in:
Gerald Kerma
2014-12-19 08:13:09 +01:00
committed by Luka Perkov
parent d4d8f1b726
commit 361b3d8613
1 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
include/configs/guruplug.h
View File

@@ -1,5 +1,6 @@
/* /*
* (C) Copyright 2009 * (C) Copyright 2009-2014
* Gerald Kerma <dreagle@doukki.net>
* Marvell Semiconductor <www.marvell.com> * Marvell Semiconductor <www.marvell.com>
* Written-by: Siddarth Gore <gores@marvell.com> * Written-by: Siddarth Gore <gores@marvell.com>
* *
@@ -9,6 +10,8 @@
#ifndef _CONFIG_GURUPLUG_H #ifndef _CONFIG_GURUPLUG_H
#define _CONFIG_GURUPLUG_H #define _CONFIG_GURUPLUG_H
#define CONFIG_SYS_GENERIC_BOARD
/* /*
* Version number information * Version number information
*/ */
@@ -22,18 +25,37 @@
#define CONFIG_MACH_GURUPLUG /* Machine type */ #define CONFIG_MACH_GURUPLUG /* Machine type */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #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 * Commands configuration
*/ */
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_ENV #define CONFIG_CMD_ENV
#define CONFIG_CMD_FAT #define CONFIG_CMD_IDE
#define CONFIG_CMD_MII
#define CONFIG_CMD_NAND #define CONFIG_CMD_NAND
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_USB #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 * 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 * it has to be rounded to sector size
*/ */
#define CONFIG_ENV_SIZE 0x20000 /* 128k */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */
#define CONFIG_ENV_ADDR 0x60000 #define CONFIG_ENV_OFFSET 0xE0000 /* env starts here */
#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
/* /*
* Default environment variables * Default environment variables
*/ */
#define CONFIG_BOOTCOMMAND "setenv ethact egiga0; " \ #define CONFIG_BOOTCOMMAND \
"${x_bootcmd_ethernet}; setenv ethact egiga1; " \ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
"${x_bootcmd_ethernet}; ${x_bootcmd_usb}; ${x_bootcmd_kernel}; "\ "ubi part root; " \
"setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ "ubifsmount ubi:rootfs; " \
"bootm 0x6400000;" "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)," \
"-@1M(root)\0"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"x_bootcmd_ethernet=ping 192.168.2.1\0" \ "console=console=ttyS0,115200\0" \
"x_bootcmd_usb=usb start\0" \ "mtdids=nand0=orion_nand\0" \
"x_bootcmd_kernel=nand read.e 0x6400000 0x100000 0x400000\0" \ "mtdparts="CONFIG_MTDPARTS \
"x_bootargs=console=ttyS0,115200\0" \ "kernel=/boot/zImage\0" \
"x_bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\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 * Ethernet Driver configuration
@@ -89,6 +125,20 @@
#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
#endif /*CONFIG_MVSATA_IDE*/ #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 #define CONFIG_SYS_ALT_MEMTEST
#endif /* _CONFIG_GURUPLUG_H */ #endif /* _CONFIG_GURUPLUG_H */