diff options
| author | Luka Perkov <luka@openwrt.org> | 2012-07-14 23:54:20 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2012-07-14 23:54:20 +0000 |
| commit | dc2d62d3ace206ae37928e62576729f7abc3f30c (patch) | |
| tree | b5006e541734af88db27e2ef9a7d7db57e7432ee /package/uboot-kirkwood/patches/110-dockstar.patch | |
| parent | 8f563df48f9e6baba81e4d440d136b27be84a400 (diff) | |
| download | upstream-dc2d62d3ace206ae37928e62576729f7abc3f30c.tar.gz upstream-dc2d62d3ace206ae37928e62576729f7abc3f30c.tar.bz2 upstream-dc2d62d3ace206ae37928e62576729f7abc3f30c.zip | |
uboot-kirkwood: update to 2012.04.01
iConnect board tested by:
Tim Fletcher <tim@night-shade.org.uk>
Wojciech Dubowik <wojciech.dubowik@neratec.com>
DockStar board tested by:
Martin Mueller <mm@sig21.net>
RaidSonic ICY BOX NAS6210 board tested by:
Luka Perkov <uboot@lukaperkov.net>
SheevaPlug was not tested but support for SheevaPlug is taken from upstream
uboot and it is not reported to be broken there.
SVN-Revision: 32717
Diffstat (limited to 'package/uboot-kirkwood/patches/110-dockstar.patch')
| -rw-r--r-- | package/uboot-kirkwood/patches/110-dockstar.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/package/uboot-kirkwood/patches/110-dockstar.patch b/package/uboot-kirkwood/patches/110-dockstar.patch new file mode 100644 index 0000000000..4ff7e57bbb --- /dev/null +++ b/package/uboot-kirkwood/patches/110-dockstar.patch @@ -0,0 +1,35 @@ +--- a/include/configs/dockstar.h ++++ b/include/configs/dockstar.h +@@ -83,22 +83,19 @@ + * Default environment variables + */ + #define CONFIG_BOOTCOMMAND \ +- "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ +- "ubi part root; " \ +- "ubifsmount root; " \ +- "ubifsload 0x800000 ${kernel}; " \ +- "ubifsload 0x1100000 ${initrd}; " \ +- "bootm 0x800000 0x1100000" ++ "${x_bootcmd_kernel}; " \ ++ "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ ++ "${x_bootcmd_usb}; bootm 0x6400000;" + +-#define CONFIG_MTDPARTS "mtdparts=orion_nand:1m(uboot),-(root)\0" ++#define CONFIG_MTDPARTS \ ++ "orion_nand:1M(u-boot),1M@1M(second_stage_u-boot)," \ ++ "3M@2M(kernel),32M@5M(rootfs),219M@37M(data) rw\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=1 root=ubi0:root rootfstype=ubifs ro\0" ++ "x_bootargs=console=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ ++ "x_bootcmd_kernel=nand read 0x6400000 0x200000 0x300000\0" \ ++ "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" \ ++ "x_bootcmd_usb=usb start\0" + + /* + * Ethernet Driver configuration |