Skip to contentSkip to conversation

ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

PATCH New Tanmay Upadhyay 5 participants 10 messages Jun 10, 2010 – Jun 14, 2010

Subsystems (2)
Arm (32-bit) Kbuild
lore
Share & tools
lore

Tanmay Upadhyay

author
#0 lore raw

PATCH 1/1 ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

This patch modifies existing OpenRD-Base support to deal with all the three OpenRD boards (OpenRD-Base, OpenRD-Client & OpenRD-Ultimate).

Signed-off-by Tanmay Upadhyay <[email protected]>
---
 Makefile                                |    9 +-
 arch/arm/include/asm/mach-types.h       |   13 ++
 board/Marvell/openrd/Makefile           |   65 +++++++++
 board/Marvell/openrd/config.mk          |   33 +++++
 board/Marvell/openrd/kwbimage.cfg       |  168 +++++++++++++++++++++++
 board/Marvell/openrd/openrd.c           |  180 +++++++++++++++++++++++++
 board/Marvell/openrd/openrd.h           |   67 ++++++++++
 board/Marvell/openrd_base/Makefile      |   56 --------
 board/Marvell/openrd_base/config.mk     |   33 -----
 board/Marvell/openrd_base/kwbimage.cfg  |  168 -----------------------
 board/Marvell/openrd_base/openrd_base.c |  160 ----------------------
 board/Marvell/openrd_base/openrd_base.h |   46 -------
 include/configs/openrd_client.h         |  219 +++++++++++++++++++++++++++++++
 include/configs/openrd_ultimate.h       |  219 +++++++++++++++++++++++++++++++
 14 files changed, 972 insertions(+), 464 deletions(-)
 create mode 100644 board/Marvell/openrd/Makefile
 create mode 100644 board/Marvell/openrd/config.mk
 create mode 100644 board/Marvell/openrd/kwbimage.cfg
 create mode 100644 board/Marvell/openrd/openrd.c
 create mode 100644 board/Marvell/openrd/openrd.h
 delete mode 100644 board/Marvell/openrd_base/Makefile
 delete mode 100644 board/Marvell/openrd_base/config.mk
 delete mode 100644 board/Marvell/openrd_base/kwbimage.cfg
 delete mode 100644 board/Marvell/openrd_base/openrd_base.c
 delete mode 100644 board/Marvell/openrd_base/openrd_base.h
 create mode 100644 include/configs/openrd_client.h
 create mode 100644 include/configs/openrd_ultimate.h
Makefile +8 -1
index c26e491..f12214b 100644
@@ -3007,8 +3007,15 @@ omap1610h2_cs_autoboot_config:	unconfig
 omap5912osk_config :	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk ti omap
 
+openrd_ultimate_config \
+openrd_client_config \
 openrd_base_config: unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
+	@$(MKCONFIG) $(@:_config=) arm arm926ejs openrd Marvell kirkwood
+ifneq ($(SRCTREE),$(OBJTREE))
+	@echo "VARIANT= $(@:_config=)" >> $(OBJTREE)/include/config.mk
+else
+	@echo "VARIANT= $(@:_config=)" >> ./include/config.mk
+endif
 
 xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
arch/arm/include/asm/mach-types.h +13 -0
index 940d814..19114b0 100644
@@ -2862,6 +2862,7 @@ extern unsigned int __machine_arch_type;
 #define MACH_TYPE_MATRIX518            2879
 #define MACH_TYPE_TINY_GURNARD         2880
 #define MACH_TYPE_SPEAR1310            2881
+#define MACH_TYPE_OPENRD_ULTIMATE      2884
 
 #ifdef CONFIG_ARCH_EBSA110
 # ifdef machine_arch_type

@@ -37063,6 +37064,18 @@ extern unsigned int __machine_arch_type;
 # define machine_is_spear1310()	(0)
 #endif
 
+#ifdef CONFIG_MACH_OPENRD_ULTIMATE
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_OPENRD_ULTIMATE
+# endif
+# define machine_is_openrd_ultimate()	(machine_arch_type == MACH_TYPE_OPENRD_ULTIMATE)
+#else
+# define machine_is_openrd_ultimate()	(0)
+#endif
+
 /*
  * These have not yet been registered
  */
board/Marvell/openrd/Makefile new file +65 -0

65 lines not on this page · raw message

board/Marvell/openrd/config.mk new file +33 -0
new file mode 100644
index 0000000..8ae355e
@@ -0,0 +1,33 @@
+#
+# (C) Copyright 2009
+# Net Insight <www.netinsight.net>
+# Written-by: Simon Kagstrom <[email protected]>
+#
+# Based on sheevaplug:
+# (C) Copyright 2009
+# Marvell Semiconductor <www.marvell.com>
+# Written-by: Prafulla Wadaskar <[email protected]>
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+
+TEXT_BASE = 0x00600000
+
+# Kirkwood Boot Image configuration file
+KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
board/Marvell/openrd/kwbimage.cfg new file +168 -0

168 lines not on this page · raw message

board/Marvell/openrd/openrd.c new file +180 -0

180 lines not on this page · raw message

board/Marvell/openrd/openrd.h new file +67 -0

67 lines not on this page · raw message

board/Marvell/openrd_base/Makefile deleted +0 -56

56 lines not on this page · raw message

board/Marvell/openrd_base/config.mk deleted +0 -33
deleted file mode 100644
index 8ae355e..0000000
@@ -1,33 +0,0 @@
-#
-# (C) Copyright 2009
-# Net Insight <www.netinsight.net>
-# Written-by: Simon Kagstrom <[email protected]>
-#
-# Based on sheevaplug:
-# (C) Copyright 2009
-# Marvell Semiconductor <www.marvell.com>
-# Written-by: Prafulla Wadaskar <[email protected]>
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
-#
-
-TEXT_BASE = 0x00600000
-
-# Kirkwood Boot Image configuration file
-KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
board/Marvell/openrd_base/kwbimage.cfg deleted +0 -168

168 lines not on this page · raw message

board/Marvell/openrd_base/openrd_base.c deleted +0 -160

160 lines not on this page · raw message

board/Marvell/openrd_base/openrd_base.h deleted +0 -46

46 lines not on this page · raw message

include/configs/openrd_client.h new file +219 -0

219 lines not on this page · raw message

include/configs/openrd_ultimate.h new file +219 -0

219 lines not on this page · raw message

Signature · 1 line
1.6.6.1
#1 lore raw

PATCH 1/1 ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

Quoted 2 lines · On Thu, 10 Jun 2010 14:42:24 +0530 Tanmay Upadhyay…

This patch modifies existing OpenRD-Base support to deal with all the three OpenRD boards (OpenRD-Base, OpenRD-Client & OpenRD-Ultimate).

Yes, that's a good change!

arch/arm/include/asm/mach-types.h extern unsigned int __machine_arch_type; · line 2865

Quoted 9 lines
arch/arm/include/asm/mach-types.h +1 -0
index 940d814..19114b0 100644
@@ -2862,6 +2862,7 @@ extern unsigned int __machine_arch_type;
 #define MACH_TYPE_MATRIX518            2879
 #define MACH_TYPE_TINY_GURNARD         2880
 #define MACH_TYPE_SPEAR1310            2881
+#define MACH_TYPE_OPENRD_ULTIMATE      2884

I don't think this file is supposed to be edited in patches, but rather synched from arm-linux by Wolfgang from time to time.

include/configs/openrd_client.h

Quoted 3 lines
include/configs/openrd_client.h new file +0 -0
new file mode 100644
index 0000000..d936ffa

Perhaps common parts of this...

include/configs/openrd_ultimate.h

Quoted 3 lines
include/configs/openrd_ultimate.h new file +0 -0
new file mode 100644
index 0000000..a0e0417

and this and openrd_base.h can be merged into a common file. Most stuff should be identical, right?

// Simon

author
#2 lore raw

PATCH 1/1 ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

Quoted 10 lines · Simon Kagstrom
Quoted 3 lines · On Thu, 10 Jun 2010 14:42:24 +0530 Tanmay…

This patch modifies existing OpenRD-Base support to deal with all the three OpenRD boards (OpenRD-Base, OpenRD-Client& OpenRD-Ultimate).

Yes, that's a good change!

Quoted 14 lines

arch/arm/include/asm/mach-types.h extern unsigned int __machine_arch_type; · line 2866

Quoted 10 lines
arch/arm/include/asm/mach-types.h +1 -0
index 940d814..19114b0 100644
@@ -2862,6 +2862,7 @@ extern unsigned int __machine_arch_type;
  #define MACH_TYPE_MATRIX518            2879
  #define MACH_TYPE_TINY_GURNARD         2880
  #define MACH_TYPE_SPEAR1310            2881
+#define MACH_TYPE_OPENRD_ULTIMATE      2884

I don't think this file is supposed to be edited in patches, but rather synched from arm-linux by Wolfgang from time to time.

Sorry, I didn't know about that. However, as the number is already registered, is that ok to have it here?

Quoted 7 lines

include/configs/openrd_client.h

Quoted 4 lines
include/configs/openrd_client.h new file +0 -0
new file mode 100644
index 0000000..d936ffa

Perhaps common parts of this...

Quoted 7 lines

include/configs/openrd_ultimate.h

Quoted 4 lines
include/configs/openrd_ultimate.h new file +0 -0
new file mode 100644
index 0000000..a0e0417

and this and openrd_base.h can be merged into a common file. Most stuff should be identical, right?

I agree with you. But auto-generated 'config.h' file includes <board_name.h>. So there has to be one for each board. However, there could be one 'openrd.h' in the configs and three board specific files include it. This will increase the number of files, but would decrease LOC. What do you think?

Thanks,

Tanmay

Quoted 9 lines

// Simon

Email Scanned for Virus& Dangerous Content by : www.CleanMailGateway.com

____________________________________________________________________________________
Disclaimer: This e-mail message and all attachments transmitted with it are intended solely for the use of the addressee and may contain legally privileged and confidential information. If the reader of this message is not the intended recipient, or an employee or agent responsible for delivering this message to the intended recipient, you are hereby notified that any dissemination, distribution, copying, or other use of this message or its attachments is strictly prohibited. If you have received this message in error, please notify the sender immediately by replying to this message and please delete it from your computer. Any views expressed in this message are those of the individual sender unless otherwise stated.Company has taken enough precautions to prevent the spread of viruses. However the company accepts no liability for any damage caused by any virus transmitted by this email.
____________________________________________________________________________________

#3 lore raw

PATCH 1/1 ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

Quoted 7 lines · On Thu, 10 Jun 2010 15:08:00 +0530 Tanmay Upadhyay…
Quoted 4 lines
Quoted 2 lines

+#define MACH_TYPE_OPENRD_ULTIMATE 2884

I don't think this file is supposed to be edited in patches, but rather synched from arm-linux by Wolfgang from time to time.

Sorry, I didn't know about that. However, as the number is already registered, is that ok to have it here?

Probably Wolfgang or Tom Rix (the ARM maintainer) can synch it if you ask them to.

Quoted 5 lines

I agree with you. But auto-generated 'config.h' file includes <board_name.h>. So there has to be one for each board. However, there could be one 'openrd.h' in the configs and three board specific files include it. This will increase the number of files, but would decrease LOC. What do you think?

Personally I'd prefer to keep the common parts in a common file, so I'd vote for that solution.

// Simon

#4 lore raw

PATCH 1/1 ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

Quoted 16 lines

-----Original Message-----
From: Simon Kagstrom [mailto:simon.kagstrom at netinsight.net]
Sent: Thursday, June 10, 2010 3:56 PM
To: Tanmay Upadhyay
Cc: Prafulla Wadaskar; u-boot at lists.denx.de
Subject: Re: [PATCH] ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

Quoted 3 lines · On Thu, 10 Jun 2010 15:08:00 +0530 Tanmay Upadhyay…
Quoted 3 lines
Quoted 2 lines

+#define MACH_TYPE_OPENRD_ULTIMATE 2884

I don't think this file is supposed to be edited in

Quoted 8 lines

patches, but rather

Quoted 4 lines
Quoted 1 line

synched from arm-linux by Wolfgang from time to time.

Sorry, I didn't know about that. However, as the number is already registered, is that ok to have it here?

Probably Wolfgang or Tom Rix (the ARM maintainer) can synch it if you ask them to.

Tom Does this frequently, Hi Tom, can you pls do the needful?

Quoted 3 lines
Quoted 3 lines

I agree with you. But auto-generated 'config.h' file includes <board_name.h>. So there has to be one for each board.

Yes, This is correct approach, lets have three files for three boards (like other added) Abstract common part in openrd.h and include it in respective board config header files.

Quoted 6 lines

However, there

Quoted 1 line

could be one 'openrd.h' in the configs and three board

specific files

Quoted 1 line

include it. This will increase the number of files, but

would decrease

Quoted 1 line

LOC. What do you think?

As suggested above, let's keep code clean and simple.
Adding new board support in future to the same family will keep on increasing code complexity. I prefer adding few files instead of modifying existing.
Secondly kwimage.cfg in your port may have common settings for all three board which may not be the case always. And file parsing does not support conditional code for this file.

So I suggest, you should keep common code under openrd.c/h, and board specific in <board_name>.c/h Even I don't mind keeping existing openrd_base board support as it is and adding new board support for two other boards.

Regards..
Prafulla . .

author
#5 lore raw

PATCH 1/1 ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

Quoted 24 lines · Prafulla Wadaskar
Quoted 24 lines

-----Original Message-----
From: Simon Kagstrom [mailto:simon.kagstrom at netinsight.net]
Sent: Thursday, June 10, 2010 3:56 PM
To: Tanmay Upadhyay
Cc: Prafulla Wadaskar; u-boot at lists.denx.de
Subject: Re: [PATCH] ARM: Kirkwood: Add support for OpenRD-Client& OpenRD-Ultimate

Quoted 5 lines · On Thu, 10 Jun 2010 15:08:00 +0530 Tanmay…
Quoted 5 lines
Quoted 3 lines

+#define MACH_TYPE_OPENRD_ULTIMATE 2884

I don't think this file is supposed to be edited in

patches, but rather

Quoted 2 lines
Quoted 2 lines

synched from arm-linux by Wolfgang from time to time.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Sorry, I didn't know about that. However, as the number is already registered, is that ok to have it here?

Probably Wolfgang or Tom Rix (the ARM maintainer) can synch it if you ask them to.

Tom Does this frequently, Hi Tom, can you pls do the needful?

Tom has synched it, but unfortunately the code for ultimate hasn't been in yet. It's stuck somewhere
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-June/017535.html.

Shall I wait for this patch to get into the kernel before I send mine for u-boot? Otherwise my patch won't get compiled. However, I can send my patch for review. I have operd.h, openrd_base.h, openrd_client.h & openrd_ultimate.h in 'include/configs' as suggested.

Please suggest.

Thanks,

Tanmay

Quoted 41 lines
Quoted 5 lines
Quoted 5 lines

I agree with you. But auto-generated 'config.h' file includes <board_name.h>. So there has to be one for each board.

Yes, This is correct approach, lets have three files for three boards (like other added) Abstract common part in openrd.h and include it in respective board config header files.

Quoted 12 lines

However, there

Quoted 2 lines

could be one 'openrd.h' in the configs and three board

specific files

Quoted 2 lines

include it. This will increase the number of files, but

would decrease

Quoted 2 lines

LOC. What do you think?

As suggested above, let's keep code clean and simple.
Adding new board support in future to the same family will keep on increasing code complexity. I prefer adding few files instead of modifying existing.
Secondly kwimage.cfg in your port may have common settings for all three board which may not be the case always. And file parsing does not support conditional code for this file.

So I suggest, you should keep common code under openrd.c/h, and board specific in<board_name>.c/h Even I don't mind keeping existing openrd_base board support as it is and adding new board support for two other boards.

Regards..
Prafulla . .

Email Scanned for Virus& Dangerous Content by : www.CleanMailGateway.com

____________________________________________________________________________________
Disclaimer: This e-mail message and all attachments transmitted with it are intended solely for the use of the addressee and may contain legally privileged and confidential information. If the reader of this message is not the intended recipient, or an employee or agent responsible for delivering this message to the intended recipient, you are hereby notified that any dissemination, distribution, copying, or other use of this message or its attachments is strictly prohibited. If you have received this message in error, please notify the sender immediately by replying to this message and please delete it from your computer. Any views expressed in this message are those of the individual sender unless otherwise stated.Company has taken enough precautions to prevent the spread of viruses. However the company accepts no liability for any damage caused by any virus transmitted by this email.
____________________________________________________________________________________

#6 lore raw

PATCH 1/1 ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

In reply to Tanmay Upadhyay

Le 10/06/2010 11:12, Tanmay Upadhyay a ?crit :

Quoted 2 lines

This patch modifies existing OpenRD-Base support to deal with all the three OpenRD boards (OpenRD-Base, OpenRD-Client& OpenRD-Ultimate).

Probably small detail: this patch replaces the @ by an <at> in the e-mail addresses (not only the patch author's). Is it a policy for submitting patches to u-boot that all e-mail addresses should be 'obfuscated' so?

More important: I've tried running the resulting u-boot on my OpenRD-Client by TFTPing it to RAM (the default OpenRD-Client config has CONFIG_SKIP_LOWLEVEL_INIT defined and CONFIG_SKIP_RELACATION undefined). Doing a 'go' to the load address causes no visible output on the console and no sign of life at all -- I have to reset the board to get back to the FLASH u-boot. Anyone here had better luck with the OpenRD client config?

Amicalement,

Signature · 1 line
Albert.
#7 lore raw

PATCH 1/1 ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

Dear Albert ARIBAUD,

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

Le 10/06/2010 11:12, Tanmay Upadhyay a =E9crit :

Quoted 2 lines

This patch modifies existing OpenRD-Base support to deal with all the three OpenRD boards (OpenRD-Base, OpenRD-Client& OpenRD-Ultimate).

Probably small detail: this patch replaces the @ by an <at> in the > e-mail addresses (not only the patch author's). Is it a policy for > submitting patches to u-boot that all e-mail addresses should be > 'obfuscated' so?

This is not only NOT policy, but it is a strict NO-NO. Do NOT do that.

Best regards,

Wolfgang Denk

Signature · 8 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
When a child is taught ... its programmed with simple instructions --
and at some point, if its mind develops properly, it exceeds the  sum
of what it was taught, thinks independently.
	-- Dr. Richard Daystrom, "The Ultimate Computer",
	   stardate 4731.3.
#8 lore raw

PATCH 1/1 ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

In reply to Albert ARIBAUD

Dear Albert ARIBAUD,

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

This patch modifies existing OpenRD-Base support to deal with all the three OpenRD boards (OpenRD-Base, OpenRD-Client& OpenRD-Ultimate).

Probably small detail: this patch replaces the @ by an <at> in the > e-mail addresses (not only the patch author's). Is it a policy for > submitting patches to u-boot that all e-mail addresses should be > 'obfuscated' so?

Hm... I cannot find any such change in the original patch. Did you receive the original mail through the mailing list, or are you reviewing the patch in some mailing list archive?

Note that many mailing list setups auto-obfuscate mail addresses.

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
War isn't a good life, but it's life.
	-- Kirk, "A Private Little War", stardate 4211.8
#9 lore raw

PATCH 1/1 ARM: Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

Hi Wolfgang,

Le 13/06/2010 14:51, Wolfgang Denk a ?crit :

Quoted 8 lines
Quoted 4 lines

Probably small detail: this patch replaces the @ by an<at> in the> e-mail addresses (not only the patch author's). Is it a policy for> submitting patches to u-boot that all e-mail addresses should be> 'obfuscated' so?

Hm... I cannot find any such change in the original patch. Did you receive the original mail through the mailing list, or are you reviewing the patch in some mailing list archive?

Indeed, I used the web u-boot archives, and yes, that's what turned the @s into <at>s; going through the NNTP server instead solved this point.

Sorry for the noise.

Amicalement,

Signature · 1 line
Albert.