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

   1 --- a/include/configs/pogo_e02.h
   2 +++ b/include/configs/pogo_e02.h
   3 @@ -54,23 +54,30 @@
   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 ubi; "                                                \
  19 +       "ubifsmount ubi:rootfs; "                                       \
  20 +       "ubi read 0x800000 kernel; "                                    \
  21 +       "bootm 0x800000"
  22 +
  23 +#define CONFIG_MTDPARTS \
  24 +       "mtdparts=orion_nand:" \
  25 +       "0xe0000@0x0(uboot)," \
  26 +       "0x20000@0xe0000(uboot_env)," \
  27 +       "0x100000@0x100000(second_stage_uboot)," \
  28 +       "-@0x200000(ubi)\0"
  29
  30  #define CONFIG_EXTRA_ENV_SETTINGS \
  31 -       "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
  32 -       "32M(rootfs),-(data)\0"\
  33 -       "mtdids=nand0=orion_nand\0"\
  34 -       "bootargs_console=console=ttyS0,115200\0" \
  35 -       "bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \
  36 -       "ext2load usb 0:1 0x01100000 /uInitrd\0"
  37 +       "console=console=ttyS0,115200\0"        \
  38 +       "mtdids=nand0=orion_nand\0"             \
  39 +       "mtdparts="CONFIG_MTDPARTS              \
  40 +       "bootargs_root=\0"
  41
  42  /*
  43   * Ethernet Driver configuration