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

   1 --- a/include/configs/dockstar.h
   2 +++ b/include/configs/dockstar.h
   3 @@ -19,6 +19,7 @@
   4  #define CONFIG_KW88F6281       1       /* SOC Name */
   5  #define CONFIG_MACH_DOCKSTAR   /* Machine type */
   6  #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
   7 +#define CONFIG_SYS_MVFS
   8
   9  /*
  10   * mv-common.h should be defined after CMD configs since it used them
  11 @@ -37,29 +38,29 @@
  12   * it has to be rounded to sector size
  13   */
  14  #define CONFIG_ENV_SIZE                        0x20000 /* 128k */
  15 -#define CONFIG_ENV_ADDR                        0x80000
  16 -#define CONFIG_ENV_OFFSET              0x80000 /* env starts here */
  17 +#define CONFIG_ENV_OFFSET              0xe0000 /* env starts here */
  18
  19  /*
  20   * Default environment variables
  21   */
  22  #define CONFIG_BOOTCOMMAND \
  23         "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
  24 -       "ubi part root; " \
  25 -       "ubifsmount ubi:root; " \
  26 -       "ubifsload 0x800000 ${kernel}; " \
  27 -       "ubifsload 0x1100000 ${initrd}; " \
  28 -       "bootm 0x800000 0x1100000"
  29 -
  30 -#define CONFIG_MTDPARTS                "mtdparts=orion_nand:1m(uboot),-(root)\0"
  31 +       "ubi part ubi; " \
  32 +       "ubi read 0x800000 kernel; " \
  33 +       "bootm 0x800000"
  34 +
  35 +#define CONFIG_MTDPARTS \
  36 +       "mtdparts=orion_nand:"                          \
  37 +       "0xe0000@0x0(uboot),"                           \
  38 +       "0x20000@0xe0000(uboot_env),"                   \
  39 +       "0x100000@0x100000(second_stage_uboot),"        \
  40 +       "-@0x200000(ubi)\0"
  41
  42  #define CONFIG_EXTRA_ENV_SETTINGS \
  43 -       "console=console=ttyS0,115200\0" \
  44 -       "mtdids=nand0=orion_nand\0" \
  45 -       "mtdparts="CONFIG_MTDPARTS \
  46 -       "kernel=/boot/uImage\0" \
  47 -       "initrd=/boot/uInitrd\0" \
  48 -       "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
  49 +       "console=console=ttyS0,115200\0"        \
  50 +       "mtdids=nand0=orion_nand\0"             \
  51 +       "mtdparts="CONFIG_MTDPARTS              \
  52 +       "bootargs_root=\0"
  53
  54  /*
  55   * Ethernet Driver configuration