* [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices
@ 2012-06-05 23:16 Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 1/4] lacie_kw: add support for EFI partitions Simon Guinot
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Simon Guinot @ 2012-06-05 23:16 UTC (permalink / raw)
To: u-boot
Changes for v2:
- Move board support and feature into a separate patch set.
- Move mach-types update into a separate patch.
Simon Guinot (4):
lacie_kw: add support for EFI partitions
ARM: add netspace_mini_v2 to mach-types.h
ARM: add support for Network Space v2 Lite and Mini
ARM: add support for d2 Network v2
arch/arm/include/asm/mach-types.h | 13 +++
board/LaCie/common/common.c | 36 ++++++-
board/LaCie/common/common.h | 1 +
board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++
board/LaCie/netspace_v2/netspace_v2.c | 4 +
boards.cfg | 3 +
include/configs/lacie_kw.h | 42 ++++++--
7 files changed, 252 insertions(+), 9 deletions(-)
create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
--
1.7.9.5
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v2 1/4] lacie_kw: add support for EFI partitions
2012-06-05 23:16 [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
@ 2012-06-05 23:16 ` Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 2/4] ARM: add netspace_mini_v2 to mach-types.h Simon Guinot
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Guinot @ 2012-06-05 23:16 UTC (permalink / raw)
To: u-boot
Defines CONFIG_EFI_PARTITION for LaCie boards.
Additionally this patch defines CONFIG_DOS_PARTITION. Note that this
definition is implicit in mv_common.h when CONFIG_CMD_USB is enabled.
Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
No changes for v2.
include/configs/lacie_kw.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 4f8bc8f..dc6157d 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -130,6 +130,12 @@
#endif /* CONFIG_CMD_I2C */
/*
+ * Partition support
+ */
+#define CONFIG_DOS_PARTITION
+#define CONFIG_EFI_PARTITION
+
+/*
* File systems support
*/
#define CONFIG_CMD_EXT2
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v2 2/4] ARM: add netspace_mini_v2 to mach-types.h
2012-06-05 23:16 [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 1/4] lacie_kw: add support for EFI partitions Simon Guinot
@ 2012-06-05 23:16 ` Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 3/4] ARM: add support for Network Space v2 Lite and Mini Simon Guinot
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Guinot @ 2012-06-05 23:16 UTC (permalink / raw)
To: u-boot
This patch adds the Network Space Mini v2 machine to mach-types.h.
Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
arch/arm/include/asm/mach-types.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h
index 2d5c3bc..36c108d 100644
--- a/arch/arm/include/asm/mach-types.h
+++ b/arch/arm/include/asm/mach-types.h
@@ -471,6 +471,7 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_EUKREA_CPUIMX35SD 2821
#define MACH_TYPE_EUKREA_CPUIMX51SD 2822
#define MACH_TYPE_EUKREA_CPUIMX51 2823
+#define MACH_TYPE_NETSPACE_MINI_V2 2831
#define MACH_TYPE_SMDKC210 2838
#define MACH_TYPE_OMAP3_BRAILLO 2839
#define MACH_TYPE_SPYPLUG 2840
@@ -6614,6 +6615,18 @@ extern unsigned int __machine_arch_type;
# define machine_is_eukrea_cpuimx51() (0)
#endif
+#ifdef CONFIG_MACH_NETSPACE_MINI_V2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NETSPACE_MINI_V2
+# endif
+# define machine_is_netspace_mini_v2() (machine_arch_type == MACH_TYPE_NETSPACE_MINI_V2)
+#else
+# define machine_is_netspace_mini_v2() (0)
+#endif
+
#ifdef CONFIG_MACH_SMDKC210
# ifdef machine_arch_type
# undef machine_arch_type
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v2 3/4] ARM: add support for Network Space v2 Lite and Mini
2012-06-05 23:16 [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 1/4] lacie_kw: add support for EFI partitions Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 2/4] ARM: add netspace_mini_v2 to mach-types.h Simon Guinot
@ 2012-06-05 23:16 ` Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 4/4] ARM: add support for d2 Network v2 Simon Guinot
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Guinot @ 2012-06-05 23:16 UTC (permalink / raw)
To: u-boot
This patch adds support for the LaCie boards Network Space v2 (Lite and
Mini). This two boards are derived from the Network Space v2 and a lot
of hardware caracteristics are shared.
- CPU: Marvell 88F6192 800Mhz
- SDRAM memory: 128MB DDR2 200Mhz
- 1 SATA port: internal
- Gigabit ethernet: PHY Marvell 88E1318
- Flash memory: SPI NOR 512KB (Macronix MX25L4005A)
- i2c EEPROM: 512 bytes (24C04 type)
- 2 USB2 ports (Lite only): host and host/device
- 1 push button
- 1 SATA LED (bi-color, blue and red)
Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
Changes for v2:
- Move mach-types update into a separate patch.
board/LaCie/common/common.c | 36 ++++++-
board/LaCie/common/common.h | 1 +
board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++
board/LaCie/netspace_v2/netspace_v2.c | 4 +
boards.cfg | 2 +
include/configs/lacie_kw.h | 26 ++++-
6 files changed, 224 insertions(+), 7 deletions(-)
create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
diff --git a/board/LaCie/common/common.c b/board/LaCie/common/common.c
index 78d0edc..a62bf9f 100644
--- a/board/LaCie/common/common.c
+++ b/board/LaCie/common/common.c
@@ -13,10 +13,11 @@
#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
+#define MII_MARVELL_PHY_PAGE 22
+
#define MV88E1116_LED_FCTRL_REG 10
#define MV88E1116_CPRSP_CR3_REG 21
#define MV88E1116_MAC_CTRL_REG 21
-#define MV88E1116_PGADR_REG 22
#define MV88E1116_RGMII_TXTM_CTRL (1 << 4)
#define MV88E1116_RGMII_RXTM_CTRL (1 << 5)
@@ -31,15 +32,44 @@ void mv_phy_88e1116_init(const char *name, u16 phyaddr)
* Enable RGMII delay on Tx and Rx for CPU port
* Ref: sec 4.7.2 of chip datasheet
*/
- miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 2);
+ miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 2);
miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, ®);
reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL);
miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_REG, reg);
- miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 0);
+ miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 0);
if (miiphy_reset(name, phyaddr) == 0)
printf("88E1116 Initialized on %s\n", name);
}
+
+void mv_phy_88e1318_init(const char *name, u16 phyaddr)
+{
+ u16 reg;
+
+ if (miiphy_set_current_dev(name))
+ return;
+
+ /*
+ * Set control mode 4 for LED[0].
+ */
+ miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 3);
+ miiphy_read(name, phyaddr, 16, ®);
+ reg |= 0xf;
+ miiphy_write(name, phyaddr, 16, reg);
+
+ /*
+ * Enable RGMII delay on Tx and Rx for CPU port
+ * Ref: sec 4.7.2 of chip datasheet
+ */
+ miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 2);
+ miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, ®);
+ reg |= (MV88E1116_RGMII_TXTM_CTRL | MV88E1116_RGMII_RXTM_CTRL);
+ miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_REG, reg);
+ miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 0);
+
+ if (miiphy_reset(name, phyaddr) == 0)
+ printf("88E1318 Initialized on %s\n", name);
+}
#endif /* CONFIG_CMD_NET && CONFIG_RESET_PHY_R */
#if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR)
diff --git a/board/LaCie/common/common.h b/board/LaCie/common/common.h
index 2edd5ab..85e433c 100644
--- a/board/LaCie/common/common.h
+++ b/board/LaCie/common/common.h
@@ -12,6 +12,7 @@
#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
void mv_phy_88e1116_init(const char *name, u16 phyaddr);
+void mv_phy_88e1318_init(const char *name, u16 phyaddr);
#endif
#if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR)
int lacie_read_mac_address(uchar *mac);
diff --git a/board/LaCie/netspace_v2/kwbimage-ns2l.cfg b/board/LaCie/netspace_v2/kwbimage-ns2l.cfg
new file mode 100644
index 0000000..d008eb0
--- /dev/null
+++ b/board/LaCie/netspace_v2/kwbimage-ns2l.cfg
@@ -0,0 +1,162 @@
+#
+# Copyright (C) 2011 Simon Guinot <sguinot@lacie.com>
+#
+# Based on Kirkwood support:
+# (C) Copyright 2009
+# Marvell Semiconductor <www.marvell.com>
+# Written-by: Prafulla Wadaskar <prafulla@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.
+#
+# Refer docs/README.kwimage for more details about how-to configure
+# and create kirkwood boot image
+#
+
+# Boot Media configurations
+BOOT_FROM spi # Boot from SPI flash
+
+# 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=5 @ 400MHz
+DATA 0xFFD01400 0x43000618 # DDR Configuration register
+# bit13-0: 0xa00 (2560 DDR2 clks refresh rate)
+# bit23-14: zero
+# bit24: 1= enable exit self refresh mode on DDR access
+# bit25: 1 required
+# bit29-26: zero
+# bit31-30: 01
+
+DATA 0xFFD01404 0x34143000 # DDR Controller Control Low
+# bit 4: 0=addr/cmd in smame cycle
+# bit 5: 0=clk is driven during self refresh, we don't care for APX
+# bit 6: 0=use recommended falling edge of clk for addr/cmd
+# bit14: 0=input buffer always powered up
+# bit18: 1=cpu lock transaction enabled
+# bit23-20: 5=recommended value for CL=5 and STARTBURST_DEL disabled bit31=0
+# bit27-24: 8= CL+3, STARTBURST sample stages, for freqs 400MHz, unbuffered DIMM
+# bit30-28: 3 required
+# bit31: 0=no additional STARTBURST delay
+
+DATA 0xFFD01408 0x11012228 # DDR Timing (Low) (active cycles value +1)
+# bit7-4: TRCD
+# bit11- 8: TRP
+# bit15-12: TWR
+# bit19-16: TWTR
+# bit20: TRAS msb
+# bit23-21: 0x0
+# bit27-24: TRRD
+# bit31-28: TRTP
+
+DATA 0xFFD0140C 0x00000A19 # DDR Timing (High)
+# bit6-0: TRFC
+# bit8-7: TR2R
+# bit10-9: TR2W
+# bit12-11: TW2W
+# bit31-13: zero required
+
+DATA 0xFFD01410 0x0000DDDD # DDR Address Control
+# bit1-0: 00, Cs0width=x8
+# bit3-2: 10, Cs0size=512Mb
+# bit5-4: 00, Cs2width=nonexistent
+# bit7-6: 00, Cs1size =nonexistent
+# bit9-8: 00, Cs2width=nonexistent
+# bit11-10: 00, Cs2size =nonexistent
+# bit13-12: 00, Cs3width=nonexistent
+# bit15-14: 00, 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, OpenPage enabled
+# bit31-1: 0 required
+
+DATA 0xFFD01418 0x00000000 # DDR Operation
+# bit3-0: 0x0, DDR cmd
+# bit31-4: 0 required
+
+DATA 0xFFD0141C 0x00000632 # DDR Mode
+# bit2-0: 2, BurstLen=2 required
+# bit3: 0, BurstType=0 required
+# bit6-4: 4, CL=5
+# bit7: 0, TestMode=0 normal
+# bit8: 0, DLL reset=0 normal
+# bit11-9: 6, auto-precharge write recovery ????????????
+# bit12: 0, PD must be zero
+# bit31-13: 0 required
+
+DATA 0xFFD01420 0x00000004 # DDR Extended Mode
+# bit0: 0, DDR DLL enabled
+# bit1: 1, DDR drive strenght reduced
+# bit2: 1, DDR ODT control lsd enabled
+# bit5-3: 000, required
+# bit6: 1, DDR ODT control msb, enabled
+# bit9-7: 000, required
+# bit10: 0, differential DQS enabled
+# bit11: 0, required
+# bit12: 0, DDR output buffer enabled
+# bit31-13: 0 required
+
+DATA 0xFFD01424 0x0000F07F # DDR Controller Control High
+# bit2-0: 111, required
+# bit3 : 1 , MBUS Burst Chop disabled
+# bit6-4: 111, required
+# bit7 : 1 , D2P Latency enabled
+# bit8 : 1 , add writepath sample stage, must be 1 for DDR freq >= 300MHz
+# 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: 1111 required
+# bit31-16: 0 required
+
+DATA 0xFFD01428 0x00085520 # DDR2 ODT Read Timing (default values)
+DATA 0xFFD0147C 0x00008552 # DDR2 ODT Write Timing (default values)
+
+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: 00, CS0 hit selected
+# bit23-4: ones, required
+# bit31-24: 0x07, Size (i.e. 128MB)
+
+DATA 0xFFD0150C 0x00000000 # CS[1]n Size, window disabled
+DATA 0xFFD01514 0x00000000 # CS[2]n Size, window disabled
+DATA 0xFFD0151C 0x00000000 # CS[3]n Size, window disabled
+
+DATA 0xFFD01494 0x00010000 # DDR ODT Control (Low)
+# bit3-0: 1, ODT0Rd, MODT[0] asserted during read from DRAM CS0
+# bit19-16:1, ODT0Wr, MODT[0] asserted during write to DRAM CS0
+
+DATA 0xFFD01498 0x00000000 # DDR ODT Control (High)
+# bit1-0: 00, ODT0 controlled by ODT Control (low) register above
+# bit3-2: 01, ODT1 active NEVER!
+# bit31-4: zero, required
+
+DATA 0xFFD0149C 0x0000E40F # CPU ODT Control
+# bit3-0: 1, ODT0Rd, Internal ODT asserted during read from DRAM bank0
+# bit7-4: 1, ODT0Wr, Internal ODT asserted during write to DRAM bank0
+# bit11-10:1, DQ_ODTSel. ODT select turned on
+
+DATA 0xFFD01480 0x00000001 # DDR Initialization Control
+#bit0=1, enable DDR init upon this register write
+
+# End of Header extension
+DATA 0x0 0x0
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index 68e8a77..101a80a 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -107,7 +107,11 @@ int misc_init_r(void)
/* Configure and initialize PHY */
void reset_phy(void)
{
+#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
+ mv_phy_88e1318_init("egiga0", 0);
+#else
mv_phy_88e1116_init("egiga0", 8);
+#endif
}
#endif
diff --git a/boards.cfg b/boards.cfg
index b711e0d..3f68fe5 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -144,7 +144,9 @@ mgcoge3un arm arm926ejs km_arm keymile
portl2 arm arm926ejs km_arm keymile kirkwood
inetspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:INETSPACE_V2
net2big_v2 arm arm926ejs net2big_v2 LaCie kirkwood lacie_kw:NET2BIG_V2
+netspace_lite_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_LITE_V2
netspace_max_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_MAX_V2
+netspace_mini_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_MINI_V2
netspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_V2
dreamplug arm arm926ejs - Marvell kirkwood
guruplug arm arm926ejs - Marvell kirkwood
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index dc6157d..ff92fda 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -27,6 +27,12 @@
#elif defined(CONFIG_NETSPACE_V2)
#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_V2
#define CONFIG_IDENT_STRING " NS v2"
+#elif defined(CONFIG_NETSPACE_LITE_V2)
+#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_LITE_V2
+#define CONFIG_IDENT_STRING " NS v2 Lite"
+#elif defined(CONFIG_NETSPACE_MINI_V2)
+#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MINI_V2
+#define CONFIG_IDENT_STRING " NS v2 Mini"
#elif defined(CONFIG_NETSPACE_MAX_V2)
#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2
#define CONFIG_IDENT_STRING " NS Max v2"
@@ -41,8 +47,13 @@
* High Level Configuration Options (easy to change)
*/
#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */
-#define CONFIG_KIRKWOOD /* SOC Family Name */
-#define CONFIG_KW88F6281 /* SOC Name */
+#define CONFIG_KIRKWOOD /* SoC Family Name */
+/* SoC name */
+#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
+#define CONFIG_KW88F6192
+#else
+#define CONFIG_KW88F6281
+#endif
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
/*
@@ -56,7 +67,9 @@
#define CONFIG_CMD_SF
#define CONFIG_CMD_I2C
#define CONFIG_CMD_IDE
+#ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */
#define CONFIG_CMD_USB
+#endif
/*
* Core clock definition
@@ -68,9 +81,14 @@
*/
#define CONFIG_NR_DRAM_BANKS 1
-#ifdef CONFIG_INETSPACE_V2
-/* Different SDRAM configuration and size for Internet Space v2 */
+/*
+ * Different SDRAM configuration and size for some of the boards derived
+ * from the Network Space v2
+ */
+#if defined(CONFIG_INETSPACE_V2)
#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-is2.cfg
+#elif defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
+#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-ns2l.cfg
#endif
/*
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v2 4/4] ARM: add support for d2 Network v2
2012-06-05 23:16 [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
` (2 preceding siblings ...)
2012-06-05 23:16 ` [U-Boot] [PATCH v2 3/4] ARM: add support for Network Space v2 Lite and Mini Simon Guinot
@ 2012-06-05 23:16 ` Simon Guinot
2012-06-14 15:11 ` [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Guinot @ 2012-06-05 23:16 UTC (permalink / raw)
To: u-boot
This patch adds support for the LaCie board d2 Network v2 which share
a lot of hardware caracteristics with the 2Big Network v2.
- CPU: Marvell 88F6281 1200Mhz
- SDRAM memory: 256MB DDR2 400Mhz
- 2 SATA ports: internal and eSATA
- Gigabit ethernet: PHY Marvell 88E1116R
- Flash memory: SPI NOR 512KB (Macronix MX25L4005A)
- i2c EEPROM: 512 bytes (24C04 type)
- 2 USB2 ports: host and host/device
- 1 push button
- 1 power switch
- 1 SATA LED (bi-color, blue and red)
Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
No changes for v2.
boards.cfg | 1 +
include/configs/lacie_kw.h | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/boards.cfg b/boards.cfg
index 3f68fe5..418bb94 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -142,6 +142,7 @@ km_kirkwood arm arm926ejs km_arm keymile
km_kirkwood_pci arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_KIRKWOOD_PCI,KM_RECONFIG_XLX
mgcoge3un arm arm926ejs km_arm keymile kirkwood
portl2 arm arm926ejs km_arm keymile kirkwood
+d2net_v2 arm arm926ejs net2big_v2 LaCie kirkwood lacie_kw:D2NET_V2
inetspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:INETSPACE_V2
net2big_v2 arm arm926ejs net2big_v2 LaCie kirkwood lacie_kw:NET2BIG_V2
netspace_lite_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_LITE_V2
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index ff92fda..6c11b73 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -36,6 +36,9 @@
#elif defined(CONFIG_NETSPACE_MAX_V2)
#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2
#define CONFIG_IDENT_STRING " NS Max v2"
+#elif defined(CONFIG_D2NET_V2)
+#define CONFIG_MACH_TYPE MACH_TYPE_D2NET_V2
+#define CONFIG_IDENT_STRING " D2 v2"
#elif defined(CONFIG_NET2BIG_V2)
#define CONFIG_MACH_TYPE MACH_TYPE_NET2BIG_V2
#define CONFIG_IDENT_STRING " 2Big v2"
@@ -106,7 +109,9 @@
#define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */
#define CONFIG_SYS_IDE_MAXBUS 1
#define CONFIG_SYS_IDE_MAXDEVICE 1
-#if defined(CONFIG_NET2BIG_V2)
+#if defined(CONFIG_D2NET_V2)
+#define CONFIG_SYS_PROMPT "d2v2> "
+#elif defined(CONFIG_NET2BIG_V2)
#define CONFIG_SYS_PROMPT "2big2> "
#else
#define CONFIG_SYS_PROMPT "ns2> "
@@ -126,7 +131,8 @@
*/
#ifdef CONFIG_MVSATA_IDE
#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
-#if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_NET2BIG_V2)
+#if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \
+ defined(CONFIG_NET2BIG_V2)
#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET
#endif
#endif /* CONFIG_MVSATA_IDE */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices
2012-06-05 23:16 [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
` (3 preceding siblings ...)
2012-06-05 23:16 ` [U-Boot] [PATCH v2 4/4] ARM: add support for d2 Network v2 Simon Guinot
@ 2012-06-14 15:11 ` Simon Guinot
2012-07-09 8:06 ` Simon Guinot
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Guinot @ 2012-06-14 15:11 UTC (permalink / raw)
To: u-boot
On Wed, Jun 06, 2012 at 01:16:49AM +0200, Simon Guinot wrote:
> Changes for v2:
> - Move board support and feature into a separate patch set.
> - Move mach-types update into a separate patch.
>
> Simon Guinot (4):
> lacie_kw: add support for EFI partitions
> ARM: add netspace_mini_v2 to mach-types.h
> ARM: add support for Network Space v2 Lite and Mini
> ARM: add support for d2 Network v2
>
> arch/arm/include/asm/mach-types.h | 13 +++
> board/LaCie/common/common.c | 36 ++++++-
> board/LaCie/common/common.h | 1 +
> board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++
> board/LaCie/netspace_v2/netspace_v2.c | 4 +
> boards.cfg | 3 +
> include/configs/lacie_kw.h | 42 ++++++--
> 7 files changed, 252 insertions(+), 9 deletions(-)
> create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
Please could you pick this patches too ?
Thanks,
Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120614/97a7ace2/attachment.pgp>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices
2012-06-05 23:16 [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
` (4 preceding siblings ...)
2012-06-14 15:11 ` [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
@ 2012-07-09 8:06 ` Simon Guinot
2012-07-16 11:44 ` Simon Guinot
2012-07-19 11:21 ` Simon Guinot
7 siblings, 0 replies; 9+ messages in thread
From: Simon Guinot @ 2012-07-09 8:06 UTC (permalink / raw)
To: u-boot
On Wed, Jun 06, 2012 at 01:16:49AM +0200, Simon Guinot wrote:
> Changes for v2:
> - Move board support and feature into a separate patch set.
> - Move mach-types update into a separate patch.
>
> Simon Guinot (4):
> lacie_kw: add support for EFI partitions
> ARM: add netspace_mini_v2 to mach-types.h
> ARM: add support for Network Space v2 Lite and Mini
> ARM: add support for d2 Network v2
>
> arch/arm/include/asm/mach-types.h | 13 +++
> board/LaCie/common/common.c | 36 ++++++-
> board/LaCie/common/common.h | 1 +
> board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++
> board/LaCie/netspace_v2/netspace_v2.c | 4 +
> boards.cfg | 3 +
> include/configs/lacie_kw.h | 42 ++++++--
> 7 files changed, 252 insertions(+), 9 deletions(-)
> create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
Hi Prafulla,
Could you please pick up this patches.
Simon
>
> --
> 1.7.9.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120709/88d249c0/attachment.pgp>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices
2012-06-05 23:16 [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
` (5 preceding siblings ...)
2012-07-09 8:06 ` Simon Guinot
@ 2012-07-16 11:44 ` Simon Guinot
2012-07-19 11:21 ` Simon Guinot
7 siblings, 0 replies; 9+ messages in thread
From: Simon Guinot @ 2012-07-16 11:44 UTC (permalink / raw)
To: u-boot
On Wed, Jun 06, 2012 at 01:16:49AM +0200, Simon Guinot wrote:
> Changes for v2:
> - Move board support and feature into a separate patch set.
> - Move mach-types update into a separate patch.
>
> Simon Guinot (4):
> lacie_kw: add support for EFI partitions
> ARM: add netspace_mini_v2 to mach-types.h
> ARM: add support for Network Space v2 Lite and Mini
> ARM: add support for d2 Network v2
>
> arch/arm/include/asm/mach-types.h | 13 +++
> board/LaCie/common/common.c | 36 ++++++-
> board/LaCie/common/common.h | 1 +
> board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++
> board/LaCie/netspace_v2/netspace_v2.c | 4 +
> boards.cfg | 3 +
> include/configs/lacie_kw.h | 42 ++++++--
> 7 files changed, 252 insertions(+), 9 deletions(-)
> create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
Hi Prafulla,
What is the next step for this patches ?
Do you want me for some changes ?
Regards,
Simon
>
> --
> 1.7.9.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120716/e5ebfe73/attachment.pgp>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices
2012-06-05 23:16 [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
` (6 preceding siblings ...)
2012-07-16 11:44 ` Simon Guinot
@ 2012-07-19 11:21 ` Simon Guinot
7 siblings, 0 replies; 9+ messages in thread
From: Simon Guinot @ 2012-07-19 11:21 UTC (permalink / raw)
To: u-boot
On Wed, Jun 06, 2012 at 01:16:49AM +0200, Simon Guinot wrote:
> Changes for v2:
> - Move board support and feature into a separate patch set.
> - Move mach-types update into a separate patch.
>
> Simon Guinot (4):
> lacie_kw: add support for EFI partitions
> ARM: add netspace_mini_v2 to mach-types.h
> ARM: add support for Network Space v2 Lite and Mini
> ARM: add support for d2 Network v2
>
> arch/arm/include/asm/mach-types.h | 13 +++
> board/LaCie/common/common.c | 36 ++++++-
> board/LaCie/common/common.h | 1 +
> board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++
> board/LaCie/netspace_v2/netspace_v2.c | 4 +
> boards.cfg | 3 +
> include/configs/lacie_kw.h | 42 ++++++--
> 7 files changed, 252 insertions(+), 9 deletions(-)
> create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
Hi Prafulla,
Please, consider picking this patches.
Regards,
Simon
>
> --
> 1.7.9.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120719/c87720c5/attachment.pgp>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-07-19 11:21 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-05 23:16 [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 1/4] lacie_kw: add support for EFI partitions Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 2/4] ARM: add netspace_mini_v2 to mach-types.h Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 3/4] ARM: add support for Network Space v2 Lite and Mini Simon Guinot
2012-06-05 23:16 ` [U-Boot] [PATCH v2 4/4] ARM: add support for d2 Network v2 Simon Guinot
2012-06-14 15:11 ` [U-Boot] [PATCH v2 0/4] Board support and feature for LaCie devices Simon Guinot
2012-07-09 8:06 ` Simon Guinot
2012-07-16 11:44 ` Simon Guinot
2012-07-19 11:21 ` Simon Guinot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.