Skip to contentSkip to conversation

lsxl: add support for lschlv2 and lsxhl

PATCH New Michael Walle 2 participants 11 messages Jan 2, 2012 – Feb 20, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

This patchset adds support for both the Linkstation Live (LS-CHLv2) and Linkstation Pro (LS-XHL) by Buffalo.

Cc Prafulla Wadaskar <[email protected]>
---
 MAINTAINERS                           |    4 +
 board/Marvell/lsxl/Makefile           |   50 +++++++
 board/Marvell/lsxl/config.mk          |    1 +
 board/Marvell/lsxl/kwbimage-lschl.cfg |   66 +++++++++
 board/Marvell/lsxl/kwbimage-lsxhl.cfg |   66 +++++++++
 board/Marvell/lsxl/lsxl.c             |  233 +++++++++++++++++++++++++++++++++
 board/Marvell/lsxl/lsxl.h             |   75 +++++++++++
 boards.cfg                            |    3 +
 include/configs/lsxl.h                |  175 +++++++++++++++++++++++++
 9 files changed, 673 insertions(+), 0 deletions(-)
 create mode 100644 board/Marvell/lsxl/Makefile
 create mode 100644 board/Marvell/lsxl/config.mk
 create mode 100644 board/Marvell/lsxl/kwbimage-lschl.cfg
 create mode 100644 board/Marvell/lsxl/kwbimage-lsxhl.cfg
 create mode 100644 board/Marvell/lsxl/lsxl.c
 create mode 100644 board/Marvell/lsxl/lsxl.h
 create mode 100644 include/configs/lsxl.h
MAINTAINERS +4 -0
index a56ca10..f55cd3b 100644
@@ -876,6 +876,10 @@ Prafulla Wadaskar <[email protected]>
 	rd6281a		ARM926EJS (Kirkwood SoC)
 	sheevaplug	ARM926EJS (Kirkwood SoC)
 
+Michael Walle <[email protected]>
+
+	lsxl		ARM926EJS (Kirkwood SoC)
+
 Tom Warren <[email protected]>
 
 	harmony		Tegra2 (ARM7 & A9 Dual Core)
board/Marvell/lsxl/Makefile new file +50 -0

50 lines not on this page · raw message

board/Marvell/lsxl/config.mk new file +1 -0
new file mode 100644
index 0000000..062554b
@@ -0,0 +1 @@
+ALL-y += $(obj)u-boot.kwb
board/Marvell/lsxl/kwbimage-lschl.cfg new file +66 -0

66 lines not on this page · raw message

board/Marvell/lsxl/kwbimage-lsxhl.cfg new file +66 -0

66 lines not on this page · raw message

board/Marvell/lsxl/lsxl.c new file +233 -0

233 lines not on this page · raw message

board/Marvell/lsxl/lsxl.h new file +75 -0

75 lines not on this page · raw message

boards.cfg +3 -0
index 66c27a4..f4e5575 100644
@@ -152,6 +152,9 @@ openrd_client                arm         arm926ejs   openrd              Marvell
 openrd_ultimate              arm         arm926ejs   openrd              Marvell        kirkwood        openrd:BOARD_IS_OPENRD_ULTIMATE
 rd6281a                      arm         arm926ejs   -                   Marvell        kirkwood
 sheevaplug                   arm         arm926ejs   -                   Marvell        kirkwood
+lsxhl                        arm         arm926ejs   lsxl               Marvell        kirkwood    lsxl:LSXHL
+lschl                        arm         arm926ejs   lsxl               Marvell        kirkwood    lsxl:LSCHL
+lschl_ramboot                arm         arm926ejs   lsxl               Marvell        kirkwood    lsxl:LSCHL,SYS_RAMBOOT,SYS_TEXT_BASE=0x00700000
 dockstar                     arm         arm926ejs   -                   Seagate        kirkwood
 jadecpu                      arm         arm926ejs   jadecpu             syteco         mb86r0x
 mx25pdk                      arm         arm926ejs   mx25pdk             freescale      mx25		mx25pdk:IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg
include/configs/lsxl.h new file +175 -0

175 lines not on this page · raw message

Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

Dear Michael Walle,

Quoted 2 lines · In message <[email protected]> you wrote:

This patchset adds support for both the Linkstation Live (LS-CHLv2) and Linkstation Pro (LS-XHL) by Buffalo.

If Buffalo is the vendor, then why do you add this to the Marvell vendor directory?

MAINTAINERS Prafulla Wadaskar <[email protected]> · line 881

Quoted 3 lines
MAINTAINERS +3 -0
+Michael Walle <[email protected]>
+
+	lsxl		ARM926EJS (Kirkwood SoC)

You add two boards, so please also maintain both.

include/configs/lsxl.h line 47

Quoted 3 lines
include/configs/lsxl.h new file +3 -0
+#define CONFIG_FEROCEON_88FR131 1   /* CPU Core subversion */
+#define CONFIG_KIRKWOOD     1   /* SOC Family Name */
+#define CONFIG_KW88F6281    1   /* SOC Name */

Please don't define values for macros that select featues only. Please fix globally.

include/configs/lsxl.h line 119

Quoted 10 lines
include/configs/lsxl.h new file +10 -0
+#ifdef CONFIG_SPI_FLASH
+#define CONFIG_SYS_MAX_FLASH_BANKS  1
+#define CONFIG_SYS_MAX_FLASH_SECT   8
+#define CONFIG_ENV_IS_IN_SPI_FLASH  1
+#define CONFIG_ENV_SECT_SIZE        0x10000 /* 64K */
+#else
+#define CONFIG_ENV_IS_NOWHERE       1   /* if env in SDRAM */
+#endif
+#define CONFIG_ENV_SIZE         0x10000 /* 64k */
+#define CONFIG_ENV_OFFSET       0x70000 /* env starts here */

Please use TABs only for vertical alignment. Please fix globally.

Quoted 1 line

+#define CONFIG_ETHADDR 02:00:01:00:00:00

...

include/configs/lsxl.h line 138

Quoted 3 lines
include/configs/lsxl.h new file +3 -0
+#define CONFIG_IPADDR		192.168.11.150
+#define CONFIG_SERVERIP		192.168.11.1
+#define CONFIG_NETMASK		255.255.255.0

NAK. We do not allow such static network configurations.

include/configs/lsxl.h line 150

Quoted 11 lines
include/configs/lsxl.h new file +11 -0
+#define CONFIG_BOOTARGS		"console=ttyS0,115200 root=/dev/sda2 "         \
+				"netconsole=@"MK_STR(CONFIG_IPADDR)"/eth1"
+#define CONFIG_EXTRA_ENV_SETTINGS                                              \
+	"bootsource=hdd\0"                                                     \
+	"hdpart=0:1\0"                                                         \
+	"bootcmd_net=tftpboot 0x00100000 uImage; "                             \
+	    "tftpboot 0x00800000 uInitrd; "                                    \
+	    "bootm 0x00100000 0x00800000\0"                                    \
+	"bootcmd_hdd=ide reset; ext2load ide ${hdpart} 0x00100000 /uImage; "   \
+	    "ext2load ide ${hdpart} 0x00800000 /uInitrd; "                     \
+	    "bootm 0x00100000 0x00800000\0"                                    \

Indentation by TAB only, please. Please fix globally.

Best regards,

Wolfgang Denk

Signature · 4 lines
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
The more sins you confess, the more books you will sell.
#2 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

Hi Wolfgang,

quick answer ;)

Quoted 6 lines
Quoted 2 lines · In message <[email protected]> you wrote:

This patchset adds support for both the Linkstation Live (LS-CHLv2) and Linkstation Pro (LS-XHL) by Buffalo.

If Buffalo is the vendor, then why do you add this to the Marvell vendor directory?

I was just guessing. It is a Marvell SoC and marvell SoC boards of other vendors are in the Marvell/ directory, too. But i'm also happy with Buffalo/ (or buffalo/?).

Quoted 5 lines

MAINTAINERS Prafulla Wadaskar <[email protected]> · line 881

Quoted 3 lines
MAINTAINERS +3 -0
+Michael Walle <[email protected]>
+
+	lsxl		ARM926EJS (Kirkwood SoC)

You add two boards, so please also maintain both.

oops sorry.

Quoted 6 lines

include/configs/lsxl.h line 47

Quoted 3 lines
include/configs/lsxl.h new file +3 -0
+#define CONFIG_FEROCEON_88FR131 1   /* CPU Core subversion */
+#define CONFIG_KIRKWOOD     1   /* SOC Family Name */
+#define CONFIG_KW88F6281    1   /* SOC Name */

Please don't define values for macros that select featues only. Please fix globally.

ok

Quoted 4 lines
Quoted 4 lines
include/configs/lsxl.h new file +4 -0
+#ifdef CONFIG_SPI_FLASH
+#define CONFIG_SYS_MAX_FLASH_BANKS  1
+#define CONFIG_SYS_MAX_FLASH_SECT   8
+#define CONFIG_ENV_IS_IN_SPI_FLASH  1
Quoted 8 lines

include/configs/lsxl.h line 119

Quoted 6 lines
include/configs/lsxl.h new file +6 -0
+#define CONFIG_ENV_SECT_SIZE        0x10000 /* 64K */
+#else
+#define CONFIG_ENV_IS_NOWHERE       1   /* if env in SDRAM */
+#endif
+#define CONFIG_ENV_SIZE         0x10000 /* 64k */
+#define CONFIG_ENV_OFFSET       0x70000 /* env starts here */

Please use TABs only for vertical alignment. Please fix globally.

ok

Quoted 9 lines
Quoted 1 line

+#define CONFIG_ETHADDR 02:00:01:00:00:00

...

include/configs/lsxl.h line 138

Quoted 3 lines
include/configs/lsxl.h new file +3 -0
+#define CONFIG_IPADDR		192.168.11.150
+#define CONFIG_SERVERIP		192.168.11.1
+#define CONFIG_NETMASK		255.255.255.0

NAK. We do not allow such static network configurations.

i've already guessed that ;) you may remember our lengthy discussions about the board which don't have a dedicated NVRAM for the ethernet address. Well, this is such a board. I would have expected more responses from other maintainers of this type of boards, esp. after the patch which removes the mac randomization from the ethernet driver, was merged.

So if
#define CONFIG_ETHADDR xxx
#define CONFIG_OVERWRITE_ETHADDR_ONCE
is a no-no (i really dont see the point, why it's not allowed, sorry), i guess i have to maintain this on my own tree :(

Signature · 1 line
Michael
#3 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

Dear Michael,

Quoted 6 lines · In message <[email protected]> you wrote:
Quoted 3 lines

If Buffalo is the vendor, then why do you add this to the Marvell vendor directory?

I was just guessing. It is a Marvell SoC and marvell SoC boards of other vendors are in the Marvell/ directory, too. But i'm also happy with Buffalo/ (or buffalo/?).

board/buffalo/, please.

Quoted 6 lines
Quoted 1 line

NAK. We do not allow such static network configurations.

i've already guessed that ;) you may remember our lengthy discussions about the board which don't have a dedicated NVRAM for the ethernet address. Well, this is such a board. I would have expected more responses from other maintainers of this type of boards, esp. after the patch which removes the mac randomization from the ethernet driver, was merged.

Actuaklly this is the standard case. Only a tiny minority of boards provide such storage for the MAC address. The overwhelming majority has none, and just uses the environment.

Quoted 5 lines

So if
#define CONFIG_ETHADDR xxx
#define CONFIG_OVERWRITE_ETHADDR_ONCE
is a no-no (i really dont see the point, why it's not allowed, sorry), i guess i have to maintain this on my own tree :(

It is not allowed because a MAC address is a _unique_ identifier.

Can you explain why you think it is needed at all? There are probably some 900+ board configurations which don't need it (only in mainline, not counting any out-of-tree ports), so why do you need it?

Best regards,

Wolfgang Denk

Signature · 5 lines
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
A wise person makes his  own  decisions,  a  weak  one  obeys  public
opinion.                                           -- Chinese proverb
#4 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

Hi Wolfgang,

Quoted 21 lines · Wolfgang Denk
Quoted 9 lines
Quoted 1 line

NAK. We do not allow such static network configurations.

i've already guessed that ;) you may remember our lengthy discussions about
the board which don't have a dedicated NVRAM for the ethernet address. Well,
this is such a board. I would have expected more responses from other maintainers of this type of boards, esp. after the patch which removes the mac
randomization from the ethernet driver, was merged.

Actuaklly this is the standard case. Only a tiny minority of boards provide such storage for the MAC address. The overwhelming majority has none, and just uses the environment.

Quoted 6 lines

So if
#define CONFIG_ETHADDR xxx
#define CONFIG_OVERWRITE_ETHADDR_ONCE
is a no-no (i really dont see the point, why it's not allowed, sorry), i guess
i have to maintain this on my own tree :(

Quoted 5 lines

It is not allowed because a MAC address is a _unique_ identifier.

Can you explain why you think it is needed at all? There are probably some 900+ board configurations which don't need it (only in mainline, not counting any out-of-tree ports), so why do you need it?

The linkstations don't have a (populated) serial port. There is no way to access an unmodified board other than using the netconsole. If you want to recover from a bad environment setting or an empty environment, you can do this only with a working network connection.

Signature · 1 line
michael
#5 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

Dear Michael,

Quoted 5 lines · In message <[email protected]> you…

The linkstations don't have a (populated) serial port. There is no way to access an unmodified board other than using the netconsole. If you want to recover from a bad environment setting or an empty environment, you can do this only with a working network connection.

I understand they have USB? Can we use console over USB instead?

Best regards,

Wolfgang Denk

Signature · 6 lines
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
"Where shall I begin, please your Majesty?" he asked. "Begin  at  the
beginning,"  the  King said, gravely, "and go on till you come to the
end: then stop."    - Alice's Adventures in Wonderland, Lewis Carroll
#6 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

Am Dienstag 03 Januar 2012, 15:46:09 schrieb Wolfgang Denk:

Quoted 3 lines

Dear Michael,

In message <[email protected]>

Quoted 6 lines · you
Quoted 4 lines

The linkstations don't have a (populated) serial port. There is no way to access an unmodified board other than using the netconsole. If you want to recover from a bad environment setting or an empty environment, you can do this only with a working network connection.

I understand they have USB? Can we use console over USB instead?

yeah that should be possible.

another idea by Mario Fetka is to load a resuce environment from an usb storage. i don't know if that is easy to achieve. Maybe someone knows a board which does sth similar?

or maybe sth like windows autostart, that is if there is some special file on the storage run it as a script.

Signature · 1 line
michael
#7 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

In reply to Wolfgang Denk

Am Dienstag 03 Januar 2012, 15:46:09 schrieb Wolfgang Denk:

Quoted 3 lines

Dear Michael,

In message <[email protected]>

Quoted 6 lines · you
Quoted 4 lines

The linkstations don't have a (populated) serial port. There is no way to access an unmodified board other than using the netconsole. If you want to recover from a bad environment setting or an empty environment, you can do this only with a working network connection.

I understand they have USB? Can we use console over USB instead?

Mh, they have an USB host controller. I had a quick look at the usbtty driver and they only support usb gadgets. So i don't think we can use console over USB. (I thought it would be possible to plug in a USB-to-Serial adapter and use this serial port as a console then.)

Signature · 1 line
Michael
#8 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

In reply to Wolfgang Denk

Hi Wolfgang,

Am Dienstag 03 Januar 2012, 15:46:09 schrieb Wolfgang Denk:

Quoted 6 lines
Quoted 4 lines

The linkstations don't have a (populated) serial port. There is no way to access an unmodified board other than using the netconsole. If you want to recover from a bad environment setting or an empty environment, you can do this only with a working network connection.

I understand they have USB? Can we use console over USB instead?

sorry for digging out an old thread ;)

Unfortunately newer linkstations haven't even usb ports populated. Would you accept a special rescue mode, in which there is a fixed (hardcoded) mac address and fixed IP settings. This mode would be enabled by pressing a button for some time upon startup.

Signature · 1 line
Michael
#9 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

In reply to Wolfgang Denk
Quoted 7 lines · Wolfgang Denk
Quoted 1 line

+#define CONFIG_ETHADDR 02:00:01:00:00:00

...

include/configs/lsxl.h line 138

Quoted 3 lines
include/configs/lsxl.h new file +3 -0
+#define CONFIG_IPADDR		192.168.11.150
+#define CONFIG_SERVERIP		192.168.11.1
+#define CONFIG_NETMASK		255.255.255.0

NAK. We do not allow such static network configurations.

Ok, heres another idea:
If i had a special rescue mode, started by lets say, pushing a button on startup, which then sets this fixed mac address (and other things like serial to netconsole etc), would that be acked by you?

Signature · 1 line
michael
#10 lore raw

PATCH 1/1 lsxl: add support for lschlv2 and lsxhl

In reply to Wolfgang Denk

Hi Wolfgang,

Am Dienstag 03 Januar 2012, 00:55:41 schrieb Wolfgang Denk:

Quoted 9 lines
Quoted 1 line

+#define CONFIG_ETHADDR 02:00:01:00:00:00

...

include/configs/lsxl.h line 138

Quoted 3 lines
include/configs/lsxl.h new file +3 -0
+#define CONFIG_IPADDR		192.168.11.150
+#define CONFIG_SERVERIP		192.168.11.1
+#define CONFIG_NETMASK		255.255.255.0

NAK. We do not allow such static network configurations.

Mh if static IPs are not allowed, there will be no way to use netconsole by default, is it?

I still need to try USB serial console, but IMHO it is easier for a user/developer to use a netconsole.

Signature · 1 line
Michael