Re: [U-Boot] [PATCH] ubifs: Fix ubifsload when using ZLIB
On Wed, 05 Sep 2012 09:58:07 +0100, Veli-Pekka Peltola
veli-pekka.pelt...@bluegiga.com wrote:
Using ZLIB compression with UBIFS fails if last data node is not a size
of
UBIFS_BLOCK_SIZE (4096 bytes).
Easiest way to test this is trying to read a file smaller than 4k:
= ubifsload 4100 /etc/fstab
Loading file '/etc/fstab' to addr 0x4100 with size 704
(0x02c0)...
UBIFS error (pid 0): read_block: bad data node (block 0, inode 2506)
UBIFS error (pid 0): do_readpage: cannot read page 0 of inode 2506,
error -22
Error reading file '/etc/fstab'
/etc/fstab not found!
exit not allowed from main input shell.
=
With this patch:
= ubifsload 4100 /etc/fstab
Loading file '/etc/fstab' to addr 0x4100 with size 704
(0x02c0)...
Done
=
Signed-off-by: Veli-Pekka Peltola veli-pekka.pelt...@bluegiga.com
Tested-by: Jamie Lentin j...@lentin.co.uk
This was affecting me also (UBIFS using ZLIB, on NAND of Kirkwood-based
DNS-320), and your patch seems to have fixed loading small files. Thanks!
---
fs/ubifs/ubifs.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index c68802b..6a68437 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -37,8 +37,7 @@ DECLARE_GLOBAL_DATA_PTR;
static int gzip_decompress(const unsigned char *in, size_t in_len,
unsigned char *out, size_t *out_len)
{
- unsigned long len = in_len;
- return zunzip(out, *out_len, (unsigned char *)in, len, 0, 0);
+ return zunzip(out, *out_len, (unsigned char *)in, (long unsigned int
*)out_len, 0, 0);
}
/* Fake description object for the none compressor */
--
Jamie Lentin
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RESEND] [PATCH 0/2] kirkwood: Generalise dns325 support, include dns320
Hi Prafulla, thankyou for taking the time to review.
On Tue, 31 Jul 2012, Prafulla Wadaskar wrote:
-Original Message-
From: Jamie Lentin [mailto:j...@lentin.co.uk]
Sent: 31 July 2012 14:01
To: Prafulla Wadaskar
Cc: u-boot@lists.denx.de; albert.u.b...@aribaud.net;
ub...@lukaperkov.net
Subject: RE: [RESEND] [PATCH 0/2] kirkwood: Generalise dns325 support,
include dns320
On Mon, 30 Jul 2012, Prafulla Wadaskar wrote:
Dear Jamie Lentin
-Original Message-
From: Jamie Lentin [mailto:j...@lentin.co.uk]
Sent: 31 July 2012 03:26
To: u-boot@lists.denx.de
Cc: Prafulla Wadaskar; albert.u.b...@aribaud.net;
ub...@lukaperkov.net; Jamie Lentin
Subject: [RESEND] [PATCH 0/2] kirkwood: Generalise dns325 support,
include dns320
I submitted this a while ago[0], it would be nice to see it
included
if possible. It generalises the DNS325 support so that it can be
used
for both the DNS320 and DNS325.
Luka Perkov stated I have no more questions regarding this patch,
not
sure if this counts as an ACK. The patch here is ~same, just
rebased.
Somewhat related, I have tried using tools/kwboot to boot both
NASes.
The DNS325 boots fine, however the DNS320 reports:-
Sending boot message. Please reboot the target...|
Sending boot image...
0 % [+xmodem: Bad message
UART-boot works with kwuartboot, although only when it is killed
and
restarted. If I work out anything interesting will follow it up in
a separate thread.
Any feedback appreciated!
[0] http://thread.gmane.org/gmane.comp.boot-loaders.u-
boot/130234/focus=130575
Jamie Lentin (2):
kirkwood: Rename dns325 to dnskw
kirkwood: Add support for the D-Link DNS-320
MAINTAINERS|4 +
board/d-link/{dns325 = dnskw}/Makefile|2 +-
board/d-link/{dns325/dns325.c = dnskw/dnskw.c}| 18 +-
board/d-link/{dns325/dns325.h = dnskw/dnskw.h}| 30 ++-
board/d-link/dnskw/kwbimage.dns320.cfg | 207
.../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |0
boards.cfg |3 +-
include/configs/{dns325.h = dnskw.h} | 21 +-
8 files changed, 261 insertions(+), 24 deletions(-)
rename board/d-link/{dns325 = dnskw}/Makefile (98%)
rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (90%)
rename board/d-link/{dns325/dns325.h = dnskw/dnskw.h} (65%)
create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg
Finally you will two kwbimage files for two boards being supported.
BTW:
I would like to ask : what is a difference between these two files?
If
it is very small, it can be handled in early_board_init().
In that case you can keep the earlier name kwbimage.cfg as it is and
one file can be avoided.
The DNS-320 has half the RAM of the DNS-325 at different timings, so
the
difference is non-trivial. I'm not sure there would be a logical way
to
divide it up into a common setup and changes in early_board_init(). I
could have a go if you prefer though---if there's prior art somewhere
else
in u-boot please let me know and I'll have a look.
Hi Jamie
You can create a common kwbimage.cfg that suits for both the
boards (with larger RAM size and comfortable timings for both the
boards)
These configuration will be pushed on the Kirkwood registers before
u-boot image kick start. Then in early_board_init() you can tuned these
register for appropriate boards (for ex. reduce size, or tune timings
etc.)
Please try to implement this if this sounds good.
I've had a look into this, and still not convinced it's the way to go.
Designing a kwbimage.cfg that suits both is somewhat outside my sphere of
knowledge (both of the hardware in question and generally). e.g. can I
assert both M_ODT[0] (as used in DNS-325) and M_ODT[1] (DNS-320) during
write to CS0 safely, not knowing where the other pin is wired to? Will
changing the address multiplex at runtime result in memory corruption?
Regardless, the end result would increase board-specifics. There would be
the same information as in kwbimage.dns32[0|5].cfg now, but hidden away in
device-specfic code and C constants instead of in a config file with a
known format and location. This seems like a step backwards to me, and
would certainly give headaches to anyone trying to move away from
kwbimage.cfg to, say, devicetree.
I've implemented the other comments on the patchset, and can send these if
you're happy with the above.
Thanks,
Regards...
Prafulla . . .
--
Jamie Lentin
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RESEND] [PATCH 0/2] kirkwood: Generalise dns325 support, include dns320
On Mon, 30 Jul 2012, Prafulla Wadaskar wrote:
Dear Jamie Lentin
-Original Message-
From: Jamie Lentin [mailto:j...@lentin.co.uk]
Sent: 31 July 2012 03:26
To: u-boot@lists.denx.de
Cc: Prafulla Wadaskar; albert.u.b...@aribaud.net;
ub...@lukaperkov.net; Jamie Lentin
Subject: [RESEND] [PATCH 0/2] kirkwood: Generalise dns325 support,
include dns320
I submitted this a while ago[0], it would be nice to see it included
if possible. It generalises the DNS325 support so that it can be used
for both the DNS320 and DNS325.
Luka Perkov stated I have no more questions regarding this patch,
not
sure if this counts as an ACK. The patch here is ~same, just rebased.
Somewhat related, I have tried using tools/kwboot to boot both NASes.
The DNS325 boots fine, however the DNS320 reports:-
Sending boot message. Please reboot the target...|
Sending boot image...
0 % [+xmodem: Bad message
UART-boot works with kwuartboot, although only when it is killed and
restarted. If I work out anything interesting will follow it up in
a separate thread.
Any feedback appreciated!
[0] http://thread.gmane.org/gmane.comp.boot-loaders.u-
boot/130234/focus=130575
Jamie Lentin (2):
kirkwood: Rename dns325 to dnskw
kirkwood: Add support for the D-Link DNS-320
MAINTAINERS|4 +
board/d-link/{dns325 = dnskw}/Makefile|2 +-
board/d-link/{dns325/dns325.c = dnskw/dnskw.c}| 18 +-
board/d-link/{dns325/dns325.h = dnskw/dnskw.h}| 30 ++-
board/d-link/dnskw/kwbimage.dns320.cfg | 207
.../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |0
boards.cfg |3 +-
include/configs/{dns325.h = dnskw.h} | 21 +-
8 files changed, 261 insertions(+), 24 deletions(-)
rename board/d-link/{dns325 = dnskw}/Makefile (98%)
rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (90%)
rename board/d-link/{dns325/dns325.h = dnskw/dnskw.h} (65%)
create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg
Finally you will two kwbimage files for two boards being supported. BTW:
I would like to ask : what is a difference between these two files? If
it is very small, it can be handled in early_board_init().
In that case you can keep the earlier name kwbimage.cfg as it is and one file
can be avoided.
The DNS-320 has half the RAM of the DNS-325 at different timings, so the
difference is non-trivial. I'm not sure there would be a logical way to
divide it up into a common setup and changes in early_board_init(). I
could have a go if you prefer though---if there's prior art somewhere else
in u-boot please let me know and I'll have a look.
$ wc -l board/d-link/dnskw/kwbimage.dns32*
207 board/d-link/dnskw/kwbimage.dns320.cfg
208 board/d-link/dnskw/kwbimage.dns325.cfg
$ diff -u board/d-link/dnskw/kwbimage.dns32* | diffstat
kwbimage.dns325.cfg | 85
++--
1 file changed, 43 insertions(+), 42 deletions(-)
Regards...
Prafulla . . .
--
Jamie Lentin
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] kirkwood: Add support for the D-Link DNS-320
On Mon, 30 Jul 2012, Prafulla Wadaskar wrote: -Original Message- From: Jamie Lentin [mailto:j...@lentin.co.uk] Sent: 31 July 2012 03:26 To: u-boot@lists.denx.de Cc: Prafulla Wadaskar; albert.u.b...@aribaud.net; ub...@lukaperkov.net; Jamie Lentin Subject: [PATCH 2/2] kirkwood: Add support for the D-Link DNS-320 Extend dnskw to support the D-Link DNS-320 ShareCenter NAS also. For more information on this NAS, see:- http://jamie.lentin.co.uk/devices/dlink-dns320 http://dns323.kood.org/dns-320 http://sharecenter.dlink.com/products/DNS-320 Signed-off-by: Jamie Lentin j...@lentin.co.uk Cc: prafu...@marvell.com Cc: albert.u.b...@aribaud.net --- MAINTAINERS|4 + board/d-link/dnskw/dnskw.c |8 +- board/d-link/dnskw/dnskw.h |6 + board/d-link/dnskw/kwbimage.dns320.cfg | 207 boards.cfg |1 + include/configs/dnskw.h| 10 ++ 6 files changed, 232 insertions(+), 4 deletions(-) create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg diff --git a/MAINTAINERS b/MAINTAINERS index fd0c65c..92ede1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -673,6 +673,10 @@ Igor Grinberg grinb...@compulab.co.il cm-t35 ARM ARMV7 (OMAP3xx Soc) +Jamie Lentin j...@lentin.co.uk + + dns320 ARM926EJS (Kirkwood SoC) + Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net dns325 ARM926EJS (Kirkwood SoC) diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c index d29735c..cd6bfe9 100644 --- a/board/d-link/dnskw/dnskw.c +++ b/board/d-link/dnskw/dnskw.c @@ -58,8 +58,8 @@ int board_early_init_f(void) MPP10_UART0_TXD, MPP11_UART0_RXD, MPP12_SD_CLK, - MPP13_SD_CMD, - MPP14_SD_D0, + MPP13_UART1_TXD,/* Custom ...*/ + MPP14_UART1_RXD,/* ... controller */ Are these entries valid for both boards? If not then encapsulate with #ifdef It seems fairly reasonable to---the DNS-325 does not make use of the SD interface. Either these pins are unattached or attached to the embedded controller in the same way, but the connection is not useful. Either way, setting them to UART does not cause any problems on the DNS-325. I could set MPP13_GPIO, MPP14_GPIO for the DNS-325 instead, or just not configure them at all (if that is an option). MPP15_SD_D1, MPP16_SD_D2, MPP17_SD_D3, @@ -74,13 +74,13 @@ int board_early_init_f(void) MPP26_GPIO, /* power led */ MPP27_GPIO, /* sata0(right) error led */ MPP28_GPIO, /* sata1(left) error led */ - MPP29_GPIO, /* usb error led */ + MPP29_GPIO, /* usb error led (dns-325) */ Ditto Unattached on the DNS-320, so same situation as above. MPP30_GPIO, MPP31_GPIO, MPP32_GPIO, MPP33_GPIO, MPP34_GPIO, /* power key */ - MPP35_GPIO, + MPP35_GPIO, /* usb error led (dns-320) */ Ditto Unattached on the DNS-325, so same situation as above. MPP36_GPIO, MPP37_GPIO, MPP38_GPIO, diff --git a/board/d-link/dnskw/dnskw.h b/board/d-link/dnskw/dnskw.h index 4b11cb6..8886050 100644 --- a/board/d-link/dnskw/dnskw.h +++ b/board/d-link/dnskw/dnskw.h @@ -43,6 +43,12 @@ #define DNSKW_OE_VAL_HIGH 0x0800 /* disable leds */ #endif /* CONFIG_BOARD_IS_DNS325 */ +/* DNS-320 specific configuration */ +#ifdef CONFIG_BOARD_IS_DNS320 +#define DNSKW_OE_VAL_LOW 0x3800 /* disable leds */ +#define DNSKW_OE_VAL_HIGH 0x0808 /* disable leds */ +#endif /* CONFIG_BOARD_IS_DNS320 */ + /* PHY related */ #define MV88E1116_MAC_CTRL_REG 21 #define MV88E1116_PGADR_REG22 diff --git a/board/d-link/dnskw/kwbimage.dns320.cfg b/board/d- link/dnskw/kwbimage.dns320.cfg new file mode 100644 index 000..5fb4052 --- /dev/null +++ b/board/d-link/dnskw/kwbimage.dns320.cfg @@ -0,0 +1,207 @@ +# +# Copyright (C) 2012 +# Jamie Lentin j...@lentin.co.uk +# +# Based on dns325 support: +# Copyright (C) 2011 +# Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net +# +# 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
[U-Boot] [RESEND] [PATCH 0/2] kirkwood: Generalise dns325 support, include dns320
I submitted this a while ago[0], it would be nice to see it included
if possible. It generalises the DNS325 support so that it can be used
for both the DNS320 and DNS325.
Luka Perkov stated I have no more questions regarding this patch, not
sure if this counts as an ACK. The patch here is ~same, just rebased.
Somewhat related, I have tried using tools/kwboot to boot both NASes.
The DNS325 boots fine, however the DNS320 reports:-
Sending boot message. Please reboot the target...|
Sending boot image...
0 % [+xmodem: Bad message
UART-boot works with kwuartboot, although only when it is killed and
restarted. If I work out anything interesting will follow it up in
a separate thread.
Any feedback appreciated!
[0] http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/130234/focus=130575
Jamie Lentin (2):
kirkwood: Rename dns325 to dnskw
kirkwood: Add support for the D-Link DNS-320
MAINTAINERS|4 +
board/d-link/{dns325 = dnskw}/Makefile|2 +-
board/d-link/{dns325/dns325.c = dnskw/dnskw.c}| 18 +-
board/d-link/{dns325/dns325.h = dnskw/dnskw.h}| 30 ++-
board/d-link/dnskw/kwbimage.dns320.cfg | 207
.../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |0
boards.cfg |3 +-
include/configs/{dns325.h = dnskw.h} | 21 +-
8 files changed, 261 insertions(+), 24 deletions(-)
rename board/d-link/{dns325 = dnskw}/Makefile (98%)
rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (90%)
rename board/d-link/{dns325/dns325.h = dnskw/dnskw.h} (65%)
create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg
rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
rename include/configs/{dns325.h = dnskw.h} (89%)
--
1.7.10.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] kirkwood: Add support for the D-Link DNS-320
Extend dnskw to support the D-Link DNS-320 ShareCenter NAS also. For more information on this NAS, see:- http://jamie.lentin.co.uk/devices/dlink-dns320 http://dns323.kood.org/dns-320 http://sharecenter.dlink.com/products/DNS-320 Signed-off-by: Jamie Lentin j...@lentin.co.uk Cc: prafu...@marvell.com Cc: albert.u.b...@aribaud.net --- MAINTAINERS|4 + board/d-link/dnskw/dnskw.c |8 +- board/d-link/dnskw/dnskw.h |6 + board/d-link/dnskw/kwbimage.dns320.cfg | 207 boards.cfg |1 + include/configs/dnskw.h| 10 ++ 6 files changed, 232 insertions(+), 4 deletions(-) create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg diff --git a/MAINTAINERS b/MAINTAINERS index fd0c65c..92ede1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -673,6 +673,10 @@ Igor Grinberg grinb...@compulab.co.il cm-t35 ARM ARMV7 (OMAP3xx Soc) +Jamie Lentin j...@lentin.co.uk + + dns320 ARM926EJS (Kirkwood SoC) + Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net dns325 ARM926EJS (Kirkwood SoC) diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c index d29735c..cd6bfe9 100644 --- a/board/d-link/dnskw/dnskw.c +++ b/board/d-link/dnskw/dnskw.c @@ -58,8 +58,8 @@ int board_early_init_f(void) MPP10_UART0_TXD, MPP11_UART0_RXD, MPP12_SD_CLK, - MPP13_SD_CMD, - MPP14_SD_D0, + MPP13_UART1_TXD,/* Custom ...*/ + MPP14_UART1_RXD,/* ... controller */ MPP15_SD_D1, MPP16_SD_D2, MPP17_SD_D3, @@ -74,13 +74,13 @@ int board_early_init_f(void) MPP26_GPIO, /* power led */ MPP27_GPIO, /* sata0(right) error led */ MPP28_GPIO, /* sata1(left) error led */ - MPP29_GPIO, /* usb error led */ + MPP29_GPIO, /* usb error led (dns-325) */ MPP30_GPIO, MPP31_GPIO, MPP32_GPIO, MPP33_GPIO, MPP34_GPIO, /* power key */ - MPP35_GPIO, + MPP35_GPIO, /* usb error led (dns-320) */ MPP36_GPIO, MPP37_GPIO, MPP38_GPIO, diff --git a/board/d-link/dnskw/dnskw.h b/board/d-link/dnskw/dnskw.h index 4b11cb6..8886050 100644 --- a/board/d-link/dnskw/dnskw.h +++ b/board/d-link/dnskw/dnskw.h @@ -43,6 +43,12 @@ #define DNSKW_OE_VAL_HIGH 0x0800 /* disable leds */ #endif /* CONFIG_BOARD_IS_DNS325 */ +/* DNS-320 specific configuration */ +#ifdef CONFIG_BOARD_IS_DNS320 +#define DNSKW_OE_VAL_LOW 0x3800 /* disable leds */ +#define DNSKW_OE_VAL_HIGH 0x0808 /* disable leds */ +#endif /* CONFIG_BOARD_IS_DNS320 */ + /* PHY related */ #define MV88E1116_MAC_CTRL_REG 21 #define MV88E1116_PGADR_REG22 diff --git a/board/d-link/dnskw/kwbimage.dns320.cfg b/board/d-link/dnskw/kwbimage.dns320.cfg new file mode 100644 index 000..5fb4052 --- /dev/null +++ b/board/d-link/dnskw/kwbimage.dns320.cfg @@ -0,0 +1,207 @@ +# +# Copyright (C) 2012 +# Jamie Lentin j...@lentin.co.uk +# +# Based on dns325 support: +# Copyright (C) 2011 +# Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net +# +# 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 +# +# Refer docs/README.kwimage for more details about how-to configure +# and create kirkwood boot image +# + +# Boot Media configurations +BOOT_FROM nand +NAND_ECC_MODE default +NAND_PAGE_SIZE 0x0800 + +# SOC registers configuration using bootrom header extension +# Maximum KWBIMAGE_MAX_CONFIG configurations allowed + +# Configure RGMII-0 interface pad voltage to 1.8V +DATA 0xFFD100e0 0x1b1b1b9b + +#Dram initalization for SINGLE x16 CL=3 @ 200MHz +DATA 0xFFD01400 0x43000618 # DDR Configuration register +# bit13-0: 0x618 DDR2 clks refresh rate +# bit23-14: 0 required +# bit24:1 enable exit self refresh mode on DDR access +# bit25:1 required
[U-Boot] [PATCH 1/2] kirkwood: Rename dns325 to dnskw
So we can re-use DNS-325 configuration for the DNS-320 without things getting
confusing, rename all common parts from dns325 to dnskw, and use a config
option to configure DNS-325 specifics.
Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
---
board/d-link/{dns325 = dnskw}/Makefile|2 +-
board/d-link/{dns325/dns325.c = dnskw/dnskw.c}| 10
board/d-link/{dns325/dns325.h = dnskw/dnskw.h}| 24
.../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |0
boards.cfg |2 +-
include/configs/{dns325.h = dnskw.h} | 11 ++---
6 files changed, 29 insertions(+), 20 deletions(-)
rename board/d-link/{dns325 = dnskw}/Makefile (98%)
rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (94%)
rename board/d-link/{dns325/dns325.h = dnskw/dnskw.h} (73%)
rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
rename include/configs/{dns325.h = dnskw.h} (95%)
diff --git a/board/d-link/dns325/Makefile b/board/d-link/dnskw/Makefile
similarity index 98%
rename from board/d-link/dns325/Makefile
rename to board/d-link/dnskw/Makefile
index 35da21a..174127e 100644
--- a/board/d-link/dns325/Makefile
+++ b/board/d-link/dnskw/Makefile
@@ -30,7 +30,7 @@ include $(TOPDIR)/config.mk
LIB= $(obj)lib$(BOARD).o
-COBJS := dns325.o
+COBJS := dnskw.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dnskw/dnskw.c
similarity index 94%
rename from board/d-link/dns325/dns325.c
rename to board/d-link/dnskw/dnskw.c
index 11260fe..d29735c 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -33,15 +33,15 @@
#include asm/arch/kirkwood.h
#include asm/arch/mpp.h
#include asm/arch/gpio.h
-#include dns325.h
+#include dnskw.h
DECLARE_GLOBAL_DATA_PTR;
int board_early_init_f(void)
{
/* Gpio configuration */
- kw_config_gpio(DNS325_OE_VAL_LOW, DNS325_OE_VAL_HIGH,
- DNS325_OE_LOW, DNS325_OE_HIGH);
+ kw_config_gpio(DNSKW_OE_VAL_LOW, DNSKW_OE_VAL_HIGH,
+ DNSKW_OE_LOW, DNSKW_OE_HIGH);
/* Multi-Purpose Pins Functionality configuration */
u32 kwmpp_config[] = {
@@ -99,9 +99,9 @@ int board_early_init_f(void)
};
kirkwood_mpp_conf(kwmpp_config, NULL);
- kw_gpio_set_blink(DNS325_GPIO_LED_POWER , 1);
+ kw_gpio_set_blink(DNSKW_GPIO_LED_POWER , 1);
- kw_gpio_set_value(DNS325_GPIO_SATA0_EN , 1);
+ kw_gpio_set_value(DNSKW_GPIO_SATA0_EN , 1);
return 0;
}
diff --git a/board/d-link/dns325/dns325.h b/board/d-link/dnskw/dnskw.h
similarity index 73%
rename from board/d-link/dns325/dns325.h
rename to board/d-link/dnskw/dnskw.h
index 7859cea..4b11cb6 100644
--- a/board/d-link/dns325/dns325.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -26,18 +26,22 @@
* MA 02110-1301 USA
*/
-#ifndef __DNS325_H
-#define __DNS325_H
+#ifndef __DNSKW_H
+#define __DNSKW_H
/* GPIO configuration */
-#define DNS325_OE_LOW 0x
-#define DNS325_OE_HIGH 0x00039604
-#define DNS325_OE_VAL_LOW 0x3800 /* disable leds */
-#define DNS325_OE_VAL_HIGH 0x0800 /* disable leds */
+#define DNSKW_OE_LOW 0x
+#define DNSKW_OE_HIGH 0x00039604
-#define DNS325_GPIO_LED_POWER 26
-#define DNS325_GPIO_SATA0_EN 39
-#define DNS325_GPIO_SATA1_EN 40
+#define DNSKW_GPIO_LED_POWER 26
+#define DNSKW_GPIO_SATA0_EN39
+#define DNSKW_GPIO_SATA1_EN40
+
+/* DNS-325 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS325
+#define DNSKW_OE_VAL_LOW 0x3800 /* disable leds */
+#define DNSKW_OE_VAL_HIGH 0x0800 /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS325 */
/* PHY related */
#define MV88E1116_MAC_CTRL_REG 21
@@ -45,4 +49,4 @@
#define MV88E1116_RGMII_TXTM_CTRL (1 4)
#define MV88E1116_RGMII_RXTM_CTRL (1 5)
-#endif /* __DNS325_H */
+#endif /* __DNSKW_H */
diff --git a/board/d-link/dns325/kwbimage.cfg
b/board/d-link/dnskw/kwbimage.dns325.cfg
similarity index 100%
rename from board/d-link/dns325/kwbimage.cfg
rename to board/d-link/dnskw/kwbimage.dns325.cfg
diff --git a/boards.cfg b/boards.cfg
index 2d36d83..8b8bb45 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -139,7 +139,7 @@ hawkboard_uart arm arm926ejs
da8xxevmdavinci
enbw_cmc arm arm926ejs enbw_cmcenbw
davinci
calimain arm arm926ejs calimain
omicrondavinci
pogo_e02 arm arm926ejs -
cloudengines kirkwood
-dns325 arm arm926ejs -
d
Re: [U-Boot] [PATCH] kirkwood: add support for D-Link DNS-320
On Wed, 02 May 2012 19:45:15 +0100, Luka Perkov ub...@lukaperkov.net
wrote:
Hi Jamie,
I know that you have sent newer version of this patch but here is easier
for me to comment... I have also put maintainer of NAS325 board in
CC.
On Thu, Apr 26, 2012 at 11:23:58AM +0100, Jamie Lentin wrote:
This patch adds support for D-Link DNS-320 ShareCenter NAS.
...
+#ifdef CONFIG_RESET_PHY_R
+/* Configure and initialize PHY */
+void reset_phy(void)
+{
+ u16 reg;
+ u16 devadr;
+ char *name = egiga0;
+
+ if (miiphy_set_current_dev(name))
+ return;
+
+ /* command to read PHY dev address */
+ if (miiphy_read(name, 0xEE, 0xEE, (u16 *) devadr)) {
+ printf(Err..(%s) could not read PHY dev address\n, __func__);
+ return;
+ }
+
+ /*
+* Enable RGMII delay on Tx and Rx for CPU port
+* Ref: sec 4.7.2 of chip datasheet
+*/
+ miiphy_write(name, devadr, MV88E1116_PGADR_REG, 2);
+ miiphy_read(name, devadr, MV88E1116_MAC_CTRL_REG, reg);
+ reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL);
+ miiphy_write(name, devadr, MV88E1116_MAC_CTRL_REG, reg);
+ miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0);
+
+ /* reset the phy */
+ miiphy_reset(name, devadr);
+
+ debug(88E1116 Initialized on %s\n, name);
+}
+#endif /* CONFIG_RESET_PHY_R */
Are you sure you need this CONFIG_RESET_PHY_R at all? I mean I have the
same SoC and I do not need this at all. I think this part is left over
from other boards that we do not need anymore. It makes sense to remove
this if you do not need it on your board.
Take a look here:
http://git.denx.de/?p=u-boot/u-boot-arm.git;a=blob;f=board/raidsonic/ib62x0/ib62x0.c;h=65f2c2ea6a0415b0f508bc078528884e526dd201;hb=HEAD
I've fiddled for a while and cannot get a working Ethernet connection
without this code to enable RGMII delay. Tried cloning configs/ib62x0.h,
but no luck. Presumably you have the same PHY chip (88E1116R-NNC1) too?
Agree that it's a copy and pasted chunk of code that shouldn't be there
though and at least should find a common home somewhere.
Luka
--
Jamie Lentin
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] kirkwood: Rename dns325 to dnskw
So we can re-use DNS-325 configuration for the DNS-320 without things getting
confusing, rename all common parts from dns325 to dnskw, and use a config
option to configure DNS-325 specifics.
Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
---
board/d-link/{dns325 = dnskw}/Makefile|2 +-
board/d-link/{dns325/dns325.c = dnskw/dnskw.c}| 10
board/d-link/{dns325/dns325.h = dnskw/dnskw.h}| 24
.../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |0
boards.cfg |2 +-
include/configs/{dns325.h = dnskw.h} | 11 ++---
6 files changed, 29 insertions(+), 20 deletions(-)
rename board/d-link/{dns325 = dnskw}/Makefile (98%)
rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (94%)
rename board/d-link/{dns325/dns325.h = dnskw/dnskw.h} (73%)
rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
rename include/configs/{dns325.h = dnskw.h} (95%)
diff --git a/board/d-link/dns325/Makefile b/board/d-link/dnskw/Makefile
similarity index 98%
rename from board/d-link/dns325/Makefile
rename to board/d-link/dnskw/Makefile
index 35da21a..174127e 100644
--- a/board/d-link/dns325/Makefile
+++ b/board/d-link/dnskw/Makefile
@@ -30,7 +30,7 @@ include $(TOPDIR)/config.mk
LIB= $(obj)lib$(BOARD).o
-COBJS := dns325.o
+COBJS := dnskw.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dnskw/dnskw.c
similarity index 94%
rename from board/d-link/dns325/dns325.c
rename to board/d-link/dnskw/dnskw.c
index 990d79f..28ce1ba 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -33,15 +33,15 @@
#include asm/arch/kirkwood.h
#include asm/arch/mpp.h
#include asm/arch/gpio.h
-#include dns325.h
+#include dnskw.h
DECLARE_GLOBAL_DATA_PTR;
int board_early_init_f(void)
{
/* Gpio configuration */
- kw_config_gpio(DNS325_OE_VAL_LOW, DNS325_OE_VAL_HIGH,
- DNS325_OE_LOW, DNS325_OE_HIGH);
+ kw_config_gpio(DNSKW_OE_VAL_LOW, DNSKW_OE_VAL_HIGH,
+ DNSKW_OE_LOW, DNSKW_OE_HIGH);
/* Multi-Purpose Pins Functionality configuration */
u32 kwmpp_config[] = {
@@ -99,9 +99,9 @@ int board_early_init_f(void)
};
kirkwood_mpp_conf(kwmpp_config);
- kw_gpio_set_blink(DNS325_GPIO_LED_POWER , 1);
+ kw_gpio_set_blink(DNSKW_GPIO_LED_POWER , 1);
- kw_gpio_set_value(DNS325_GPIO_SATA0_EN , 1);
+ kw_gpio_set_value(DNSKW_GPIO_SATA0_EN , 1);
return 0;
}
diff --git a/board/d-link/dns325/dns325.h b/board/d-link/dnskw/dnskw.h
similarity index 73%
rename from board/d-link/dns325/dns325.h
rename to board/d-link/dnskw/dnskw.h
index 7859cea..4b11cb6 100644
--- a/board/d-link/dns325/dns325.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -26,18 +26,22 @@
* MA 02110-1301 USA
*/
-#ifndef __DNS325_H
-#define __DNS325_H
+#ifndef __DNSKW_H
+#define __DNSKW_H
/* GPIO configuration */
-#define DNS325_OE_LOW 0x
-#define DNS325_OE_HIGH 0x00039604
-#define DNS325_OE_VAL_LOW 0x3800 /* disable leds */
-#define DNS325_OE_VAL_HIGH 0x0800 /* disable leds */
+#define DNSKW_OE_LOW 0x
+#define DNSKW_OE_HIGH 0x00039604
-#define DNS325_GPIO_LED_POWER 26
-#define DNS325_GPIO_SATA0_EN 39
-#define DNS325_GPIO_SATA1_EN 40
+#define DNSKW_GPIO_LED_POWER 26
+#define DNSKW_GPIO_SATA0_EN39
+#define DNSKW_GPIO_SATA1_EN40
+
+/* DNS-325 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS325
+#define DNSKW_OE_VAL_LOW 0x3800 /* disable leds */
+#define DNSKW_OE_VAL_HIGH 0x0800 /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS325 */
/* PHY related */
#define MV88E1116_MAC_CTRL_REG 21
@@ -45,4 +49,4 @@
#define MV88E1116_RGMII_TXTM_CTRL (1 4)
#define MV88E1116_RGMII_RXTM_CTRL (1 5)
-#endif /* __DNS325_H */
+#endif /* __DNSKW_H */
diff --git a/board/d-link/dns325/kwbimage.cfg
b/board/d-link/dnskw/kwbimage.dns325.cfg
similarity index 100%
rename from board/d-link/dns325/kwbimage.cfg
rename to board/d-link/dnskw/kwbimage.dns325.cfg
diff --git a/boards.cfg b/boards.cfg
index 3cf75c3..f7ffa9b 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -136,7 +136,7 @@ hawkboardarm arm926ejs
da8xxevmdavinci
hawkboard_uart arm arm926ejs da8xxevm
davincidavinci hawkboard:UART_U_BOOT
enbw_cmc arm arm926ejs enbw_cmcenbw
davinci
calimain arm arm926ejs calimain
omicrondavinci
-dns325 arm arm926ejs
[U-Boot] [PATCH 2/2] kirkwood: Add support for the D-Link DNS-320
Extend dnskw to support the D-Link DNS-320 ShareCenter NAS also. For more information on this NAS, see:- http://jamie.lentin.co.uk/devices/dlink-dns320 http://dns323.kood.org/dns-320 http://sharecenter.dlink.com/products/DNS-320 Signed-off-by: Jamie Lentin j...@lentin.co.uk Cc: prafu...@marvell.com Cc: albert.u.b...@aribaud.net --- MAINTAINERS|4 + board/d-link/dnskw/dnskw.c |8 +- board/d-link/dnskw/dnskw.h |6 + board/d-link/dnskw/kwbimage.dns320.cfg | 207 boards.cfg |1 + include/configs/dnskw.h| 10 ++ 6 files changed, 232 insertions(+), 4 deletions(-) create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg diff --git a/MAINTAINERS b/MAINTAINERS index 708ded7..0da6384 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -669,6 +669,10 @@ Igor Grinberg grinb...@compulab.co.il cm-t35 ARM ARMV7 (OMAP3xx Soc) +Jamie Lentin j...@lentin.co.uk + + dns320 ARM926EJS (Kirkwood SoC) + Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net dns325 ARM926EJS (Kirkwood SoC) diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c index 28ce1ba..0c0a754 100644 --- a/board/d-link/dnskw/dnskw.c +++ b/board/d-link/dnskw/dnskw.c @@ -58,8 +58,8 @@ int board_early_init_f(void) MPP10_UART0_TXD, MPP11_UART0_RXD, MPP12_SD_CLK, - MPP13_SD_CMD, - MPP14_SD_D0, + MPP13_UART1_TXD,/* Custom ...*/ + MPP14_UART1_RXD,/* ... controller */ MPP15_SD_D1, MPP16_SD_D2, MPP17_SD_D3, @@ -74,13 +74,13 @@ int board_early_init_f(void) MPP26_GPIO, /* power led */ MPP27_GPIO, /* sata0(right) error led */ MPP28_GPIO, /* sata1(left) error led */ - MPP29_GPIO, /* usb error led */ + MPP29_GPIO, /* usb error led (dns-325) */ MPP30_GPIO, MPP31_GPIO, MPP32_GPIO, MPP33_GPIO, MPP34_GPIO, /* power key */ - MPP35_GPIO, + MPP35_GPIO, /* usb error led (dns-320) */ MPP36_GPIO, MPP37_GPIO, MPP38_GPIO, diff --git a/board/d-link/dnskw/dnskw.h b/board/d-link/dnskw/dnskw.h index 4b11cb6..8886050 100644 --- a/board/d-link/dnskw/dnskw.h +++ b/board/d-link/dnskw/dnskw.h @@ -43,6 +43,12 @@ #define DNSKW_OE_VAL_HIGH 0x0800 /* disable leds */ #endif /* CONFIG_BOARD_IS_DNS325 */ +/* DNS-320 specific configuration */ +#ifdef CONFIG_BOARD_IS_DNS320 +#define DNSKW_OE_VAL_LOW 0x3800 /* disable leds */ +#define DNSKW_OE_VAL_HIGH 0x0808 /* disable leds */ +#endif /* CONFIG_BOARD_IS_DNS320 */ + /* PHY related */ #define MV88E1116_MAC_CTRL_REG 21 #define MV88E1116_PGADR_REG22 diff --git a/board/d-link/dnskw/kwbimage.dns320.cfg b/board/d-link/dnskw/kwbimage.dns320.cfg new file mode 100644 index 000..5fb4052 --- /dev/null +++ b/board/d-link/dnskw/kwbimage.dns320.cfg @@ -0,0 +1,207 @@ +# +# Copyright (C) 2012 +# Jamie Lentin j...@lentin.co.uk +# +# Based on dns325 support: +# Copyright (C) 2011 +# Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net +# +# 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 +# +# Refer docs/README.kwimage for more details about how-to configure +# and create kirkwood boot image +# + +# Boot Media configurations +BOOT_FROM nand +NAND_ECC_MODE default +NAND_PAGE_SIZE 0x0800 + +# SOC registers configuration using bootrom header extension +# Maximum KWBIMAGE_MAX_CONFIG configurations allowed + +# Configure RGMII-0 interface pad voltage to 1.8V +DATA 0xFFD100e0 0x1b1b1b9b + +#Dram initalization for SINGLE x16 CL=3 @ 200MHz +DATA 0xFFD01400 0x43000618 # DDR Configuration register +# bit13-0: 0x618 DDR2 clks refresh rate +# bit23-14: 0 required +# bit24:1 enable exit self refresh mode on DDR access +# bit25:1 required
[U-Boot] [PATCH 0/2] Generalise dns325 support and include dns320
As suggested by Prafulla Wadaskar, generalise dns325 support so that the dns320
can be supported by the same code.
NB: The patch uses git renaming to change dns325 to dnskw, so cannot be applied
with regular patch(1). Let me know if I shouldn't be submitting in this form.
Jamie Lentin (2):
kirkwood: Rename dns325 to dnskw
kirkwood: Add support for the D-Link DNS-320
MAINTAINERS|4 +
board/d-link/{dns325 = dnskw}/Makefile|2 +-
board/d-link/{dns325/dns325.c = dnskw/dnskw.c}| 18 +-
board/d-link/{dns325/dns325.h = dnskw/dnskw.h}| 30 ++-
board/d-link/dnskw/kwbimage.dns320.cfg | 207
.../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |0
boards.cfg |3 +-
include/configs/{dns325.h = dnskw.h} | 21 +-
8 files changed, 261 insertions(+), 24 deletions(-)
rename board/d-link/{dns325 = dnskw}/Makefile (98%)
rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (90%)
rename board/d-link/{dns325/dns325.h = dnskw/dnskw.h} (65%)
create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg
rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
rename include/configs/{dns325.h = dnskw.h} (89%)
--
1.7.10
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] kirkwood: add support for D-Link DNS-320
This patch adds support for D-Link DNS-320 ShareCenter NAS.
Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
---
This patch is heavily based on Stefan's work for the DNS-325 port, the
main difference being the memory timings. I've tested this on my board against
master (currently v2012.04.01) and network, USB, serial all seem to work fine.
Any comments appreciated!
MAINTAINERS |4 +
board/d-link/dns320/Makefile | 48 +
board/d-link/dns320/dns320.c | 147 +++
board/d-link/dns320/dns320.h | 47 +
board/d-link/dns320/kwbimage.cfg | 207 ++
boards.cfg |1 +
include/configs/dns320.h | 191 +++
7 files changed, 645 insertions(+)
create mode 100644 board/d-link/dns320/Makefile
create mode 100644 board/d-link/dns320/dns320.c
create mode 100644 board/d-link/dns320/dns320.h
create mode 100644 board/d-link/dns320/kwbimage.cfg
create mode 100644 include/configs/dns320.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 708ded7..0da6384 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -669,6 +669,10 @@ Igor Grinberg grinb...@compulab.co.il
cm-t35 ARM ARMV7 (OMAP3xx Soc)
+Jamie Lentin j...@lentin.co.uk
+
+ dns320 ARM926EJS (Kirkwood SoC)
+
Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
dns325 ARM926EJS (Kirkwood SoC)
diff --git a/board/d-link/dns320/Makefile b/board/d-link/dns320/Makefile
new file mode 100644
index 000..83906fa
--- /dev/null
+++ b/board/d-link/dns320/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2012
+# Jamie Lentin j...@lentin.co.uk
+#
+# Based on dns325 support:
+# Copyright (C) 2011
+# Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
+#
+# 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
+#
+
+include $(TOPDIR)/config.mk
+
+LIB= $(obj)lib$(BOARD).o
+
+COBJS := dns320.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):$(obj).depend $(OBJS) $(SOBJS)
+ $(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+#
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#
diff --git a/board/d-link/dns320/dns320.c b/board/d-link/dns320/dns320.c
new file mode 100644
index 000..23c945e
--- /dev/null
+++ b/board/d-link/dns320/dns320.c
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2012
+ * Jamie Lentin j...@lentin.co.uk
+ *
+ * Based on dns325 support:
+ * Copyright (C) 2011
+ * Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
+ *
+ * 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
+ */
+
+#include common.h
+#include miiphy.h
+#include netdev.h
+#include asm/arch/cpu.h
+#include asm/arch/kirkwood.h
+#include asm/arch/mpp.h
+#include asm/arch/gpio.h
+#include dns320.h
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_early_init_f(void)
+{
+ /* Gpio configuration */
+ kw_config_gpio(DNS320_OE_VAL_LOW, DNS320_OE_VAL_HIGH,
+ DNS320_OE_LOW, DNS320_OE_HIGH);
+
+ /* Multi-Purpose Pins Functionality configuration */
+ u32 kwmpp_config[] = {
+ MPP0_NF_IO2,
+ MPP1_NF_IO3,
+ MPP2_NF_IO4
Re: [U-Boot] [PATCH] kirkwood: add support for D-Link DNS-320
On Thu, 26 Apr 2012 11:57:36 +0100, Prafulla Wadaskar prafu...@marvell.com wrote: Hi Jamie -Original Message- From: Jamie Lentin [mailto:j...@lentin.co.uk] Sent: 26 April 2012 15:54 To: u-boot@lists.denx.de Cc: Jamie Lentin; Prafulla Wadaskar; albert.u.b...@aribaud.net Subject: [PATCH] kirkwood: add support for D-Link DNS-320 May you please post here a link/URL available for this board info? Was there anything in particular you wanted to see? Some general URLs:- http://jamie.lentin.co.uk/devices/dlink-dns320 http://dns323.kood.org/dns-320 http://sharecenter.dlink.com/products/DNS-320 This patch adds support for D-Link DNS-320 ShareCenter NAS. Signed-off-by: Jamie Lentin j...@lentin.co.uk Cc: prafu...@marvell.com Cc: albert.u.b...@aribaud.net --- This patch is heavily based on Stefan's work for the DNS-325 port, the main difference being the memory timings. If the diff against DNS-325 is not much, then you can re-use DNS-325 files instead of adding new one. I would like to suggest this method Please check boards.cfg how OPENRD boards are supported. Okay, I think I've got this going. Will send it on once I've tested on both NASes. It would seem sensible to me to rename the common parts from dns325 to dnskw (as in kirkwood-based-DNS, there are also orion-based-DNSes). Should I send a patch to do this too, or would you rather keep the original dns325 board name? Regards.. Prafulla . . . Thanks for looking it over! -- Jamie Lentin ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
