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

   1 --- a/include/configs/dockstar.h
   2 +++ b/include/configs/dockstar.h
   3 @@ -15,21 +15,26 @@
   4  /*
   5   * Version number information
   6   */
   7 -#define CONFIG_IDENT_STRING    "\nSeagate FreeAgent DockStar"
   8 +#define CONFIG_IDENT_STRING    " Seagate FreeAgent DockStar"
   9
  10  /*
  11 - * High Level Configuration Options (easy to change)
  12 + * High level configuration options
  13   */
  14 -#define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
  15 -#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
  16 -#define CONFIG_KW88F6281       1       /* SOC Name */
  17 -#define CONFIG_MACH_DOCKSTAR   /* Machine type */
  18 +#define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
  19 +#define CONFIG_KIRKWOOD                        /* SOC Family Name */
  20 +#define CONFIG_KW88F6281               /* SOC Name */
  21  #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
  22
  23  /*
  24 + * Machine type
  25 + */
  26 +#define CONFIG_MACH_DOCKSTAR
  27 +
  28 +/*
  29   * Commands configuration
  30   */
  31 -#define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
  32 +#define CONFIG_SYS_NO_FLASH            /* declare no flash (NOR/SPI) */
  33 +#define CONFIG_SYS_MVFS
  34  #include <config_cmd_default.h>
  35  #define CONFIG_CMD_DHCP
  36  #define CONFIG_CMD_ENV
  37 @@ -37,55 +42,58 @@
  38  #define CONFIG_CMD_NAND
  39  #define CONFIG_CMD_PING
  40  #define CONFIG_CMD_USB
  41 +
  42  /*
  43   * mv-common.h should be defined after CMD configs since it used them
  44   * to enable certain macros
  45   */
  46  #include "mv-common.h"
  47
  48 -#undef CONFIG_SYS_PROMPT       /* previously defined in mv-common.h */
  49 -#define CONFIG_SYS_PROMPT      "DockStar> "    /* Command Prompt */
  50 +#undef CONFIG_SYS_PROMPT
  51 +#define CONFIG_SYS_PROMPT      "dockstar => "
  52
  53  /*
  54 - *  Environment variables configurations
  55 + * Environment variables configuration
  56   */
  57  #ifdef CONFIG_CMD_NAND
  58 -#define CONFIG_ENV_IS_IN_NAND          1
  59 -#define CONFIG_ENV_SECT_SIZE           0x20000 /* 128K */
  60 +#define CONFIG_ENV_IS_IN_NAND
  61 +#define CONFIG_ENV_SECT_SIZE   0x20000
  62  #else
  63 -#define CONFIG_ENV_IS_NOWHERE          1       /* if env in SDRAM */
  64 +#define CONFIG_ENV_IS_NOWHERE
  65  #endif
  66 -/*
  67 - * max 4k env size is enough, but in case of nand
  68 - * it has to be rounded to sector size
  69 - */
  70 -#define CONFIG_ENV_SIZE                        0x20000 /* 128k */
  71 -#define CONFIG_ENV_ADDR                        0x60000
  72 -#define CONFIG_ENV_OFFSET              0x60000 /* env starts here */
  73 +#define CONFIG_ENV_SIZE                0x20000
  74 +#define CONFIG_ENV_OFFSET      0xe0000
  75
  76  /*
  77   * Default environment variables
  78   */
  79  #define CONFIG_BOOTCOMMAND \
  80         "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
  81 -       "ubi part root; " \
  82 -       "ubifsmount ubi:root; " \
  83 -       "ubifsload 0x800000 ${kernel}; " \
  84 -       "ubifsload 0x1100000 ${initrd}; " \
  85 -       "bootm 0x800000 0x1100000"
  86 -
  87 -#define CONFIG_MTDPARTS                "mtdparts=orion_nand:1m(uboot),-(root)\0"
  88 +       "ubi part root; "                                               \
  89 +       "ubifsmount ubi:rootfs; "                                       \
  90 +       "ubifsload 0x800000 ${kernel}; "                                \
  91 +       "ubifsload 0x700000 ${fdt}; "                                   \
  92 +       "ubifsumount; "                                                 \
  93 +       "fdt addr 0x700000; fdt resize; fdt chosen; "                   \
  94 +       "bootz 0x800000 - 0x700000"
  95 +
  96 +#define CONFIG_MTDPARTS \
  97 +       "mtdparts=orion_nand:"                          \
  98 +       "0xe0000@0x0(uboot),"                           \
  99 +       "0x20000@0xe0000(uboot_env),"                   \
 100 +       "0x100000@0x100000(second_stage_uboot),"        \
 101 +       "-@0x200000(root)\0"
 102
 103  #define CONFIG_EXTRA_ENV_SETTINGS \
 104 -       "console=console=ttyS0,115200\0" \
 105 -       "mtdids=nand0=orion_nand\0" \
 106 -       "mtdparts="CONFIG_MTDPARTS \
 107 -       "kernel=/boot/uImage\0" \
 108 -       "initrd=/boot/uInitrd\0" \
 109 -       "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
 110 +       "console=console=ttyS0,115200\0"        \
 111 +       "mtdids=nand0=orion_nand\0"             \
 112 +       "mtdparts="CONFIG_MTDPARTS              \
 113 +       "kernel=/boot/zImage\0"                 \
 114 +       "fdt=/boot/dockstar.dtb\0"              \
 115 +       "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
 116
 117  /*
 118 - * Ethernet Driver configuration
 119 + * Ethernet driver configuration
 120   */
 121  #ifdef CONFIG_CMD_NET
 122  #define CONFIG_MVGBE_PORTS     {1, 0}  /* enable port 0 only */
 123 @@ -101,7 +109,7 @@
 124  #define CONFIG_CMD_UBI
 125  #define CONFIG_CMD_UBIFS
 126  #define CONFIG_RBTREE
 127 -#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
 128 +#define CONFIG_MTD_DEVICE
 129  #define CONFIG_MTD_PARTITIONS
 130  #define CONFIG_CMD_MTDPARTS
 131  #define CONFIG_LZO
 132 --- a/boards.cfg
 133 +++ b/boards.cfg
 134 @@ -198,6 +198,7 @@ Active  arm         arm926ejs      kirkw
 135  Active  arm         arm926ejs      kirkwood    Marvell         sheevaplug          sheevaplug                            -                                                                                                                                 Prafulla Wadaskar <prafulla@marvell.com>
 136  Active  arm         arm926ejs      kirkwood    raidsonic       ib62x0              ib62x0                                -                                                                                                                                 Luka Perkov <luka@openwrt.org>
 137  Active  arm         arm926ejs      kirkwood    Seagate         dockstar            dockstar                              -                                                                                                                                 Eric Cooper <ecc@cmu.edu>
 138 +Active  arm         arm926ejs      kirkwood    Seagate         dockstar            dockstar_second_stage                dockstar:SECOND_STAGE                                                                                                              Luka Perkov <luka@openwrt.org>
 139  Active  arm         arm926ejs      kirkwood    Seagate         goflexhome          goflexhome                            -                                                                                                                                 Suriyan Ramasami <suriyan.r@gmail.com>
 140  Active  arm         arm926ejs      lpc32xx     timll           devkit3250          devkit3250                            -                                                                                                                                 Vladimir Zapolskiy <vz@mleia.com>
 141  Active  arm         arm926ejs      mb86r0x     syteco          jadecpu             jadecpu                               -                                                                                                                                 Matthias Weisser <weisserm@arcor.de>