uboot-kirkwood: update to 2014.04
authorLuka Perkov <luka@openwrt.org>
Tue, 20 May 2014 12:45:02 +0000 (12:45 +0000)
committerLuka Perkov <luka@openwrt.org>
Tue, 20 May 2014 12:45:02 +0000 (12:45 +0000)
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 40804

package/boot/uboot-kirkwood/Makefile
package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-use-device-tree-and-update-config.patch [deleted file]
package/boot/uboot-kirkwood/patches/110-dockstar.patch
package/boot/uboot-kirkwood/patches/120-iconnect.patch
package/boot/uboot-kirkwood/patches/130-ib62x0.patch

index 5626517..4504669 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2013 OpenWrt.org
+# Copyright (C) 2010-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=u-boot
-PKG_VERSION:=2013.10
+PKG_VERSION:=2014.04
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
@@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
        http://mirror2.openwrt.org/sources \
        ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=a076a044b64371edc52f7e562b13f6b2
+PKG_MD5SUM:=6d2116d1385a66e9a59742caa9d62a54
 PKG_TARGETS:=bin
 
 PKG_BUILD_PARALLEL:=1
diff --git a/package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-use-device-tree-and-update-config.patch b/package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-use-device-tree-and-update-config.patch
deleted file mode 100644 (file)
index de80236..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-From 2701517a2bbf17544b408738438b0dd17718d4dd Mon Sep 17 00:00:00 2001
-From: Luka Perkov <luka@openwrt.org>
-Date: Wed, 14 Nov 2012 23:32:55 +0100
-Subject: [PATCH] kirkwood: ib62x0: use device tree and update config
-
-Signed-off-by: Luka Perkov <luka@openwrt.org>
-CC: Prafulla Wadaskar <prafulla@marvell.com>
----
-v1->v2:
-
- * keep CONFIG_MACH_TYPE define for backwards compatibility
----
-http://patchwork.ozlabs.org/patch/287388/
-Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
----
- include/configs/ib62x0.h | 38 +++++++++++++++++++++++---------------
- 1 file changed, 23 insertions(+), 15 deletions(-)
-
---- a/include/configs/ib62x0.h
-+++ b/include/configs/ib62x0.h
-@@ -28,6 +28,11 @@
- #define CONFIG_MACH_TYPE      MACH_TYPE_NAS6210
- /*
-+ * Enable device tree support
-+ */
-+#define CONFIG_OF_LIBFDT
-+
-+/*
-  * Compression configuration
-  */
- #define CONFIG_BZIP2
-@@ -41,6 +46,7 @@
- #define CONFIG_SYS_MVFS
- #include <config_cmd_default.h>
- #define CONFIG_CMD_ENV
-+#define CONFIG_CMD_BOOTZ
- #define CONFIG_CMD_IDE
- #define CONFIG_CMD_MII
- #define CONFIG_CMD_NAND
-@@ -66,7 +72,7 @@
- #define CONFIG_ENV_IS_NOWHERE
- #endif
- #define CONFIG_ENV_SIZE               0x20000
--#define CONFIG_ENV_OFFSET     0x80000
-+#define CONFIG_ENV_OFFSET     0xe0000
- /*
-  * Default environment variables
-@@ -74,24 +80,26 @@
- #define CONFIG_BOOTCOMMAND \
-       "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
-       "ubi part root; "                                               \
--      "ubifsmount ubi:root; "                                         \
-+      "ubifsmount ubi:rootfs; "                                       \
-       "ubifsload 0x800000 ${kernel}; "                                \
--      "ubifsload 0x1100000 ${initrd}; "                               \
--      "bootm 0x800000 0x1100000"
--
--#define CONFIG_MTDPARTS                               \
--      "mtdparts=orion_nand:"                  \
--      "0x80000@0x0(uboot),"                   \
--      "0x20000@0x80000(uboot_env),"           \
--      "-@0xa0000(root)\0"
-+      "ubifsload 0x700000 ${fdt}; "                                   \
-+      "ubifsumount; "                                                 \
-+      "fdt addr 0x700000; fdt resize; fdt chosen; "                   \
-+      "bootz 0x800000 - 0x700000"
-+
-+#define CONFIG_MTDPARTS \
-+      "mtdparts=orion_nand:"                                          \
-+      "0xe0000@0x0(uboot),"                                           \
-+      "0x20000@0xe0000(uboot_env),"                                   \
-+      "-@0x100000(root)\0"
--#define CONFIG_EXTRA_ENV_SETTINGS                                     \
-+#define CONFIG_EXTRA_ENV_SETTINGS \
-       "console=console=ttyS0,115200\0"                                \
-       "mtdids=nand0=orion_nand\0"                                     \
-       "mtdparts="CONFIG_MTDPARTS                                      \
--      "kernel=/boot/uImage\0"                                         \
--      "initrd=/boot/uInitrd\0"                                        \
--      "bootargs_root=ubi.mtd=2 root=ubi0:root rootfstype=ubifs\0"
-+      "kernel=/boot/zImage\0"                                         \
-+      "fdt=/boot/ib62x0.dtb\0"                                        \
-+      "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
- /*
-  * Ethernet driver configuration
index b0a7f54..e8507f0 100644 (file)
  #define CONFIG_LZO
 --- a/boards.cfg
 +++ b/boards.cfg
-@@ -190,6 +190,7 @@ Active  arm         arm926ejs      kirkw
+@@ -198,6 +198,7 @@ Active  arm         arm926ejs      kirkw
  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    Seagate         -                   dockstar                             -                                                                                                                                 Eric Cooper <ecc@cmu.edu>
index 36655a9..3103dc3 100644 (file)
   * Ethernet driver configuration
 --- a/boards.cfg
 +++ b/boards.cfg
-@@ -164,6 +164,7 @@ Active  arm         arm926ejs      kirkw
+@@ -170,6 +170,7 @@ Active  arm         arm926ejs      kirkw
  Active  arm         arm926ejs      kirkwood    cloudengines    -                   pogo_e02                             -                                                                                                                                 Dave Purdy <david.c.purdy@gmail.com>
  Active  arm         arm926ejs      kirkwood    d-link          -                   dns325                               -                                                                                                                                 Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
  Active  arm         arm926ejs      kirkwood    iomega          -                   iconnect                             -                                                                                                                                 Luka Perkov <luka@openwrt.org>
 +Active  arm         arm926ejs      kirkwood    iomega          iconnect            iconnect_second_stage                iconnect:SECOND_STAGE                                                                                                             Luka Perkov <luka@openwrt.org>
  Active  arm         arm926ejs      kirkwood    karo            tk71                tk71                                 -                                                                                                                                 -
  Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood                          km_kirkwood:KM_KIRKWOOD                                                                                                           Valentin Longchamp <valentin.longchamp@keymile.com>
- Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood_pci                      km_kirkwood:KM_KIRKWOOD_PCI                                                                                                       Valentin Longchamp <valentin.longchamp@keymile.com>
+ Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood_128m16                   km_kirkwood:KM_KIRKWOOD_128M16                                                                                                    Valentin Longchamp <valentin.longchamp@keymile.com>
index 9a086e0..6c98184 100644 (file)
@@ -1,6 +1,6 @@
 --- a/boards.cfg
 +++ b/boards.cfg
-@@ -190,6 +190,7 @@ Active  arm         arm926ejs      kirkw
+@@ -198,6 +198,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>