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

   1 --- a/include/configs/dockstar.h
   2 +++ b/include/configs/dockstar.h
   3 @@ -18,6 +18,7 @@
   4  #define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
   5  #define CONFIG_KW88F6281       1       /* SOC Name */
   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 @@ -36,27 +37,22 @@
  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 +       "ubi part ubi; " \
  30 +       "ubi read 0x800000 kernel; " \
  31 +       "bootm 0x800000"
  32
  33  #define CONFIG_EXTRA_ENV_SETTINGS \
  34 -       "console=console=ttyS0,115200\0" \
  35 -       "mtdids=nand0=orion_nand\0" \
  36 -       "mtdparts="CONFIG_MTDPARTS_DEFAULT \
  37 -       "kernel=/boot/uImage\0" \
  38 -       "initrd=/boot/uInitrd\0" \
  39 -       "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
  40 +       "console=console=ttyS0,115200\0"        \
  41 +       "mtdids=nand0=orion_nand\0"             \
  42 +       "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
  43 +       "bootargs_root=\0"
  44
  45  /*
  46   * Ethernet Driver configuration
  47 --- a/configs/dockstar_defconfig
  48 +++ b/configs/dockstar_defconfig
  49 @@ -16,7 +16,7 @@ CONFIG_CMD_PING=y
  50  CONFIG_CMD_EXT2=y
  51  CONFIG_CMD_FAT=y
  52  CONFIG_CMD_JFFS2=y
  53 -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),-(root)"
  54 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
  55  CONFIG_CMD_UBI=y
  56  CONFIG_ISO_PARTITION=y
  57  CONFIG_ENV_IS_IN_NAND=y