Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
On Wed, Jun 06, 2012 at 12:24:09AM +0200, Martin Mueller wrote: http://patchwork.openwrt.org/patch/734/ That is target not uboot patch... Ah, sorry. On the goflex there is no need to change the factory bootloader. There is always the need to change the factory bootloader ;) Please resend your kernel patch... Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
On 05/06/12 22:48, Daniel Golle wrote: Hi Luka, On 05/06/12 22:42, Luka Perkov wrote: I'm not sure about this one. dockstar support seems to be already in upstream uboot sources: Even better, so we can drop that patch entirely. Would be nice someone with access to an iconnect board would test if that works fine with the Das U-Boot 2012.04.01 as well, maybe this can go upstream as well then. I have access to an iConnect, what is it that you need testing? The patch from http://patchwork.openwrt.org/patch/734/ ? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
Hi Tim, great news, I'd would be nice if you can help so we can get U-Boot for this board tested. On 06/06/12 15:24, Tim Fletcher wrote: I have access to an iConnect, what is it that you need testing? OpenWrt can build the U-Boot loader for some boards, including the kirkwood platform. So board-specific definitions for the iconnect were added to the uboot-kirkwood package, but they didn't get upstream till now. In order to update U-Boot to version 2012.04.01, I forward-ported the board support for the iconnect by applying the same changes to it which were also committed to similar devices like the SheevaPlug in the U-Boot sources. So this should be tested before it can go upstream. Basically, the other OpenWrt-supported board, the dockstar, already made it's way into the U-Boot sources, so patch 2181 is obsoleted by that. After applying the 3 patches (see below) to trunk, you will have the option to build uboot for the iconnect board. Please test the resulting image by chain-loading it with your current U-Boot (risk free). For this you will need the device hooked up via serial console, and enter the bootloader after power-on, the procedure looks like this: Marvell setenv ipaddr 192.168.1.2 Marvell setenv serverip 192.168.1.1 Marvell tftp 0x60 openwrt-kirkwood-iconnect-u-boot.bin Using egiga0 device TFTP from server 192.168.1.1; our IP address is 192.168.1.2 Filename 'openwrt-kirkwood-iconnect-u-boot.bin'. Load address: 0x60 Loading: ## done Bytes transferred = 372440 (5aed8 hex) Marvell go 0x60 ## Starting application at 0x0060 ... U-Boot 2012.04.01 (Jun 07 2012 - 00:26:14) ... The got the newly build U-Boot loaded and you can play with it a bit to see if it's working properly. Test loading and booting something from NAND and from TFTP, S-ATA may or may not work, USB should work (try 'usb start', then mount a usb storage device and loading a kernel) After testing the bootloader A LOT and making sure that you won't brick stuff, you may or may not decide to flash it onto the NAND. You may take this as an inspiration, but check it thoroughly and don't blame me if things go wrong: Marvell printenv check mtdparts for the name of the u-boot partition (usually either 'uboot' or 'u-boot') and use that name for nand erase.part and nand write. setenv ipaddr 192.168.1.2 setenv serverip 192.168.1.1 tftp 0x60 openwrt-kirkwood-iconnect-u-boot.kwb nand erase.part uboot nand write 0x60 uboot 0x8 reset The patch from http://patchwork.openwrt.org/patch/734/ ? No, this thread is about about http://patchwork.openwrt.org/patch/2180/ http://patchwork.openwrt.org/patch/2181/ http://patchwork.openwrt.org/patch/2182/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
On 06/06/12 22:58, Daniel Golle wrote: Hi Tim, great news, I'd would be nice if you can help so we can get U-Boot for this board tested. On 06/06/12 15:24, Tim Fletcher wrote: I have access to an iConnect, what is it that you need testing? OpenWrt can build the U-Boot loader for some boards, including the kirkwood platform. So board-specific definitions for the iconnect were added to the uboot-kirkwood package, but they didn't get upstream till now. In order to update U-Boot to version 2012.04.01, I forward-ported the board support for the iconnect by applying the same changes to it which were also committed to similar devices like the SheevaPlug in the U-Boot sources. So this should be tested before it can go upstream. Basically, the other OpenWrt-supported board, the dockstar, already made it's way into the U-Boot sources, so patch 2181 is obsoleted by that. After applying the 3 patches (see below) to trunk, you will have the option to build uboot for the iconnect board. Please test the resulting image by chain-loading it with your current U-Boot (risk free). For this you will need the device hooked up via serial console, and enter the bootloader after power-on, the procedure looks like this: I've got it all patched in and hooked up I've left it building over night and I'll try and test this tomorrow -- Tim Fletchert...@night-shade.org.uk ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
Hi Daniel, On Mon, May 14, 2012 at 01:05:19AM +0300, Daniel Golle wrote: dockstar board support is based on sheevaplug, all changes made upstream to sheevaplug were made for dockstar as well. Signed-off-by: Daniel Golle dgo...@allnet.de ... diff --git a/package/uboot-kirkwood/files/board/Marvell/dockstar/Makefile b/package/uboot-kirkwood/files/board/Marvell/dockstar/Makefile diff --git a/package/uboot-kirkwood/files/board/Marvell/dockstar/config.mk b/package/uboot-kirkwood/files/board/Marvell/dockstar/config.mk diff --git a/package/uboot-kirkwood/files/board/Marvell/dockstar/dockstar.c b/package/uboot-kirkwood/files/board/Marvell/dockstar/dockstar.c diff --git a/package/uboot-kirkwood/files/include/configs/dockstar.h b/package/uboot-kirkwood/files/include/configs/dockstar.h I'm not sure about this one. dockstar support seems to be already in upstream uboot sources: u-boot-2012.04.01/board/Seagate/ u-boot-2012.04.01/board/Seagate/dockstar/ u-boot-2012.04.01/board/Seagate/dockstar/Makefile u-boot-2012.04.01/board/Seagate/dockstar/dockstar.c u-boot-2012.04.01/board/Seagate/dockstar/dockstar.h u-boot-2012.04.01/board/Seagate/dockstar/kwbimage.cfg If I will do the updating I will probably add this patches (this is note for myself): http://lists.denx.de/pipermail/u-boot/2012-May/125296.html http://lists.denx.de/pipermail/u-boot/2012-April/122594.html http://lists.denx.de/pipermail/u-boot/2012-April/122597.html The last one is already in git, first two are pending. Questions for all: 1) Anyone here who has dockstar board and would like to do some tests? 2) Anyone here who would like to donate iomega iconnect board so that support for that one can be upstreamed? Regards, Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
On Tue, Jun 05, 2012 at 09:42:03PM +0200, Luka Perkov wrote: Questions for all: 1) Anyone here who has dockstar board and would like to do some tests? I have a dockstar and be willing to test. I also sent patches for seagate goflex-net support some monhts ago, but nobody seemed interested. bye MM -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in e-mail? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
On Tue, Jun 05, 2012 at 10:30:51PM +0200, Martin Mueller wrote: On Tue, Jun 05, 2012 at 09:42:03PM +0200, Luka Perkov wrote: Questions for all: 1) Anyone here who has dockstar board and would like to do some tests? I have a dockstar and be willing to test. I also sent patches for seagate goflex-net support some monhts ago, but nobody seemed interested. Did you send it upstream? Can you post links of the patch here please? Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
On Tue, Jun 05, 2012 at 10:44:16PM +0200, Luka Perkov wrote: On Tue, Jun 05, 2012 at 10:30:51PM +0200, Martin Mueller wrote: On Tue, Jun 05, 2012 at 09:42:03PM +0200, Luka Perkov wrote: Questions for all: 1) Anyone here who has dockstar board and would like to do some tests? I have a dockstar and be willing to test. I also sent patches for seagate goflex-net support some monhts ago, but nobody seemed interested. Did you send it upstream? No. Can you post links of the patch here please? http://patchwork.openwrt.org/patch/734/ bye MM -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in e-mail? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
On Tue, Jun 05, 2012 at 11:13:04PM +0200, Martin Mueller wrote: On Tue, Jun 05, 2012 at 10:44:16PM +0200, Luka Perkov wrote: On Tue, Jun 05, 2012 at 10:30:51PM +0200, Martin Mueller wrote: On Tue, Jun 05, 2012 at 09:42:03PM +0200, Luka Perkov wrote: Questions for all: 1) Anyone here who has dockstar board and would like to do some tests? I have a dockstar and be willing to test. I also sent patches for seagate goflex-net support some monhts ago, but nobody seemed interested. Did you send it upstream? No. Can you post links of the patch here please? http://patchwork.openwrt.org/patch/734/ That is target not uboot patch... Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
Hi Luka, On 05/06/12 22:42, Luka Perkov wrote: I'm not sure about this one. dockstar support seems to be already in upstream uboot sources: Even better, so we can drop that patch entirely. Would be nice someone with access to an iconnect board would test if that works fine with the Das U-Boot 2012.04.01 as well, maybe this can go upstream as well then. Cheers for reviewing! Daniel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
On Tue, Jun 05, 2012 at 11:33:08PM +0200, Luka Perkov wrote: On Tue, Jun 05, 2012 at 11:13:04PM +0200, Martin Mueller wrote: On Tue, Jun 05, 2012 at 10:44:16PM +0200, Luka Perkov wrote: On Tue, Jun 05, 2012 at 10:30:51PM +0200, Martin Mueller wrote: On Tue, Jun 05, 2012 at 09:42:03PM +0200, Luka Perkov wrote: Questions for all: 1) Anyone here who has dockstar board and would like to do some tests? I have a dockstar and be willing to test. I also sent patches for seagate goflex-net support some monhts ago, but nobody seemed interested. Did you send it upstream? No. Can you post links of the patch here please? http://patchwork.openwrt.org/patch/734/ That is target not uboot patch... Ah, sorry. On the goflex there is no need to change the factory bootloader. bye MM -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in e-mail? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/3] uboot-kirkwood: backport dockstar board support to 2012.04.01
dockstar board support is based on sheevaplug, all changes made upstream to
sheevaplug were made for dockstar as well.
Signed-off-by: Daniel Golle dgo...@allnet.de
diff --git a/package/uboot-kirkwood/files/board/Marvell/dockstar/Makefile
b/package/uboot-kirkwood/files/board/Marvell/dockstar/Makefile
index da9d29e..8436fd6 100644
--- a/package/uboot-kirkwood/files/board/Marvell/dockstar/Makefile
+++ b/package/uboot-kirkwood/files/board/Marvell/dockstar/Makefile
@@ -24,7 +24,7 @@
include $(TOPDIR)/config.mk
-LIB= $(obj)lib$(BOARD).a
+LIB= $(obj)lib$(BOARD).o
COBJS := dockstar.o
@@ -33,13 +33,7 @@ OBJS := $(addprefix $(obj),$(COBJS))
SOBJS := $(addprefix $(obj),$(SOBJS))
$(LIB):$(obj).depend $(OBJS) $(SOBJS)
- $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
-
-clean:
- rm -f $(SOBJS) $(OBJS)
-
-distclean: clean
- rm -f $(LIB) core *.bak .depend
+ $(call cmd_link_o_target, $(OBJS) $(SOBJS))
#
diff --git a/package/uboot-kirkwood/files/board/Marvell/dockstar/config.mk
b/package/uboot-kirkwood/files/board/Marvell/dockstar/config.mk
deleted file mode 100644
index 1766412..000
--- a/package/uboot-kirkwood/files/board/Marvell/dockstar/config.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# (C) Copyright 2009
-# Marvell Semiconductor www.marvell.com
-# Written-by: Prafulla Wadaskar prafu...@marvell.com
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
-#
-
-TEXT_BASE = 0x0080
-
-# Kirkwood Boot Image configuration file
-KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
diff --git a/package/uboot-kirkwood/files/board/Marvell/dockstar/dockstar.c
b/package/uboot-kirkwood/files/board/Marvell/dockstar/dockstar.c
index 13cd347..03460cb 100644
--- a/package/uboot-kirkwood/files/board/Marvell/dockstar/dockstar.c
+++ b/package/uboot-kirkwood/files/board/Marvell/dockstar/dockstar.c
@@ -24,13 +24,14 @@
#include common.h
#include miiphy.h
+#include asm/arch/cpu.h
#include asm/arch/kirkwood.h
#include asm/arch/mpp.h
#include dockstar.h
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -96,7 +97,11 @@ int board_init(void)
0
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
@@ -108,17 +113,6 @@ int board_init(void)
return 0;
}
-int dram_init(void)
-{
- int i;
-
- for (i = 0; i CONFIG_NR_DRAM_BANKS; i++) {
- gd-bd-bi_dram[i].start = kw_sdram_bar(i);
- gd-bd-bi_dram[i].size = kw_sdram_bs(i);
- }
- return 0;
-}
-
#ifdef CONFIG_RESET_PHY_R
/* Configure and enable MV88E1116 PHY */
void reset_phy(void)
diff --git a/package/uboot-kirkwood/files/include/configs/dockstar.h
b/package/uboot-kirkwood/files/include/configs/dockstar.h
index e19552c..c81b6d2 100644
--- a/package/uboot-kirkwood/files/include/configs/dockstar.h
+++ b/package/uboot-kirkwood/files/include/configs/dockstar.h
@@ -22,92 +22,42 @@
* MA 02110-1301 USA
*/
-#ifndef _CONFIG_SHEEVAPLUG_H
-#define _CONFIG_SHEEVAPLUG_H
+#ifndef _CONFIG_DOCKSTAR_H
+#define _CONFIG_DOCKSTAR_H
/*
* Version number information
*/
-#define CONFIG_IDENT_STRING\nMarvell-Sheevaplug
+#define CONFIG_IDENT_STRING\nSeagate-Dockstar
/*
* High Level Configuration Options (easy to change)
*/
-#define CONFIG_MARVELL 1
-#define CONFIG_ARM926EJS 1 /* Basic Architecture */
#define CONFIG_FEROCEON_88FR1311 /* CPU Core subversion */
#define CONFIG_KIRKWOOD1 /* SOC Family Name */
#define CONFIG_KW88F6281 1 /* SOC Name */
#define CONFIG_MACH_SHEEVAPLUG /* Machine type */
-
-#define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
-#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */
-#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
-
-/*
- * CLKs configurations
- */
-#define CONFIG_SYS_HZ 1000
-
-/*
- * NS16550 Configuration
- */
