* [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board
@ 2014-05-22 19:13 Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 1/4] kirkwood: Rename dns325 to dnskw Bastien ROUCARIÈS
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Bastien ROUCARIÈS @ 2014-05-22 19:13 UTC (permalink / raw)
To: u-boot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Hi,
A rebase of an old patch set from Jamie Lentin.
Source is available here:
http://jamie.lentin.co.uk/devices/dlink-dns325/
Please apply
Changelog:
[V2] Use git option -M
[V3] Fix a mismerge in boards.cfg
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Jamie Lentin <jm@lentin.co.uk>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
Jamie Lentin (4):
kirkwood: Rename dns325 to dnskw
kirkwood: Add support for the D-Link DNS-320
kirkwood: Set unused SD pins back to GPIO for DNS-320 & DNS-325
kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320
board/d-link/dns325/dns325.h | 32 ----
board/d-link/{dns325 => dnskw}/Makefile | 2 +-
board/d-link/{dns325/dns325.c => dnskw/dnskw.c} | 30 +--
board/d-link/dnskw/dnskw.h | 42 +++++
board/d-link/dnskw/kwbimage.dns320.cfg | 207 +++++++++++++++++++++
.../kwbimage.cfg => dnskw/kwbimage.dns325.cfg} | 0
boards.cfg | 3 +-
include/configs/{dns325.h => dnskw.h} | 23 ++-
8 files changed, 286 insertions(+), 53 deletions(-)
delete mode 100644 board/d-link/dns325/dns325.h
rename board/d-link/{dns325 => dnskw}/Makefile (93%)
rename board/d-link/{dns325/dns325.c => dnskw/dnskw.c} (84%)
create mode 100644 board/d-link/dnskw/dnskw.h
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} (86%)
--
2.0.0.rc2
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v3: DNS320 support 1/4] kirkwood: Rename dns325 to dnskw
2014-05-22 19:13 [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board Bastien ROUCARIÈS
@ 2014-05-22 19:13 ` Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 2/4] kirkwood: Add support for the D-Link DNS-320 Bastien ROUCARIÈS
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Bastien ROUCARIÈS @ 2014-05-22 19:13 UTC (permalink / raw)
To: u-boot
From: Jamie Lentin <jm@lentin.co.uk>
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 <jm@lentin.co.uk>
Cc: prafulla at marvell.com
Cc: albert.u.boot at 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 (93%)
rename board/d-link/{dns325/dns325.c => dnskw/dnskw.c} (93%)
rename board/d-link/{dns325/dns325.h => dnskw/dnskw.h} (52%)
rename board/d-link/{dns325/kwbimage.cfg => dnskw/kwbimage.dns325.cfg} (100%)
rename include/configs/{dns325.h => dnskw.h} (94%)
diff --git a/board/d-link/dns325/Makefile b/board/d-link/dnskw/Makefile
similarity index 93%
rename from board/d-link/dns325/Makefile
rename to board/d-link/dnskw/Makefile
index b8a5ea1..85cebf7 100644
--- a/board/d-link/dns325/Makefile
+++ b/board/d-link/dnskw/Makefile
@@ -10,4 +10,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-y := dns325.o
+obj-y := dnskw.o
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dnskw/dnskw.c
similarity index 93%
rename from board/d-link/dns325/dns325.c
rename to board/d-link/dnskw/dnskw.c
index ff70e94..22b0ffb 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -17,15 +17,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 */
static const u32 kwmpp_config[] = {
@@ -83,9 +83,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 52%
rename from board/d-link/dns325/dns325.h
rename to board/d-link/dnskw/dnskw.h
index f7b25f2..8d2e2b1 100644
--- a/board/d-link/dns325/dns325.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -10,18 +10,22 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef __DNS325_H
-#define __DNS325_H
+#ifndef __DNSKW_H
+#define __DNSKW_H
/* GPIO configuration */
-#define DNS325_OE_LOW 0x00000000
-#define DNS325_OE_HIGH 0x00039604
-#define DNS325_OE_VAL_LOW 0x38000000 /* disable leds */
-#define DNS325_OE_VAL_HIGH 0x00000800 /* disable leds */
+#define DNSKW_OE_LOW 0x00000000
+#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_EN 39
+#define DNSKW_GPIO_SATA1_EN 40
+
+/* DNS-325 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS325
+#define DNSKW_OE_VAL_LOW 0x38000000 /* disable leds */
+#define DNSKW_OE_VAL_HIGH 0x00000800 /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS325 */
/* PHY related */
#define MV88E1116_MAC_CTRL_REG 21
@@ -29,4 +33,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 0497a91..2c555da 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -168,7 +168,7 @@ Active arm arm926ejs davinci omicron calimain
Active arm arm926ejs kirkwood buffalo lsxl lschlv2 lsxl:LSCHLV2 Michael Walle <michael@walle.cc>
Active arm arm926ejs kirkwood buffalo lsxl lsxhl lsxl:LSXHL Michael Walle <michael@walle.cc>
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 d-link dnskw dns325 dnskw:BOARD_IS_DNS325 Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
Active arm arm926ejs kirkwood iomega - iconnect - 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>
diff --git a/include/configs/dns325.h b/include/configs/dnskw.h
similarity index 94%
rename from include/configs/dns325.h
rename to include/configs/dnskw.h
index 96db44f..b415216 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dnskw.h
@@ -10,16 +10,21 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef _CONFIG_DNS325_H
-#define _CONFIG_DNS325_H
+#ifndef _CONFIG_DNSKW_H
+#define _CONFIG_DNSKW_H
/*
* Machine number definition
*/
+#ifdef CONFIG_BOARD_IS_DNS325
#define MACH_TYPE_DNS325 3800
#define CONFIG_MACH_TYPE MACH_TYPE_DNS325
#define CONFIG_IDENT_STRING "\nD-Link DNS-325"
+#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.dns325.cfg
+
+#endif /* CONFIG_BOARD_IS_DNS325 */
+
/*
* High Level Configuration Options (easy to change)
*/
@@ -167,4 +172,4 @@
"fi;" \
"run setnandbootenv subbootcmd;"
-#endif /* _CONFIG_DNS325_H */
+#endif /* _CONFIG_DNSKW_H */
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v3: DNS320 support 2/4] kirkwood: Add support for the D-Link DNS-320
2014-05-22 19:13 [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 1/4] kirkwood: Rename dns325 to dnskw Bastien ROUCARIÈS
@ 2014-05-22 19:13 ` Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 3/4] kirkwood: Set unused SD pins back to GPIO for DNS-320 & DNS-325 Bastien ROUCARIÈS
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Bastien ROUCARIÈS @ 2014-05-22 19:13 UTC (permalink / raw)
To: u-boot
From: Jamie Lentin <jm@lentin.co.uk>
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
Changes since V1:
* Shorten CONFIG_IDENT_STRING [Prafulla Wadaskar]
Changes since V2:
* Correct a mismerge conflict
Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
Cc: prafulla at marvell.com
Cc: albert.u.boot at aribaud.net
Cc: stefan at herbrechtsmeier.net
---
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 ++
5 files changed, 228 insertions(+), 4 deletions(-)
create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg
diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index 22b0ffb..a9fa9a2 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -42,8 +42,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,
@@ -58,13 +58,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 8d2e2b1..f87f02c 100644
--- a/board/d-link/dnskw/dnskw.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -27,6 +27,12 @@
#define DNSKW_OE_VAL_HIGH 0x00000800 /* disable leds */
#endif /* CONFIG_BOARD_IS_DNS325 */
+/* DNS-320 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS320
+#define DNSKW_OE_VAL_LOW 0x38000000 /* disable leds */
+#define DNSKW_OE_VAL_HIGH 0x00000808 /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS320 */
+
/* PHY related */
#define MV88E1116_MAC_CTRL_REG 21
#define MV88E1116_PGADR_REG 22
diff --git a/board/d-link/dnskw/kwbimage.dns320.cfg b/board/d-link/dnskw/kwbimage.dns320.cfg
new file mode 100644
index 0000000..b515bf2
--- /dev/null
+++ b/board/d-link/dnskw/kwbimage.dns320.cfg
@@ -0,0 +1,207 @@
+#
+# Copyright (C) 2012
+# Jamie Lentin <jm@lentin.co.uk>
+#
+# Based on dns325 support:
+# Copyright (C) 2011
+# Stefan Herbrechtsmeier <stefan@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
+# bit29-26: 0 required
+# bit31-30: 0b01 required
+
+DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
+# bit3-0: 0 required
+# bit4: 0, addr/cmd in smame cycle
+# bit5: 0, clk is driven during self refresh, we don't care for APX
+# bit6: 0, use recommended falling edge of clk for addr/cmd
+# bit11-7: 0 required
+# bit12: 1 required
+# bit13: 1 required
+# bit14: 0, input buffer always powered up
+# bit17-15: 0 required
+# bit18: 1, cpu lock transaction enabled
+# bit19: 0 required
+# bit23-20: 1, Recommended for CL 3 and STARTBURST_DEL disabled
+# bit27-24: 5, CL + 2
+# bit30-28: 3 required
+# bit31: 0, no additional STARTBURST delay
+
+DATA 0xFFD01408 0x11012227 # DDR Timing (Low)
+# bit3-0: 7, 8 cycle tRAS (tRAS[3-0])
+# bit7-4: 2, 3 cycle tRCD
+# bit11-8: 2, 3 cycle tRP
+# bit15-12: 2, 3 cycle tWR
+# bit19-16: 1, 2 cycle tWTR
+# bit20: 1, 2 cycle tRAS (tRAS[4])
+# bit23-21: 0 required
+# bit27-24: 1, 2 cycle tRRD
+# bit31-28: 1, 2 cycle tRTP
+
+DATA 0xFFD0140C 0x00000819 # DDR Timing (High)
+# bit6-0: 0x19, 20 cycle tRFC
+# bit8-7: 0, 1 cycle tR2bR
+# bit10-9: 0, 1 cycle tR2W
+# bit12-11: 1, 1 cycle tW2W gap
+# bit31-13: 0 required
+
+DATA 0xFFD01410 0x00000008 # DDR Address Control
+# bit1-0: 0, Cs0width=x8 (out of spec?)
+# bit3-2: 2, Cs0size=512Mb
+# bit5-4: 0, Cs1width=nonexistent
+# bit7-6: 0, Cs1size=nonexistent
+# bit9-8: 0, Cs2width=nonexistent
+# bit11-10: 0, Cs2size=nonexistent
+# bit13-12: 0, Cs3width=nonexistent
+# bit15-14: 0, Cs3size=nonexistent
+# bit16: 0, Cs0AddrSel
+# bit17: 0, Cs1AddrSel
+# bit18: 0, Cs2AddrSel
+# bit19: 0, Cs3AddrSel
+# bit31-20: 0 required
+
+DATA 0xFFD01414 0x00000000 # DDR Open Pages Control
+# bit0: 0, OPEn=OpenPage enabled
+# bit31-1: 0 required
+
+DATA 0xFFD01418 0x00000000 # DDR Operation
+# bit3-0: 0, Cmd=Normal SDRAM Mode
+# bit31-4: 0 required
+
+DATA 0xFFD0141C 0x00000632 # DDR Mode
+# bit2-0: 2, Burst Length (2 required)
+# bit3: 0, Burst Type (0 required)
+# bit6-4: 3, CAS Latency (CL) 3
+# bit7: 0, (Test Mode) Normal operation
+# bit8: 0, (Reset DLL) Normal operation
+# bit11-9: 3, Write recovery for auto-precharge (3 required)
+# bit12: 0, Fast Active power down exit time (0 required)
+# bit31-13: 0 required
+
+DATA 0xFFD01420 0x00000040 # DDR Extended Mode
+# bit0: 0, DRAM DLL enabled
+# bit1: 0, DRAM drive strength normal
+# bit2: 0, ODT control Rtt[0] (Rtt=2, 150 ohm termination)
+# bit5-3: 0 required
+# bit6: 1, ODT control Rtt[1] (Rtt=2, 150 ohm termination)
+# bit9-7: 0 required
+# bit10: 0, differential DQS enabled
+# bit11: 0 required
+# bit12: 0, DRAM output buffer enabled
+# bit31-13: 0 required
+
+DATA 0xFFD01424 0x0000F07F # DDR Controller Control High
+# bit2-0: 0x7 required
+# bit3: 1, MBUS Burst Chop disabled
+# bit6-4: 0x7 required
+# bit7: 0 required
+# bit8: 0, no add writepath sample stage
+# bit9: 0, no half clock cycle addition to dataout
+# bit10: 0, 1/4 clock cycle skew enabled for addr/ctl signals
+# bit11: 0, 1/4 clock cycle skew disabled for write mesh
+# bit15-12: 0xf required
+# bit31-16: 0 required
+
+DATA 0xFFD01428 0x00085520 # DDR2 ODT Read Timing
+# bit3-0: 0 required
+# bit7-4: 2, 2 cycles from read command to assertion of M_ODT signal
+# bit11-8: 5, 5 cycles from read command to de-assertion of M_ODT signal
+# bit15-12: 5, 5 cycles from read command to assertion of internal ODT signal
+# bit19-16: 8, 8 cycles from read command to de-assertion of internal ODT signal
+# bit31-20: 0 required
+
+DATA 0xFFD0147C 0x00008552 # DDR2 ODT Write Timing
+# bit3-0: 2, 2 cycles from write comand to assertion of M_ODT signal
+# bit7-4: 5, 5 cycles from write command to de-assertion of M_ODT signal
+# bit15-12: 5, 5 cycles from write command to assertion of internal ODT signal
+# bit19-16: 8, 8 cycles from write command to de-assertion of internal ODT signal
+# bit31-16: 0 required
+
+DATA 0xFFD01500 0x00000000 # CS[0]n Base address to 0x0
+DATA 0xFFD01504 0x07FFFFF1 # CS[0]n Size
+# bit0: 1, Window enabled
+# bit1: 0, Write Protect disabled
+# bit3-2: 0x0, CS0 hit selected
+# bit23-4: 0xfffff required
+# bit31-24: 0x07, Size (i.e. 128MB)
+
+DATA 0xFFD01508 0x08000000 # CS[1]n Base address to 128Mb
+DATA 0xFFD0150C 0x0FFFFFF0 # CS[1]n Size, window disabled
+# bit0: 0, Window disabled
+# bit1: 0, Write Protect disabled
+# bit3-2: 0, CS1 hit selected
+# bit23-4: 0xfffff required
+# bit31-24: 0x0f, Size (i.e. 256MB)
+
+DATA 0xFFD01514 0x00000000 # CS[2]n Size, window disabled
+DATA 0xFFD0151C 0x00000000 # CS[3]n Size, window disabled
+
+DATA 0xFFD01494 0x003c0000 # DDR ODT Control (Low)
+# bit3-0: 0b0000, (read) M_ODT[0] is not asserted during read from DRAM
+# bit7-4: 0b0000, (read) M_ODT[1] is not asserted during read from DRAM
+# bit15-8: 0 required
+# bit19-16: 0b1100, (write) M_ODT[0] is asserted during write to DRAM CS2 and CS3
+# bit23-20: 0b0011, (write) M_ODT[1] is asserted during write to DRAM CS0 and CS1
+# bit31-24: 0 required
+
+DATA 0xFFD01498 0x00000000 # DDR ODT Control (High)
+# bit1-0: 0, M_ODT[0] assertion is controlled by ODT Control Low register
+# bit3-2: 0, M_ODT[1] assertion is controlled by ODT Control Low register
+# bit31-4 0 required
+
+DATA 0xFFD0149C 0x0000E803 # CPU ODT Control
+# bit3-0: 0b0011, internal ODT is asserted during read from DRAM bank 0-1
+# bit7-4: 0b0000, internal ODT is not asserted during write to DRAM bank 0-4
+# bit9-8: 0, Internal ODT assertion is controlled by fiels
+# bit11-10: 2, M_DQ, M_DM, and M_DQS I/O buffer ODT 75 ohm
+# bit13-12: 2, M_STARTBURST_IN I/O buffer ODT 75 ohm
+# bit14: 1, M_STARTBURST_IN ODT enabled
+# bit15: 1, DDR IO ODT Unit: Drive ODT calibration values
+# bit20-16: 0, Pad N channel driving strength for ODT
+# bit25-21: 0, Pad P channel driving strength for ODT
+# bit31-26: 0 required
+
+DATA 0xFFD01480 0x00000001 # DDR Initialization Control
+# bit0: 1, enable DDR init upon this register write
+# bit31-1: 0, required
+
+# End of Header extension
+DATA 0x0 0x0
diff --git a/boards.cfg b/boards.cfg
index 2c555da..79999da 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -168,6 +168,7 @@ Active arm arm926ejs davinci omicron calimain
Active arm arm926ejs kirkwood buffalo lsxl lschlv2 lsxl:LSCHLV2 Michael Walle <michael@walle.cc>
Active arm arm926ejs kirkwood buffalo lsxl lsxhl lsxl:LSXHL Michael Walle <michael@walle.cc>
Active arm arm926ejs kirkwood cloudengines - pogo_e02 - Dave Purdy <david.c.purdy@gmail.com>
+Active arm arm926ejs kirkwood d-link dnskw dns320 dnskw:BOARD_IS_DNS320 Jamie Lentin <jm@lentin.co.uk>
Active arm arm926ejs kirkwood d-link dnskw dns325 dnskw:BOARD_IS_DNS325 Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
Active arm arm926ejs kirkwood iomega - iconnect - Luka Perkov <luka@openwrt.org>
Active arm arm926ejs kirkwood karo tk71 tk71 - -
diff --git a/include/configs/dnskw.h b/include/configs/dnskw.h
index b415216..e55fdc4 100644
--- a/include/configs/dnskw.h
+++ b/include/configs/dnskw.h
@@ -25,6 +25,16 @@
#endif /* CONFIG_BOARD_IS_DNS325 */
+#ifdef CONFIG_BOARD_IS_DNS320
+#define MACH_TYPE_DNS320 3985
+#define CONFIG_MACH_TYPE MACH_TYPE_DNS320
+#define CONFIG_IDENT_STRING "\nDNS-320"
+
+#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.dns320.cfg
+#define CONFIG_SYS_TCLK 166666667 /* 800Mhz */
+
+#endif /* CONFIG_BOARD_IS_DNS320 */
+
/*
* High Level Configuration Options (easy to change)
*/
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v3: DNS320 support 3/4] kirkwood: Set unused SD pins back to GPIO for DNS-320 & DNS-325
2014-05-22 19:13 [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 1/4] kirkwood: Rename dns325 to dnskw Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 2/4] kirkwood: Add support for the D-Link DNS-320 Bastien ROUCARIÈS
@ 2014-05-22 19:13 ` Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 4/4] kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320 Bastien ROUCARIÈS
2014-05-24 13:34 ` [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board Stefan Herbrechtsmeier
4 siblings, 0 replies; 8+ messages in thread
From: Bastien ROUCARIÈS @ 2014-05-22 19:13 UTC (permalink / raw)
To: u-boot
From: Jamie Lentin <jm@lentin.co.uk>
Neither device makes any use of the SD reader functionalty, so as
suggested by Stefan Herbrechtsmeier, set the pins to GPIO instead
to make this more obvious. Label MPP10 & MPP11's use whilst here.
Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
Cc: prafulla at marvell.com
Cc: albert.u.boot at aribaud.net
Cc: stefan at herbrechtsmeier.net
---
board/d-link/dnskw/dnskw.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index a9fa9a2..90cb92e 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -39,14 +39,14 @@ int board_early_init_f(void)
MPP7_GPO,
MPP8_TW_SDA,
MPP9_TW_SCK,
- MPP10_UART0_TXD,
- MPP11_UART0_RXD,
- MPP12_SD_CLK,
+ MPP10_UART0_TXD, /* 5 pin ...*/
+ MPP11_UART0_RXD, /* ... console header */
+ MPP12_GPO,
MPP13_UART1_TXD, /* Custom ...*/
MPP14_UART1_RXD, /* ... controller */
- MPP15_SD_D1,
- MPP16_SD_D2,
- MPP17_SD_D3,
+ MPP15_GPIO,
+ MPP16_GPIO,
+ MPP17_GPIO,
MPP18_NF_IO0,
MPP19_NF_IO1,
MPP20_SATA1_ACTn, /* sata1(left) status led */
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v3: DNS320 support 4/4] kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320
2014-05-22 19:13 [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board Bastien ROUCARIÈS
` (2 preceding siblings ...)
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 3/4] kirkwood: Set unused SD pins back to GPIO for DNS-320 & DNS-325 Bastien ROUCARIÈS
@ 2014-05-22 19:13 ` Bastien ROUCARIÈS
2014-05-24 13:34 ` [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board Stefan Herbrechtsmeier
4 siblings, 0 replies; 8+ messages in thread
From: Bastien ROUCARIÈS @ 2014-05-22 19:13 UTC (permalink / raw)
To: u-boot
From: Jamie Lentin <jm@lentin.co.uk>
You should already know you're using a D-link device.
Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
---
include/configs/dnskw.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/dnskw.h b/include/configs/dnskw.h
index e55fdc4..7058873 100644
--- a/include/configs/dnskw.h
+++ b/include/configs/dnskw.h
@@ -19,7 +19,7 @@
#ifdef CONFIG_BOARD_IS_DNS325
#define MACH_TYPE_DNS325 3800
#define CONFIG_MACH_TYPE MACH_TYPE_DNS325
-#define CONFIG_IDENT_STRING "\nD-Link DNS-325"
+#define CONFIG_IDENT_STRING "\nDNS-325"
#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.dns325.cfg
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board
2014-05-22 19:13 [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board Bastien ROUCARIÈS
` (3 preceding siblings ...)
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 4/4] kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320 Bastien ROUCARIÈS
@ 2014-05-24 13:34 ` Stefan Herbrechtsmeier
2014-06-01 14:29 ` Bastien ROUCARIES
4 siblings, 1 reply; 8+ messages in thread
From: Stefan Herbrechtsmeier @ 2014-05-24 13:34 UTC (permalink / raw)
To: u-boot
Am 22.05.2014 21:13, schrieb Bastien ROUCARI?S:
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> Hi,
>
> A rebase of an old patch set from Jamie Lentin.
>
> Source is available here:
> http://jamie.lentin.co.uk/devices/dlink-dns325/
>
> Please apply
>
> Changelog:
> [V2] Use git option -M
> [V3] Fix a mismerge in boards.cfg
>
> Cc: Prafulla Wadaskar <prafulla@marvell.com>
> Cc: Jamie Lentin <jm@lentin.co.uk>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> Cc: Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
>
> Jamie Lentin (4):
> kirkwood: Rename dns325 to dnskw
> kirkwood: Add support for the D-Link DNS-320
> kirkwood: Set unused SD pins back to GPIO for DNS-320 & DNS-325
> kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320
>
> board/d-link/dns325/dns325.h | 32 ----
> board/d-link/{dns325 => dnskw}/Makefile | 2 +-
> board/d-link/{dns325/dns325.c => dnskw/dnskw.c} | 30 +--
> board/d-link/dnskw/dnskw.h | 42 +++++
> board/d-link/dnskw/kwbimage.dns320.cfg | 207 +++++++++++++++++++++
> .../kwbimage.cfg => dnskw/kwbimage.dns325.cfg} | 0
> boards.cfg | 3 +-
> include/configs/{dns325.h => dnskw.h} | 23 ++-
> 8 files changed, 286 insertions(+), 53 deletions(-)
> delete mode 100644 board/d-link/dns325/dns325.h
> rename board/d-link/{dns325 => dnskw}/Makefile (93%)
> rename board/d-link/{dns325/dns325.c => dnskw/dnskw.c} (84%)
> create mode 100644 board/d-link/dnskw/dnskw.h
> 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} (86%)
>
Tested-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Acked-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board
2014-05-24 13:34 ` [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board Stefan Herbrechtsmeier
@ 2014-06-01 14:29 ` Bastien ROUCARIES
2014-06-01 14:41 ` Prafulla Wadaskar
0 siblings, 1 reply; 8+ messages in thread
From: Bastien ROUCARIES @ 2014-06-01 14:29 UTC (permalink / raw)
To: u-boot
On Sat, May 24, 2014 at 3:34 PM, Stefan Herbrechtsmeier
<stefan@herbrechtsmeier.net> wrote:
> Am 22.05.2014 21:13, schrieb Bastien ROUCARI?S:
>
>> MIME-Version: 1.0
>> Content-Type: text/plain; charset=UTF-8
>> Content-Transfer-Encoding: 8bit
>>
>> Hi,
>>
>> A rebase of an old patch set from Jamie Lentin.
>>
>> Source is available here:
>> http://jamie.lentin.co.uk/devices/dlink-dns325/
>>
>> Please apply
>>
>> Changelog:
>> [V2] Use git option -M
>> [V3] Fix a mismerge in boards.cfg
>>
>> Cc: Prafulla Wadaskar <prafulla@marvell.com>
>> Cc: Jamie Lentin <jm@lentin.co.uk>
>> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
>> Cc: Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
>>
>> Jamie Lentin (4):
>> kirkwood: Rename dns325 to dnskw
>> kirkwood: Add support for the D-Link DNS-320
>> kirkwood: Set unused SD pins back to GPIO for DNS-320 & DNS-325
>> kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320
>>
>> board/d-link/dns325/dns325.h | 32 ----
>> board/d-link/{dns325 => dnskw}/Makefile | 2 +-
>> board/d-link/{dns325/dns325.c => dnskw/dnskw.c} | 30 +--
>> board/d-link/dnskw/dnskw.h | 42 +++++
>> board/d-link/dnskw/kwbimage.dns320.cfg | 207
>> +++++++++++++++++++++
>> .../kwbimage.cfg => dnskw/kwbimage.dns325.cfg} | 0
>> boards.cfg | 3 +-
>> include/configs/{dns325.h => dnskw.h} | 23 ++-
>> 8 files changed, 286 insertions(+), 53 deletions(-)
>> delete mode 100644 board/d-link/dns325/dns325.h
>> rename board/d-link/{dns325 => dnskw}/Makefile (93%)
>> rename board/d-link/{dns325/dns325.c => dnskw/dnskw.c} (84%)
>> create mode 100644 board/d-link/dnskw/dnskw.h
>> 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} (86%)
>>
> Tested-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
> Acked-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
It was still not merged. Should I rebase ?
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board
2014-06-01 14:29 ` Bastien ROUCARIES
@ 2014-06-01 14:41 ` Prafulla Wadaskar
0 siblings, 0 replies; 8+ messages in thread
From: Prafulla Wadaskar @ 2014-06-01 14:41 UTC (permalink / raw)
To: u-boot
________________________________________
From: Bastien ROUCARIES [roucaries.bastien at gmail.com]
Sent: Sunday, June 01, 2014 7:59 PM
To: Stefan Herbrechtsmeier
Cc: u-boot at lists.denx.de; Jamie Lentin; Prafulla Wadaskar
Subject: Re: [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board
On Sat, May 24, 2014 at 3:34 PM, Stefan Herbrechtsmeier
<stefan@herbrechtsmeier.net> wrote:
> Am 22.05.2014 21:13, schrieb Bastien ROUCARI?S:
>
>> MIME-Version: 1.0
>> Content-Type: text/plain; charset=UTF-8
>> Content-Transfer-Encoding: 8bit
>>
>> Hi,
>>
>> A rebase of an old patch set from Jamie Lentin.
>>
>> Source is available here:
>> http://jamie.lentin.co.uk/devices/dlink-dns325/
>>
>> Please apply
>>
>> Changelog:
>> [V2] Use git option -M
>> [V3] Fix a mismerge in boards.cfg
>>
>> Cc: Prafulla Wadaskar <prafulla@marvell.com>
>> Cc: Jamie Lentin <jm@lentin.co.uk>
>> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
>> Cc: Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
>>
>> Jamie Lentin (4):
>> kirkwood: Rename dns325 to dnskw
>> kirkwood: Add support for the D-Link DNS-320
>> kirkwood: Set unused SD pins back to GPIO for DNS-320 & DNS-325
>> kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320
>>
>> board/d-link/dns325/dns325.h | 32 ----
>> board/d-link/{dns325 => dnskw}/Makefile | 2 +-
>> board/d-link/{dns325/dns325.c => dnskw/dnskw.c} | 30 +--
>> board/d-link/dnskw/dnskw.h | 42 +++++
>> board/d-link/dnskw/kwbimage.dns320.cfg | 207
>> +++++++++++++++++++++
>> .../kwbimage.cfg => dnskw/kwbimage.dns325.cfg} | 0
>> boards.cfg | 3 +-
>> include/configs/{dns325.h => dnskw.h} | 23 ++-
>> 8 files changed, 286 insertions(+), 53 deletions(-)
>> delete mode 100644 board/d-link/dns325/dns325.h
>> rename board/d-link/{dns325 => dnskw}/Makefile (93%)
>> rename board/d-link/{dns325/dns325.c => dnskw/dnskw.c} (84%)
>> create mode 100644 board/d-link/dnskw/dnskw.h
>> 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} (86%)
>>
> Tested-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
> Acked-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
It was still not merged. Should I rebase ?
No thanks, I need to pull it, will check and pull in this week.
Regards...
Prafulla . . .
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-06-01 14:41 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-22 19:13 [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 1/4] kirkwood: Rename dns325 to dnskw Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 2/4] kirkwood: Add support for the D-Link DNS-320 Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 3/4] kirkwood: Set unused SD pins back to GPIO for DNS-320 & DNS-325 Bastien ROUCARIÈS
2014-05-22 19:13 ` [U-Boot] [PATCH v3: DNS320 support 4/4] kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320 Bastien ROUCARIÈS
2014-05-24 13:34 ` [U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board Stefan Herbrechtsmeier
2014-06-01 14:29 ` Bastien ROUCARIES
2014-06-01 14:41 ` Prafulla Wadaskar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox