package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch

   1 --- a/include/configs/pogo_e02.h
   2 +++ b/include/configs/pogo_e02.h
   3 @@ -63,23 +63,35 @@
   4  #endif
   5
   6  #define CONFIG_ENV_SIZE                        0x20000 /* 128k */
   7 -#define CONFIG_ENV_OFFSET              0x60000 /* env starts here */
   8 +#define CONFIG_ENV_OFFSET              0xe0000 /* env starts here */
   9
  10  /*
  11   * Default environment variables
  12   */
  13  #define CONFIG_BOOTCOMMAND \
  14 -       "setenv bootargs $(bootargs_console); " \
  15 -       "run bootcmd_usb; " \
  16 -       "bootm 0x00800000 0x01100000"
  17 +       "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
  18 +       "ubi part root; " \
  19 +       "ubifsmount ubi:rootfs; " \
  20 +       "ubifsload 0x800000 ${kernel}; " \
  21 +       "ubifsload 0x700000 ${fdt}; " \
  22 +       "ubifsumount; " \
  23 +       "fdt addr 0x700000; fdt resize; fdt chosen; " \
  24 +       "bootz 0x800000 - 0x700000"
  25 +
  26 +#define CONFIG_MTDPARTS \
  27 +       "mtdparts=orion_nand:" \
  28 +       "0xe0000@0x0(uboot)," \
  29 +       "0x20000@0xe0000(uboot_env)," \
  30 +       "0x100000@0x100000(second_stage_uboot)," \
  31 +       "-@0x200000(root)\0"
  32
  33  #define CONFIG_EXTRA_ENV_SETTINGS \
  34 -       "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
  35 -       "32M(rootfs),-(data)\0"\
  36 -       "mtdids=nand0=orion_nand\0"\
  37 -       "bootargs_console=console=ttyS0,115200\0" \
  38 -       "bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \
  39 -       "ext2load usb 0:1 0x01100000 /uInitrd\0"
  40 +       "console=console=ttyS0,115200\0"        \
  41 +       "mtdids=nand0=orion_nand\0"             \
  42 +       "mtdparts="CONFIG_MTDPARTS              \
  43 +       "kernel=/boot/zImage\0"                 \
  44 +       "fdt=/boot/pogo_e02.dtb\0"              \
  45 +       "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
  46
  47  /*
  48   * Ethernet Driver configuration