uboot-kirkwood: bump to 2014.10

[openwrt/openwrt.git] / package / boot / uboot-kirkwood / patches / 130-ib62x0.patch

diff --git a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
index 9a086e08b168f2b3e6260ed695bf5f6eb57ab234..f46970ced8018ad4ed3f3bf0a823ba7f51a49d00 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
+++ b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
@@ -1,16 +1,6 @@
---- a/boards.cfg
-+++ b/boards.cfg
-@@ -190,6 +190,7 @@ Active  arm         arm926ejs      kirkw
- Active  arm         arm926ejs      kirkwood    Marvell         openrd              openrd_client                        openrd:BOARD_IS_OPENRD_CLIENT                                                                                                     -
- Active  arm         arm926ejs      kirkwood    Marvell         openrd              openrd_ultimate                      openrd:BOARD_IS_OPENRD_ULTIMATE                                                                                                   -
- Active  arm         arm926ejs      kirkwood    raidsonic       ib62x0              ib62x0                               -                                                                                                                                 Luka Perkov <luka@openwrt.org>
-+Active  arm         arm926ejs      kirkwood    raidsonic       ib62x0              ib62x0_second_stage                  ib62x0:SECOND_STAGE                                                                                                               Luka Perkov <luka@openwrt.org>
- Active  arm         arm926ejs      kirkwood    Seagate         -                   dockstar                             -                                                                                                                                 Eric Cooper <ecc@cmu.edu>
- Active  arm         arm926ejs      kirkwood    Seagate         dockstar            dockstar_second_stage                dockstar:SECOND_STAGE                                                                                                             Luka Perkov <luka@openwrt.org>
- Active  arm         arm926ejs      kirkwood    Seagate         -                   goflexhome                           -                                                                                                                                 Suriyan Ramasami <suriyan.r@gmail.com>
 --- a/include/configs/ib62x0.h
 +++ b/include/configs/ib62x0.h
-@@ -91,7 +91,8 @@
+@@ -92,7 +92,8 @@
        "mtdparts=orion_nand:"                                          \
        "0xe0000@0x0(uboot),"                                           \
        "0x20000@0xe0000(uboot_env),"                                   \
@@ -20,7 +10,7 @@
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"                                \
-@@ -99,7 +100,7 @@
+@@ -100,7 +101,7 @@
        "mtdparts="CONFIG_MTDPARTS                                      \
        "kernel=/boot/zImage\0"                                         \
        "fdt=/boot/ib62x0.dtb\0"                                        \