public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 0/6] Add support for LaCie NAS Network Space v2
@ 2011-05-01 15:03 Simon Guinot
  2011-05-01 15:03 ` [U-Boot] [PATCH 1/6] sf: add support for Macronix MX25L4005A Simon Guinot
                   ` (5 more replies)
  0 siblings, 6 replies; 14+ messages in thread
From: Simon Guinot @ 2011-05-01 15:03 UTC (permalink / raw)
  To: u-boot

Hi,

This patch series adds support for Network Space v2 board and parents.

Please note that the patch "sf: disable write protection for Macronix
flash" is probably not correct. I have no idea how to handle properly
the SPI flash protection and any hints are welcome.

Simon Guinot (6):
  sf: add support for Macronix MX25L4005A
  sf: disable write protection for Macronix flash
  Kirkwood: allow to override CONFIG_SYS_TCLK
  mv-common.h: fix DRAM banks configuration
  netconsole: remove `serverip' check
  Add support for Network Space v2

 Makefile                                       |    7 +
 arch/arm/include/asm/arch-kirkwood/kw88f6281.h |    8 +-
 board/LaCie/netspace_v2/Makefile               |   49 +++++++
 board/LaCie/netspace_v2/kwbimage.cfg           |  162 ++++++++++++++++++++++++
 board/LaCie/netspace_v2/netspace_v2.c          |  150 ++++++++++++++++++++++
 board/LaCie/netspace_v2/netspace_v2.h          |   39 ++++++
 drivers/mtd/spi/macronix.c                     |   95 ++++++++++++++
 include/configs/mv-common.h                    |    6 +-
 include/configs/netspace_v2.h                  |  142 +++++++++++++++++++++
 net/net.c                                      |    1 -

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 1/6] sf: add support for Macronix MX25L4005A
  2011-05-01 15:03 [U-Boot] [PATCH 0/6] Add support for LaCie NAS Network Space v2 Simon Guinot
@ 2011-05-01 15:03 ` Simon Guinot
  2011-05-01 15:04 ` [U-Boot] [PATCH 2/6] sf: disable write protection for Macronix flash Simon Guinot
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 14+ messages in thread
From: Simon Guinot @ 2011-05-01 15:03 UTC (permalink / raw)
  To: u-boot

From: Simon Guinot <sguinot@lacie.com>

Signed-off-by: Simon Guinot <sguinot@lacie.com>
---
 drivers/mtd/spi/macronix.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/spi/macronix.c b/drivers/mtd/spi/macronix.c
index ff66f2a..8e4d71c 100644
--- a/drivers/mtd/spi/macronix.c
+++ b/drivers/mtd/spi/macronix.c
@@ -71,6 +71,14 @@ static inline struct macronix_spi_flash *to_macronix_spi_flash(struct spi_flash
 
 static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
 	{
+		.idcode = 0x2013,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 8,
+		.name = "MX25L4005A",
+	},
+	{
 		.idcode = 0x2015,
 		.page_size = 256,
 		.pages_per_sector = 16,
-- 
1.6.3.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 2/6] sf: disable write protection for Macronix flash
  2011-05-01 15:03 [U-Boot] [PATCH 0/6] Add support for LaCie NAS Network Space v2 Simon Guinot
  2011-05-01 15:03 ` [U-Boot] [PATCH 1/6] sf: add support for Macronix MX25L4005A Simon Guinot
@ 2011-05-01 15:04 ` Simon Guinot
  2011-05-01 15:04 ` [U-Boot] [PATCH 3/6] Kirkwood: allow to override CONFIG_SYS_TCLK Simon Guinot
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 14+ messages in thread
From: Simon Guinot @ 2011-05-01 15:04 UTC (permalink / raw)
  To: u-boot

From: Simon Guinot <sguinot@lacie.com>

Signed-off-by: Simon Guinot <sguinot@lacie.com>
---
 drivers/mtd/spi/macronix.c |   87 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/spi/macronix.c b/drivers/mtd/spi/macronix.c
index 8e4d71c..b587ac9 100644
--- a/drivers/mtd/spi/macronix.c
+++ b/drivers/mtd/spi/macronix.c
@@ -49,6 +49,10 @@
 #define CMD_MX25XX_DP		0xb9	/* Deep Power-down */
 #define CMD_MX25XX_RES		0xab	/* Release from DP, and Read Signature */
 
+/* Status registers */
+#define MX25XX_SR_BP		(0xF << 2)	/* Block Protect */
+#define MX25XX_SR_SRWP		(1 << 7)	/* Write Protect */
+
 struct macronix_spi_flash_params {
 	u16 idcode;
 	u16 page_size;
@@ -120,6 +124,86 @@ static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
 	},
 };
 
+static int macronix_write_status(struct spi_flash *flash, u8 sr)
+{
+	u8 cmd[2];
+	int ret;
+
+	ret = spi_flash_cmd(flash->spi, CMD_MX25XX_WREN, NULL, 0);
+	if (ret < 0) {
+		debug("SF: Enabling Write failed\n");
+		return ret;
+	}
+
+	cmd[0] = CMD_MX25XX_WRSR;
+	cmd[1] = sr;
+	ret = spi_xfer(flash->spi, 16, cmd, NULL, SPI_XFER_BEGIN);
+	if (ret) {
+		debug("SF: fail to write status register\n");
+		return ret;
+	}
+
+	spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_END);
+
+	ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
+	if (ret < 0) {
+		debug("SF: write status register timed out\n");
+		return ret;
+	}
+
+	return 0;
+}
+
+static int macronix_read_status(struct spi_flash *flash, u8 *sr)
+{
+	u8 cmd = CMD_MX25XX_RDSR;
+	int ret;
+
+	ret = spi_xfer(flash->spi, 8, &cmd, NULL, SPI_XFER_BEGIN);
+	if (ret) {
+		debug("SF: Failed to send command %02x: %d\n", cmd, ret);
+		return ret;
+	}
+	ret = spi_xfer(flash->spi, 8, NULL, sr, 0);
+	if (ret) {
+		debug("SF: fail to read status register: %d\n", ret);
+		return ret;
+	}
+
+	spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_END);
+
+	return 0;
+}
+
+static int macronix_disable_protect(struct spi_flash *flash)
+{
+	int ret;
+	u8 sr;
+
+	ret = macronix_read_status(flash, &sr);
+	if (ret)
+		return ret;
+
+	if ((sr & MX25XX_SR_BP) == 0)
+		return ret;
+
+	/* Disable status register write protection. */
+	sr &= ~MX25XX_SR_SRWP;
+	ret = macronix_write_status(flash, sr);
+	if (ret)
+		return ret;
+
+	/* Disable block protection. */
+	sr &= ~MX25XX_SR_BP;
+	ret = macronix_write_status(flash, sr);
+	if (ret)
+		return ret;
+
+	printf("SF: disable write protection\n");
+
+	return 0;
+}
+
 static int macronix_write(struct spi_flash *flash,
 			  u32 offset, size_t len, const void *buf)
 {
@@ -223,5 +307,8 @@ struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode)
 		* params->sectors_per_block;
 	mcx->flash.size = mcx->flash.sector_size * params->nr_blocks;
 
+	if (macronix_disable_protect(&mcx->flash))
+		printf("SF: disable write protection failed\n");
+
 	return &mcx->flash;
 }
-- 
1.6.3.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 3/6] Kirkwood: allow to override CONFIG_SYS_TCLK
  2011-05-01 15:03 [U-Boot] [PATCH 0/6] Add support for LaCie NAS Network Space v2 Simon Guinot
  2011-05-01 15:03 ` [U-Boot] [PATCH 1/6] sf: add support for Macronix MX25L4005A Simon Guinot
  2011-05-01 15:04 ` [U-Boot] [PATCH 2/6] sf: disable write protection for Macronix flash Simon Guinot
@ 2011-05-01 15:04 ` Simon Guinot
  2011-05-01 15:04 ` [U-Boot] [PATCH 4/6] mv-common.h: fix DRAM banks configuration Simon Guinot
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 14+ messages in thread
From: Simon Guinot @ 2011-05-01 15:04 UTC (permalink / raw)
  To: u-boot

From: Simon Guinot <sguinot@lacie.com>

This patch allow to override CONFIG_SYS_TCLK from board configuration
files. This is needed for the Network Space v2 which use a non standard
core clock frequency (166MHz instead of 200MHz for a 6281 SoC).

As a possible enhancement for 6281 and 6282 devices, TCLK could be
dynamically detected by checking the Sample at Reset register bit 21.

Additionally this patch fix a typo.

Signed-off-by: Simon Guinot <sguinot@lacie.com>
---
 arch/arm/include/asm/arch-kirkwood/kw88f6281.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/arm/include/asm/arch-kirkwood/kw88f6281.h b/arch/arm/include/asm/arch-kirkwood/kw88f6281.h
index 80723ea..22d10f1 100644
--- a/arch/arm/include/asm/arch-kirkwood/kw88f6281.h
+++ b/arch/arm/include/asm/arch-kirkwood/kw88f6281.h
@@ -27,11 +27,13 @@
 #ifndef _ASM_ARCH_KW88F6281_H
 #define _ASM_ARCH_KW88F6281_H
 
-/* SOC specific definations */
+/* SOC specific definitions */
 #define KW88F6281_REGS_PHYS_BASE	0xf1000000
 #define KW_REGS_PHY_BASE		KW88F6281_REGS_PHYS_BASE
 
-/* TCLK Core Clock defination*/
-#define CONFIG_SYS_TCLK	  200000000 /* 200MHz */
+/* TCLK Core Clock definition */
+#ifndef CONFIG_SYS_TCLK
+#define CONFIG_SYS_TCLK	200000000 /* 200MHz */
+#endif
 
 #endif /* _ASM_ARCH_KW88F6281_H */
-- 
1.6.3.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 4/6] mv-common.h: fix DRAM banks configuration
  2011-05-01 15:03 [U-Boot] [PATCH 0/6] Add support for LaCie NAS Network Space v2 Simon Guinot
                   ` (2 preceding siblings ...)
  2011-05-01 15:04 ` [U-Boot] [PATCH 3/6] Kirkwood: allow to override CONFIG_SYS_TCLK Simon Guinot
@ 2011-05-01 15:04 ` Simon Guinot
  2011-05-01 16:11   ` Eric Cooper
  2011-05-01 15:04 ` [U-Boot] [PATCH 5/6] netconsole: remove `serverip' check Simon Guinot
  2011-05-01 15:04 ` [U-Boot] [PATCH 6/6] Add support for Network Space v2 Simon Guinot
  5 siblings, 1 reply; 14+ messages in thread
From: Simon Guinot @ 2011-05-01 15:04 UTC (permalink / raw)
  To: u-boot

From: Simon Guinot <sguinot@lacie.com>

The asm/arch/config.h header define CONFIG_NR_DRAM_BANKS_MAX, which is
needed to configure DRAM banks.

This patch move the asm/arch/config.h header inclusion above the DRAM
banks configuration.

Signed-off-by: Simon Guinot <sguinot@lacie.com>
---
 include/configs/mv-common.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index a8937dd..e8f2da0 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -113,6 +113,9 @@
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000	/* Rst Vector Adr */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
 
+/* ====> Include platform Common Definations */
+#include <asm/arch/config.h>
+
 /*
  * DRAM Banks configuration, Custom config can be done in <board>.h
  */
@@ -124,9 +127,6 @@
 #endif
 #endif /* CONFIG_NR_DRAM_BANKS */
 
-/* ====> Include platform Common Definations */
-#include <asm/arch/config.h>
-
 /* ====> Include driver Common Definations */
 /*
  * Common NAND configuration
-- 
1.6.3.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 5/6] netconsole: remove `serverip' check
  2011-05-01 15:03 [U-Boot] [PATCH 0/6] Add support for LaCie NAS Network Space v2 Simon Guinot
                   ` (3 preceding siblings ...)
  2011-05-01 15:04 ` [U-Boot] [PATCH 4/6] mv-common.h: fix DRAM banks configuration Simon Guinot
@ 2011-05-01 15:04 ` Simon Guinot
  2011-05-01 15:19   ` Wolfgang Denk
  2011-05-01 15:04 ` [U-Boot] [PATCH 6/6] Add support for Network Space v2 Simon Guinot
  5 siblings, 1 reply; 14+ messages in thread
From: Simon Guinot @ 2011-05-01 15:04 UTC (permalink / raw)
  To: u-boot

From: Simon Guinot <sguinot@lacie.com>

Netconsole use the environment variable `ncip' to configure the
destination IP. `serverip' don't need to be defined.

Signed-off-by: Simon Guinot <sguinot@lacie.com>
---
 net/net.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/net/net.c b/net/net.c
index e50bdf1..63b4201 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1718,7 +1718,6 @@ static int net_check_prereq (proto_t protocol)
 #if defined(CONFIG_CMD_NFS)
 	case NFS:
 #endif
-	case NETCONS:
 	case TFTP:
 		if (NetServerIP == 0) {
 			puts ("*** ERROR: `serverip' not set\n");
-- 
1.6.3.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 6/6] Add support for Network Space v2
  2011-05-01 15:03 [U-Boot] [PATCH 0/6] Add support for LaCie NAS Network Space v2 Simon Guinot
                   ` (4 preceding siblings ...)
  2011-05-01 15:04 ` [U-Boot] [PATCH 5/6] netconsole: remove `serverip' check Simon Guinot
@ 2011-05-01 15:04 ` Simon Guinot
  2011-05-01 15:26   ` Wolfgang Denk
  2011-05-02  9:18   ` Prafulla Wadaskar
  5 siblings, 2 replies; 14+ messages in thread
From: Simon Guinot @ 2011-05-01 15:04 UTC (permalink / raw)
  To: u-boot

From: Simon Guinot <sguinot@lacie.com>

This patch add support for the Network Space v2 board and parents.
This include Network Space (Max) v2 and Internet Space v2.

Signed-off-by: Simon Guinot <sguinot@lacie.com>
---
 Makefile                              |    7 ++
 board/LaCie/netspace_v2/Makefile      |   49 ++++++++++
 board/LaCie/netspace_v2/kwbimage.cfg  |  162 +++++++++++++++++++++++++++++++++
 board/LaCie/netspace_v2/netspace_v2.c |  150 ++++++++++++++++++++++++++++++
 board/LaCie/netspace_v2/netspace_v2.h |   39 ++++++++
 include/configs/netspace_v2.h         |  142 +++++++++++++++++++++++++++++
 6 files changed, 549 insertions(+), 0 deletions(-)
 create mode 100644 board/LaCie/netspace_v2/Makefile
 create mode 100644 board/LaCie/netspace_v2/kwbimage.cfg
 create mode 100644 board/LaCie/netspace_v2/netspace_v2.c
 create mode 100644 board/LaCie/netspace_v2/netspace_v2.h
 create mode 100644 include/configs/netspace_v2.h

diff --git a/Makefile b/Makefile
index ada951e..18e6ecd 100644
--- a/Makefile
+++ b/Makefile
@@ -897,6 +897,13 @@ TNY_A9260_config	:	unconfig
 	@echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
 	@$(MKCONFIG) -n $@ -a tny_a9260 arm arm926ejs tny_a9260 calao at91
 
+inetspace_v2_config	\
+netspace_v2_config	\
+netspace_max_v2_config	:	unconfig
+	@mkdir -p $(obj)include
+	@echo "#define CONFIG_$(shell echo $(@:_config=) | tr 'a-z' 'A-Z') 1" >$(obj)include/config.h
+	@$(MKCONFIG) -n $@ -a netspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood
+
 ########################################################################
 ## ARM Integrator boards - see doc/README-integrator for more info.
 integratorap_config	\
diff --git a/board/LaCie/netspace_v2/Makefile b/board/LaCie/netspace_v2/Makefile
new file mode 100644
index 0000000..a245f2c
--- /dev/null
+++ b/board/LaCie/netspace_v2/Makefile
@@ -0,0 +1,49 @@
+#
+# 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.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= netspace_v2.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))
+
+clean:
+	rm -f $(SOBJS) $(OBJS)
+
+distclean:	clean
+	rm -f $(LIB) core *.bak .depend
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/LaCie/netspace_v2/kwbimage.cfg b/board/LaCie/netspace_v2/kwbimage.cfg
new file mode 100644
index 0000000..361feeb
--- /dev/null
+++ b/board/LaCie/netspace_v2/kwbimage.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 0x35143000	# 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 0x0000CCCC	#  DDR Address Control
+# bit1-0:   01, Cs0width=x16
+# bit3-2:   11, Cs0size=1Gb
+# 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 0x0FFFFFF1	# 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
new file mode 100644
index 0000000..137bf11
--- /dev/null
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -0,0 +1,150 @@
+/*
+ * 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.
+ */
+
+#include <common.h>
+#include <miiphy.h>
+#include <netdev.h>
+#include <command.h>
+#include <asm/arch/kirkwood.h>
+#include <asm/arch/mpp.h>
+#include <asm/arch/gpio.h>
+#include "netspace_v2.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_early_init_f(void)
+{
+	/* Gpio configuration */
+	kw_config_gpio(NETSPACE_V2_OE_VAL_LOW, NETSPACE_V2_OE_VAL_HIGH,
+			NETSPACE_V2_OE_LOW, NETSPACE_V2_OE_HIGH);
+
+	/* Multi-Purpose Pins Functionality configuration */
+	u32 kwmpp_config[] = {
+		MPP0_SPI_SCn,
+		MPP1_SPI_MOSI,
+		MPP2_SPI_SCK,
+		MPP3_SPI_MISO,
+		MPP4_NF_IO6,
+		MPP5_NF_IO7,
+		MPP6_SYSRST_OUTn,
+		MPP7_GPO,		/* Fan speed (bit 1) */
+		MPP8_TW_SDA,
+		MPP9_TW_SCK,
+		MPP10_UART0_TXD,
+		MPP11_UART0_RXD,
+		MPP12_GPO,		/* Red led */
+		MPP14_GPIO,		/* USB fuse */
+		MPP16_GPIO,		/* SATA 0 power */
+		MPP17_GPIO,		/* SATA 1 power */
+		MPP18_NF_IO0,
+		MPP19_NF_IO1,
+		MPP20_SATA1_ACTn,
+		MPP21_SATA0_ACTn,
+		MPP22_GPIO,		/* Fan speed (bit 0) */
+		MPP23_GPIO,		/* Fan power */
+		MPP24_GPIO,		/* USB mode select */
+		MPP25_GPIO,		/* Fan rotation fail */
+		MPP26_GPIO,		/* USB vbus-in detection */
+		MPP28_GPIO,		/* USB enable vbus-out */
+		MPP29_GPIO,		/* Blue led (slow register) */
+		MPP30_GPIO,		/* Blue led (command register) */
+		MPP31_GPIO,		/* Board power off */
+		MPP32_GPIO,		/* Button (0 = Released, 1 = Pushed) */
+		MPP33_GPIO,		/* Fan speed (bit 2) */
+		0
+	};
+	kirkwood_mpp_conf(kwmpp_config);
+
+	return 0;
+}
+
+int board_init(void)
+{
+	/* Board arch number */
+#if defined(CONFIG_NETSPACE_V2)
+	gd->bd->bi_arch_number = MACH_TYPE_NETSPACE_V2;
+#elif defined(CONFIG_INETSPACE_V2)
+	gd->bd->bi_arch_number = MACH_TYPE_INETSPACE_V2;
+#elif defined(CONFIG_NETSPACE_MAX_V2)
+	gd->bd->bi_arch_number = MACH_TYPE_NETSPACE_MAX_V2;
+#endif
+
+	/* Boot parameters address */
+	gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
+
+	return 0;
+}
+
+void mv_phy_88e1116_init(char *name)
+{
+	u16 reg;
+	u16 devadr;
+
+	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 */
+	if (miiphy_read(name, devadr, MII_BMCR, &reg) != 0) {
+		printf("Err..(%s) PHY status read failed\n", __func__);
+		return;
+	}
+	if (miiphy_write(name, devadr, MII_BMCR, reg | 0x8000) != 0) {
+		printf("Err..(%s) PHY reset failed\n", __func__);
+		return;
+	}
+
+	printf("88E1116 Initialized on %s\n", name);
+}
+
+/* Configure and initialize PHY */
+void reset_phy(void)
+{
+	mv_phy_88e1116_init("egiga0");
+}
+
+#define NETSPACE_V2_GPIO_BUTTON		32
+
+/* Return GPIO button status */
+static int
+do_read_button(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+	return kw_gpio_get_value(NETSPACE_V2_GPIO_BUTTON);
+}
+
+U_BOOT_CMD(button, 1, 1, do_read_button,
+	   "Return GPIO button status 0=off 1=on", "");
diff --git a/board/LaCie/netspace_v2/netspace_v2.h b/board/LaCie/netspace_v2/netspace_v2.h
new file mode 100644
index 0000000..c26a6e0
--- /dev/null
+++ b/board/LaCie/netspace_v2/netspace_v2.h
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+#ifndef NETSPACE_V2_H
+#define NETSPACE_V2_H
+
+#define NETSPACE_V2_OE_LOW		0x06004000
+#define NETSPACE_V2_OE_HIGH		0x00000031
+#define NETSPACE_V2_OE_VAL_LOW		0x10030000
+#define NETSPACE_V2_OE_VAL_HIGH		0x00000000
+
+/* PHY related */
+#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)
+
+#endif /* NETSPACE_V2_H */
diff --git a/include/configs/netspace_v2.h b/include/configs/netspace_v2.h
new file mode 100644
index 0000000..850a5b5
--- /dev/null
+++ b/include/configs/netspace_v2.h
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2011 Simon Guinot <sguinot@lacie.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.
+ */
+
+#ifndef _CONFIG_NETSPACE_V2_H
+#define _CONFIG_NETSPACE_V2_H
+
+/*
+ * Version number information
+ */
+#define CONFIG_IDENT_STRING		" LaCie Network Space v2"
+
+/*
+ * High Level Configuration Options (easy to change)
+ */
+#define CONFIG_FEROCEON_88FR131		1 /* CPU Core subversion */
+#define CONFIG_KIRKWOOD			1 /* SOC Family Name */
+#define CONFIG_KW88F6281		1 /* SOC Name */
+#define CONFIG_MACH_NETSPACE_V2		1 /* Machine type */
+#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
+
+/*
+ * Commands configuration
+ */
+#define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
+#include <config_cmd_default.h>
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_SF
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_USB
+
+/*
+ * Core clock definition.
+ */
+#define CONFIG_SYS_TCLK			166000000 /* 166MHz */
+
+/*
+ * mv-common.h should be defined after CMD configs since it used them
+ * to enable certain macros
+ */
+#define CONFIG_NR_DRAM_BANKS		2
+#include "mv-common.h"
+
+/* Remove or override few declarations from mv-common.h */
+#undef CONFIG_RBTREE
+#undef CONFIG_ENV_SPI_MAX_HZ
+#undef CONFIG_SYS_HZ
+#undef CONFIG_SYS_IDE_MAXBUS
+#undef CONFIG_SYS_IDE_MAXDEVICE
+#undef CONFIG_SYS_PROMPT
+#define CONFIG_ENV_SPI_MAX_HZ           20000000 /* 20Mhz */
+#define CONFIG_SYS_HZ			800
+#define CONFIG_SYS_IDE_MAXBUS           1
+#define CONFIG_SYS_IDE_MAXDEVICE        1
+#define CONFIG_SYS_PROMPT		"ns2> "
+
+/*
+ * Ethernet Driver configuration
+ */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
+#define CONFIG_NETCONSOLE
+#endif
+
+/*
+ * SATA Driver configuration
+ */
+#ifdef CONFIG_MVSATA_IDE
+#define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET
+/* Network Space Max v2 use 2 SATA ports */
+#ifdef CONFIG_NETSPACE_MAX_V2
+#define CONFIG_SYS_ATA_IDE1_OFFSET      MV_SATA_PORT1_OFFSET
+#endif
+#endif
+
+/*
+ * Enable GPI0 support
+ */
+#define CONFIG_KIRKWOOD_GPIO
+
+/*
+ * File systems support
+ */
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+
+/*
+ * Use the HUSH parser
+ */
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
+
+/*
+ * Console configuration
+ */
+#define CONFIG_CONSOLE_MUX		1
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV	1
+
+/*
+ *  Environment variables configurations
+ */
+#define CONFIG_ENV_IS_IN_SPI_FLASH	1
+#define CONFIG_ENV_SECT_SIZE		0x10000	/* 64KB */
+#define CONFIG_ENV_SIZE			0x1000	/* 4KB */
+#define CONFIG_ENV_ADDR			0x70000
+#define CONFIG_ENV_OFFSET		0x70000	/* env starts here */
+
+/*
+ * Default environment variables
+ */
+#define CONFIG_BOOTARGS "console=ttyS0,115200"
+
+#define CONFIG_BOOTCOMMAND				\
+	"if run usbload || run diskload; then bootm 0x800000; fi"
+
+#define CONFIG_EXTRA_ENV_SETTINGS			\
+	"stdin=serial,nc\0"				\
+	"stdout=serial,nc\0"				\
+	"stderr=serial,nc\0"				\
+	"ipaddr=192.168.1.111\0"			\
+	"diskload=ide reset && "			\
+	"ext2load ide 0:1 0x800000 /boot/uImage\0"	\
+	"usbload=usb start && "				\
+	"fatload usb 0:1 0x800000 /boot/uImage\0"
+
+#endif /* _CONFIG_NETSPACE_V2_H */
-- 
1.6.3.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 5/6] netconsole: remove `serverip' check
  2011-05-01 15:04 ` [U-Boot] [PATCH 5/6] netconsole: remove `serverip' check Simon Guinot
@ 2011-05-01 15:19   ` Wolfgang Denk
  0 siblings, 0 replies; 14+ messages in thread
From: Wolfgang Denk @ 2011-05-01 15:19 UTC (permalink / raw)
  To: u-boot

Dear Simon Guinot,

In message <1304262244-13788-6-git-send-email-simon.guinot@sequanux.org> you wrote:
> From: Simon Guinot <sguinot@lacie.com>
> 
> Netconsole use the environment variable `ncip' to configure the
> destination IP. `serverip' don't need to be defined.
> 
> Signed-off-by: Simon Guinot <sguinot@lacie.com>
> ---
>  net/net.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/net/net.c b/net/net.c
> index e50bdf1..63b4201 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -1718,7 +1718,6 @@ static int net_check_prereq (proto_t protocol)
>  #if defined(CONFIG_CMD_NFS)
>  	case NFS:
>  #endif
> -	case NETCONS:
>  	case TFTP:
>  		if (NetServerIP == 0) {
>  			puts ("*** ERROR: `serverip' not set\n");

NAK, as this change would also disable the test if NetOurIP == 0,
i. e. if our own IP address is set.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Genitiv ins Wasser, weil's Dativ ist!

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 6/6] Add support for Network Space v2
  2011-05-01 15:04 ` [U-Boot] [PATCH 6/6] Add support for Network Space v2 Simon Guinot
@ 2011-05-01 15:26   ` Wolfgang Denk
  2011-05-01 20:29     ` Simon Guinot
  2011-05-02  9:18   ` Prafulla Wadaskar
  1 sibling, 1 reply; 14+ messages in thread
From: Wolfgang Denk @ 2011-05-01 15:26 UTC (permalink / raw)
  To: u-boot

Dear Simon Guinot,

In message <1304262244-13788-7-git-send-email-simon.guinot@sequanux.org> you wrote:
> From: Simon Guinot <sguinot@lacie.com>
> 
> This patch add support for the Network Space v2 board and parents.
> This include Network Space (Max) v2 and Internet Space v2.
> 
> Signed-off-by: Simon Guinot <sguinot@lacie.com>
> ---
>  Makefile                              |    7 ++
>  board/LaCie/netspace_v2/Makefile      |   49 ++++++++++
>  board/LaCie/netspace_v2/kwbimage.cfg  |  162 +++++++++++++++++++++++++++++++++
>  board/LaCie/netspace_v2/netspace_v2.c |  150 ++++++++++++++++++++++++++++++
>  board/LaCie/netspace_v2/netspace_v2.h |   39 ++++++++
>  include/configs/netspace_v2.h         |  142 +++++++++++++++++++++++++++++
>  6 files changed, 549 insertions(+), 0 deletions(-)
>  create mode 100644 board/LaCie/netspace_v2/Makefile
>  create mode 100644 board/LaCie/netspace_v2/kwbimage.cfg
>  create mode 100644 board/LaCie/netspace_v2/netspace_v2.c
>  create mode 100644 board/LaCie/netspace_v2/netspace_v2.h
>  create mode 100644 include/configs/netspace_v2.h

Entries to MAINTAINERS file missing.

> diff --git a/Makefile b/Makefile
> index ada951e..18e6ecd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -897,6 +897,13 @@ TNY_A9260_config	:	unconfig
>  	@echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
>  	@$(MKCONFIG) -n $@ -a tny_a9260 arm arm926ejs tny_a9260 calao at91
>  
> +inetspace_v2_config	\
> +netspace_v2_config	\
> +netspace_max_v2_config	:	unconfig
> +	@mkdir -p $(obj)include
> +	@echo "#define CONFIG_$(shell echo $(@:_config=) | tr 'a-z' 'A-Z') 1" >$(obj)include/config.h
> +	@$(MKCONFIG) -n $@ -a netspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood

NAK.  We don't add boards to Makefile any more.  Please add entries to
boards.cfg instead.

> +int board_init(void)
> +{
> +	/* Board arch number */
> +#if defined(CONFIG_NETSPACE_V2)
> +	gd->bd->bi_arch_number = MACH_TYPE_NETSPACE_V2;
> +#elif defined(CONFIG_INETSPACE_V2)
> +	gd->bd->bi_arch_number = MACH_TYPE_INETSPACE_V2;
> +#elif defined(CONFIG_NETSPACE_MAX_V2)
> +	gd->bd->bi_arch_number = MACH_TYPE_NETSPACE_MAX_V2;
> +#endif

Please get rid of the #ifdef's here and define the MACH_TYPE in your
board config file.

...
> +void mv_phy_88e1116_init(char *name)
> +{
...
> +	printf("88E1116 Initialized on %s\n", name);

Maybe you want to change this into a debug() instead? [I guess it
corrupts the formatting of the boot messages?]

...
> +#define CONFIG_SYS_HZ			800

NAK.  CONFIG_SYS_HZ must always be 1000.



Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
There are no data that cannot be plotted on a straight  line  if  the
axis are chosen correctly.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 4/6] mv-common.h: fix DRAM banks configuration
  2011-05-01 15:04 ` [U-Boot] [PATCH 4/6] mv-common.h: fix DRAM banks configuration Simon Guinot
@ 2011-05-01 16:11   ` Eric Cooper
  2011-05-01 21:38     ` Simon Guinot
  0 siblings, 1 reply; 14+ messages in thread
From: Eric Cooper @ 2011-05-01 16:11 UTC (permalink / raw)
  To: u-boot

On Sun, May 01, 2011 at 05:04:02PM +0200, Simon Guinot wrote:
> --- a/include/configs/mv-common.h
> +++ b/include/configs/mv-common.h
> @@ -113,6 +113,9 @@
>  #define CONFIG_SYS_RESET_ADDRESS 0xffff0000	/* Rst Vector Adr */
>  #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
>  
> +/* ====> Include platform Common Definations */
> +#include <asm/arch/config.h>
> +
>  /*
>   * DRAM Banks configuration, Custom config can be done in <board>.h
>   */
> @@ -124,9 +127,6 @@
>  #endif
>  #endif /* CONFIG_NR_DRAM_BANKS */
>  
> -/* ====> Include platform Common Definations */
> -#include <asm/arch/config.h>
> -
>  /* ====> Include driver Common Definations */
>  /*
>   * Common NAND configuration
> -- 
> 1.6.3.1

You didn't fix the "Definations" typos in this one.

-- 
Eric Cooper             e c c @ c m u . e d u

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 6/6] Add support for Network Space v2
  2011-05-01 15:26   ` Wolfgang Denk
@ 2011-05-01 20:29     ` Simon Guinot
  0 siblings, 0 replies; 14+ messages in thread
From: Simon Guinot @ 2011-05-01 20:29 UTC (permalink / raw)
  To: u-boot

Hi Wolfgang,

On Sun, May 01, 2011 at 05:26:01PM +0200, Wolfgang Denk wrote:
> ...
> > +void mv_phy_88e1116_init(char *name)
> > +{
> ...
> > +	printf("88E1116 Initialized on %s\n", name);
> 
> Maybe you want to change this into a debug() instead? [I guess it
> corrupts the formatting of the boot messages?]

Actually no. The boot messages seems to be well formatted:

Net:   egiga0
88E1116 Initialized on egiga0
Hit any key to stop autoboot:  0 

Anyway, I will turn this message into a debug(). The displayed
information is not very useful (and quite redundant with the previous
message).

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/20110501/900ec6b8/attachment.pgp 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 4/6] mv-common.h: fix DRAM banks configuration
  2011-05-01 16:11   ` Eric Cooper
@ 2011-05-01 21:38     ` Simon Guinot
  0 siblings, 0 replies; 14+ messages in thread
From: Simon Guinot @ 2011-05-01 21:38 UTC (permalink / raw)
  To: u-boot

Hi Eric,

On Sun, May 01, 2011 at 12:11:13PM -0400, Eric Cooper wrote:
> On Sun, May 01, 2011 at 05:04:02PM +0200, Simon Guinot wrote:
> > --- a/include/configs/mv-common.h
> > +++ b/include/configs/mv-common.h
> > @@ -113,6 +113,9 @@
> >  #define CONFIG_SYS_RESET_ADDRESS 0xffff0000	/* Rst Vector Adr */
> >  #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
> >  
> > +/* ====> Include platform Common Definations */
> > +#include <asm/arch/config.h>
> > +
> >  /*
> >   * DRAM Banks configuration, Custom config can be done in <board>.h
> >   */
> > @@ -124,9 +127,6 @@
> >  #endif
> >  #endif /* CONFIG_NR_DRAM_BANKS */
> >  
> > -/* ====> Include platform Common Definations */
> > -#include <asm/arch/config.h>
> > -
> >  /* ====> Include driver Common Definations */
> >  /*
> >   * Common NAND configuration
> > -- 
> > 1.6.3.1
> 
> You didn't fix the "Definations" typos in this one.

Sorry, I missed your reply. I will add this fix into the v3.

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/20110501/c6cc992e/attachment.pgp 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 6/6] Add support for Network Space v2
  2011-05-01 15:04 ` [U-Boot] [PATCH 6/6] Add support for Network Space v2 Simon Guinot
  2011-05-01 15:26   ` Wolfgang Denk
@ 2011-05-02  9:18   ` Prafulla Wadaskar
  2011-05-02 10:20     ` Simon Guinot
  1 sibling, 1 reply; 14+ messages in thread
From: Prafulla Wadaskar @ 2011-05-02  9:18 UTC (permalink / raw)
  To: u-boot



> -----Original Message-----
> From: Simon Guinot [mailto:simon.guinot at sequanux.org]
> Sent: Sunday, May 01, 2011 8:34 PM
> To: Prafulla Wadaskar; Albert ARIBAUD
> Cc: u-boot at lists.denx.de; Simon Guinot
> Subject: [PATCH 6/6] Add support for Network Space v2
> 
> From: Simon Guinot <sguinot@lacie.com>
> 
> This patch add support for the Network Space v2 board and parents.
> This include Network Space (Max) v2 and Internet Space v2.

It's good it you can provide any pointer for board information if any.

> 
> Signed-off-by: Simon Guinot <sguinot@lacie.com>
> ---
>  Makefile                              |    7 ++
>  board/LaCie/netspace_v2/Makefile      |   49 ++++++++++
>  board/LaCie/netspace_v2/kwbimage.cfg  |  162
> +++++++++++++++++++++++++++++++++
>  board/LaCie/netspace_v2/netspace_v2.c |  150
> ++++++++++++++++++++++++++++++
>  board/LaCie/netspace_v2/netspace_v2.h |   39 ++++++++
>  include/configs/netspace_v2.h         |  142
> +++++++++++++++++++++++++++++
>  6 files changed, 549 insertions(+), 0 deletions(-)
>  create mode 100644 board/LaCie/netspace_v2/Makefile
>  create mode 100644 board/LaCie/netspace_v2/kwbimage.cfg
>  create mode 100644 board/LaCie/netspace_v2/netspace_v2.c
>  create mode 100644 board/LaCie/netspace_v2/netspace_v2.h
>  create mode 100644 include/configs/netspace_v2.h

I hope these are not clone from existing supported board.
If you have 80% similarities, you can use the same source code.

> 
> diff --git a/Makefile b/Makefile
> index ada951e..18e6ecd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -897,6 +897,13 @@ TNY_A9260_config	:	unconfig
>  	@echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
>  	@$(MKCONFIG) -n $@ -a tny_a9260 arm arm926ejs tny_a9260 calao at91
> 
> +inetspace_v2_config	\
> +netspace_v2_config	\
> +netspace_max_v2_config	:	unconfig
> +	@mkdir -p $(obj)include
> +	@echo "#define CONFIG_$(shell echo $(@:_config=) | tr 'a-z' 'A-Z')
> 1" >$(obj)include/config.h
> +	@$(MKCONFIG) -n $@ -a netspace_v2 arm arm926ejs netspace_v2 LaCie
> kirkwood
> +
> 

Please refer better way of doing it.
Ref boards.cfg file in : http://lists.denx.de/pipermail/u-boot/2011-April/091368.html

Regards..
Prafulla . .

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [U-Boot] [PATCH 6/6] Add support for Network Space v2
  2011-05-02  9:18   ` Prafulla Wadaskar
@ 2011-05-02 10:20     ` Simon Guinot
  0 siblings, 0 replies; 14+ messages in thread
From: Simon Guinot @ 2011-05-02 10:20 UTC (permalink / raw)
  To: u-boot

On Mon, May 02, 2011 at 02:18:10AM -0700, Prafulla Wadaskar wrote:
> 
> 
> > -----Original Message-----
> > From: Simon Guinot [mailto:simon.guinot at sequanux.org]
> > Sent: Sunday, May 01, 2011 8:34 PM
> > To: Prafulla Wadaskar; Albert ARIBAUD
> > Cc: u-boot at lists.denx.de; Simon Guinot
> > Subject: [PATCH 6/6] Add support for Network Space v2
> > 
> > From: Simon Guinot <sguinot@lacie.com>
> > 
> > This patch add support for the Network Space v2 board and parents.
> > This include Network Space (Max) v2 and Internet Space v2.
> 
> It's good it you can provide any pointer for board information if any.

I can only provide some commercial links and their availability for
a long period is not guaranteed.
 
> 
> > 
> > Signed-off-by: Simon Guinot <sguinot@lacie.com>
> > ---
> >  Makefile                              |    7 ++
> >  board/LaCie/netspace_v2/Makefile      |   49 ++++++++++
> >  board/LaCie/netspace_v2/kwbimage.cfg  |  162
> > +++++++++++++++++++++++++++++++++
> >  board/LaCie/netspace_v2/netspace_v2.c |  150
> > ++++++++++++++++++++++++++++++
> >  board/LaCie/netspace_v2/netspace_v2.h |   39 ++++++++
> >  include/configs/netspace_v2.h         |  142
> > +++++++++++++++++++++++++++++
> >  6 files changed, 549 insertions(+), 0 deletions(-)
> >  create mode 100644 board/LaCie/netspace_v2/Makefile
> >  create mode 100644 board/LaCie/netspace_v2/kwbimage.cfg
> >  create mode 100644 board/LaCie/netspace_v2/netspace_v2.c
> >  create mode 100644 board/LaCie/netspace_v2/netspace_v2.h
> >  create mode 100644 include/configs/netspace_v2.h
> 
> I hope these are not clone from existing supported board.
> If you have 80% similarities, you can use the same source code.

No, this boards are not clones from the already supported ones.

> 
> > 
> > diff --git a/Makefile b/Makefile
> > index ada951e..18e6ecd 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -897,6 +897,13 @@ TNY_A9260_config	:	unconfig
> >  	@echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
> >  	@$(MKCONFIG) -n $@ -a tny_a9260 arm arm926ejs tny_a9260 calao at91
> > 
> > +inetspace_v2_config	\
> > +netspace_v2_config	\
> > +netspace_max_v2_config	:	unconfig
> > +	@mkdir -p $(obj)include
> > +	@echo "#define CONFIG_$(shell echo $(@:_config=) | tr 'a-z' 'A-Z')
> > 1" >$(obj)include/config.h
> > +	@$(MKCONFIG) -n $@ -a netspace_v2 arm arm926ejs netspace_v2 LaCie
> > kirkwood
> > +
> > 
> 
> Please refer better way of doing it.
> Ref boards.cfg file in : http://lists.denx.de/pipermail/u-boot/2011-April/091368.html

This mistake is fixed since the v2 patch series.

Regards,

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/20110502/1b9dcb0f/attachment.pgp 

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2011-05-02 10:20 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-01 15:03 [U-Boot] [PATCH 0/6] Add support for LaCie NAS Network Space v2 Simon Guinot
2011-05-01 15:03 ` [U-Boot] [PATCH 1/6] sf: add support for Macronix MX25L4005A Simon Guinot
2011-05-01 15:04 ` [U-Boot] [PATCH 2/6] sf: disable write protection for Macronix flash Simon Guinot
2011-05-01 15:04 ` [U-Boot] [PATCH 3/6] Kirkwood: allow to override CONFIG_SYS_TCLK Simon Guinot
2011-05-01 15:04 ` [U-Boot] [PATCH 4/6] mv-common.h: fix DRAM banks configuration Simon Guinot
2011-05-01 16:11   ` Eric Cooper
2011-05-01 21:38     ` Simon Guinot
2011-05-01 15:04 ` [U-Boot] [PATCH 5/6] netconsole: remove `serverip' check Simon Guinot
2011-05-01 15:19   ` Wolfgang Denk
2011-05-01 15:04 ` [U-Boot] [PATCH 6/6] Add support for Network Space v2 Simon Guinot
2011-05-01 15:26   ` Wolfgang Denk
2011-05-01 20:29     ` Simon Guinot
2011-05-02  9:18   ` Prafulla Wadaskar
2011-05-02 10:20     ` Simon Guinot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox