diff options
| author | Luka Perkov <luka@openwrt.org> | 2016-03-14 17:06:11 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2016-03-14 17:06:11 +0000 |
| commit | f533c86d12775616d2fa24d419a69cb0203b56d7 (patch) | |
| tree | 40724818a52bb37da49361ce057c09a730318b29 /package | |
| parent | e9e16bef083786d889d0ba0684e67be0215531c8 (diff) | |
| download | upstream-f533c86d12775616d2fa24d419a69cb0203b56d7.tar.gz upstream-f533c86d12775616d2fa24d419a69cb0203b56d7.tar.bz2 upstream-f533c86d12775616d2fa24d419a69cb0203b56d7.zip | |
uboot/kirkwood: correct mtdparts + cmdline for new ubifs on dockstar
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
SVN-Revision: 49012
Diffstat (limited to 'package')
| -rw-r--r-- | package/boot/uboot-kirkwood/patches/110-dockstar.patch | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/package/boot/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch index 4c9ccdfd93..469dfcdfe4 100644 --- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch +++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch @@ -32,7 +32,7 @@ #include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV -@@ -38,55 +43,58 @@ +@@ -38,55 +43,52 @@ #define CONFIG_CMD_NAND #define CONFIG_CMD_PING #define CONFIG_CMD_USB @@ -83,20 +83,16 @@ - "bootm 0x800000 0x1100000" - -#define CONFIG_MTDPARTS "mtdparts=orion_nand:1m(uboot),-(root)\0" -+ "ubi part root; " \ -+ "ubifsmount ubi:rootfs; " \ -+ "ubifsload 0x800000 ${kernel}; " \ -+ "ubifsload 0x700000 ${fdt}; " \ -+ "ubifsumount; " \ -+ "fdt addr 0x700000; fdt resize; fdt chosen; " \ -+ "bootz 0x800000 - 0x700000" ++ "ubi part ubi; " \ ++ "ubi read 0x800000 kernel; " \ ++ "bootz 0x800000" + +#define CONFIG_MTDPARTS \ + "mtdparts=orion_nand:" \ + "0xe0000@0x0(uboot)," \ + "0x20000@0xe0000(uboot_env)," \ + "0x100000@0x100000(second_stage_uboot)," \ -+ "-@0x200000(root)\0" ++ "-@0x200000(ubi)\0" #define CONFIG_EXTRA_ENV_SETTINGS \ - "console=console=ttyS0,115200\0" \ @@ -108,9 +104,7 @@ + "console=console=ttyS0,115200\0" \ + "mtdids=nand0=orion_nand\0" \ + "mtdparts="CONFIG_MTDPARTS \ -+ "kernel=/boot/zImage\0" \ -+ "fdt=/boot/dockstar.dtb\0" \ -+ "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0" ++ "bootargs_root=\0" /* - * Ethernet Driver configuration |