package/boot/uboot-kirkwood/patches/110-dockstar.patch

   1 --- a/include/configs/dockstar.h
   2 +++ b/include/configs/dockstar.h
   3 @@ -83,22 +83,19 @@
   4   * Default environment variables
   5   */
   6  #define CONFIG_BOOTCOMMAND \
   7 -       "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
   8 -       "ubi part root; " \
   9 -       "ubifsmount root; " \
  10 -       "ubifsload 0x800000 ${kernel}; " \
  11 -       "ubifsload 0x1100000 ${initrd}; " \
  12 -       "bootm 0x800000 0x1100000"
  13 +       "${x_bootcmd_kernel}; "                                 \
  14 +       "setenv bootargs ${x_bootargs} ${x_bootargs_root}; "    \
  15 +       "${x_bootcmd_usb}; bootm 0x6400000;"
  16
  17 -#define CONFIG_MTDPARTS                "mtdparts=orion_nand:1m(uboot),-(root)\0"
  18 +#define CONFIG_MTDPARTS \
  19 +       "orion_nand:1M(u-boot),1M@1M(second_stage_u-boot),"     \
  20 +       "3M@2M(kernel),32M@5M(rootfs),219M@37M(data) rw\0"
  21
  22  #define CONFIG_EXTRA_ENV_SETTINGS \
  23 -       "console=console=ttyS0,115200\0" \
  24 -       "mtdids=nand0=orion_nand\0" \
  25 -       "mtdparts="CONFIG_MTDPARTS \
  26 -       "kernel=/boot/uImage\0" \
  27 -       "initrd=/boot/uInitrd\0" \
  28 -       "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
  29 +       "x_bootargs=console=ttyS0,115200 mtdparts="CONFIG_MTDPARTS      \
  30 +       "x_bootcmd_kernel=nand read 0x6400000 0x200000 0x300000\0"      \
  31 +       "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"     \
  32 +       "x_bootcmd_usb=usb start\0"
  33
  34  /*
  35   * Ethernet Driver configuration