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

   1 --- a/include/configs/dockstar.h
   2 +++ b/include/configs/dockstar.h
   3 @@ -17,6 +17,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 @@ -37,19 +38,15 @@
  12   */
  13  #define CONFIG_BOOTCOMMAND \
  14         "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
  15 -       "ubi part root; " \
  16 -       "ubifsmount ubi:root; " \
  17 -       "ubifsload 0x800000 ${kernel}; " \
  18 -       "ubifsload 0x1100000 ${initrd}; " \
  19 -       "bootm 0x800000 0x1100000"
  20 +       "ubi part ubi; " \
  21 +       "ubi read 0x800000 kernel; " \
  22 +       "bootm 0x800000"
  23
  24  #define CONFIG_EXTRA_ENV_SETTINGS \
  25 -       "console=console=ttyS0,115200\0" \
  26 -       "mtdids=nand0=orion_nand\0" \
  27 -       "mtdparts="CONFIG_MTDPARTS_DEFAULT \
  28 -       "kernel=/boot/uImage\0" \
  29 -       "initrd=/boot/uInitrd\0" \
  30 -       "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
  31 +       "console=console=ttyS0,115200\0"        \
  32 +       "mtdids=nand0=orion_nand\0"             \
  33 +       "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
  34 +       "bootargs_root=\0"
  35
  36  /*
  37   * Ethernet Driver configuration
  38 --- a/configs/dockstar_defconfig
  39 +++ b/configs/dockstar_defconfig
  40 @@ -5,7 +5,7 @@ CONFIG_KIRKWOOD=y
  41  CONFIG_SYS_TEXT_BASE=0x600000
  42  CONFIG_TARGET_DOCKSTAR=y
  43  CONFIG_ENV_SIZE=0x20000
  44 -CONFIG_ENV_OFFSET=0x80000
  45 +CONFIG_ENV_OFFSET=0xE0000
  46  CONFIG_NR_DRAM_BANKS=2
  47  CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar"
  48  CONFIG_BOOTDELAY=3
  49 @@ -23,7 +23,7 @@ CONFIG_CMD_EXT2=y
  50  CONFIG_CMD_FAT=y
  51  CONFIG_CMD_JFFS2=y
  52  CONFIG_CMD_MTDPARTS=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_OF_CONTROL=y