From c595a596801079592ad4bb64cd311faa0aad2abb Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sun, 30 Nov 2014 03:55:44 +0000 Subject: uboot-kirkwood: bump to 2014.10 Signed-off-by: Luka Perkov SVN-Revision: 43436 --- .../boot/uboot-kirkwood/patches/110-dockstar.patch | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'package/boot/uboot-kirkwood/patches/110-dockstar.patch') diff --git a/package/boot/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch index a040e40614..4c9ccdfd93 100644 --- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch +++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch @@ -1,22 +1,20 @@ --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h -@@ -15,21 +15,26 @@ +@@ -17,20 +17,25 @@ /* * Version number information */ -#define CONFIG_IDENT_STRING "\nSeagate FreeAgent DockStar" -+#define CONFIG_IDENT_STRING " Seagate FreeAgent DockStar" ++#define CONFIG_IDENT_STRING "Seagate FreeAgent DockStar" /* - * High Level Configuration Options (easy to change) -+ * High level configuration options ++ * High Level Configuration Options */ -#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ --#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ -#define CONFIG_KW88F6281 1 /* SOC Name */ -#define CONFIG_MACH_DOCKSTAR /* Machine type */ +#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -+#define CONFIG_KIRKWOOD /* SOC Family Name */ +#define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ @@ -34,7 +32,7 @@ #include #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV -@@ -37,55 +42,58 @@ +@@ -38,55 +43,58 @@ #define CONFIG_CMD_NAND #define CONFIG_CMD_PING #define CONFIG_CMD_USB @@ -120,7 +118,7 @@ */ #ifdef CONFIG_CMD_NET #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -@@ -101,7 +109,7 @@ +@@ -102,7 +110,7 @@ #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE @@ -129,13 +127,3 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS #define CONFIG_LZO ---- a/boards.cfg -+++ b/boards.cfg -@@ -198,6 +198,7 @@ Active arm arm926ejs kirkw - Active arm arm926ejs kirkwood Marvell sheevaplug sheevaplug - Prafulla Wadaskar - Active arm arm926ejs kirkwood raidsonic ib62x0 ib62x0 - Luka Perkov - Active arm arm926ejs kirkwood Seagate dockstar dockstar - Eric Cooper -+Active arm arm926ejs kirkwood Seagate dockstar dockstar_second_stage dockstar:SECOND_STAGE Luka Perkov - Active arm arm926ejs kirkwood Seagate goflexhome goflexhome - Suriyan Ramasami - Active arm arm926ejs lpc32xx timll devkit3250 devkit3250 - Vladimir Zapolskiy - Active arm arm926ejs mb86r0x syteco jadecpu jadecpu - Matthias Weisser -- cgit v1.2.3