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

----- Original Message -----
From: "Julian Pidancet" <[email protected]>
To: u-boot at lists.denx.de
Cc: "tanmay upadhyay" <[email protected]>, prafulla at marvell.com
Sent: Tuesday, February 8, 2011 11:50:54 PM
Subject: [PATCH] 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).

This is a rebase onto master from an original patch sent by Tanmay Upadhyay a few months ago. All credits goes to him.
It's been tested on my OpenRD-Ultimate and works perfectly fine.

 MAKEALL                                 |    2 +
 board/Marvell/openrd/Makefile           |   56 ++++++++++
 board/Marvell/openrd/config.mk          |   33 ++++++
 board/Marvell/openrd/kwbimage.cfg       |  168 ++++++++++++++++++++++++++++++
 board/Marvell/openrd/openrd.c           |  173 +++++++++++++++++++++++++++++++
 board/Marvell/openrd/openrd.h           |   50 +++++++++
 board/Marvell/openrd_base/Makefile      |   56 ----------
 board/Marvell/openrd_base/kwbimage.cfg  |  168 ------------------------------
 board/Marvell/openrd_base/openrd_base.c |  153 ---------------------------
 board/Marvell/openrd_base/openrd_base.h |   46 --------
 boards.cfg                              |    4 +-
 include/configs/openrd.h                |  115 ++++++++++++++++++++
 include/configs/openrd_base.h           |   92 +++--------------
 include/configs/openrd_client.h         |   50 +++++++++
 include/configs/openrd_ultimate.h       |   50 +++++++++
 15 files changed, 714 insertions(+), 502 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/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.h
 create mode 100644 include/configs/openrd_client.h
 create mode 100644 include/configs/openrd_ultimate.h

index a732e6a..4b6da98 100755
@@ -361,6 +361,8 @@ LIST_ARM9="			\
 	omap5912osk		\
 	omap730p2		\
 	openrd_base		\
+	openrd_client		\
+	openrd_ultimate		\
 	rd6281a			\
 	sbc2410x		\
 	scb9328			\

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

index c977528..4334630 100644
@@ -96,7 +96,9 @@ davinci_sonata               arm         arm926ejs   sonata              davinci
 suen3                        arm         arm926ejs   km_arm              keymile        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
 mv88f6281gtw_ge              arm         arm926ejs   -                   Marvell        kirkwood
-openrd_base                  arm         arm926ejs   -                   Marvell        kirkwood
+openrd_base                  arm         arm926ejs   openrd              Marvell        kirkwood
+openrd_client                arm         arm926ejs   openrd              Marvell        kirkwood
+openrd_ultimate              arm         arm926ejs   openrd              Marvell        kirkwood
 rd6281a                      arm         arm926ejs   -                   Marvell        kirkwood
 sheevaplug                   arm         arm926ejs   -                   Marvell        kirkwood
 dockstar                     arm         arm926ejs   -                   Seagate        kirkwood

index cfdd09c..4f9ea80 100644
@@ -1,4 +1,10 @@
 /*
+ * Modified Simon's work to deal with all the three variants of
+ * OpenRD boards (OpenRD-Base, OpenRD-Client & OpenRD-Ultimate)
+ *
+ * eInfochips < www.einfochips.com >
+ * Modified-by: Tanmay Upadhyay <[email protected]> + *
  * (C) Copyright 2009
  * Net Insight < www.netinsight.net >
  * Written-by: Simon Kagstrom <[email protected]> @@ -30,91 +36,21 @@

#ifndef _CONFIG_OPENRD_BASE_H
#define _CONFIG_OPENRD_BASE_H

-/*
- * Version number information
- */
-#define CONFIG_IDENT_STRING "\nOpenRD_base"
-
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */
-#define CONFIG_KIRKWOOD 1 /* SOC Family Name */
-#define CONFIG_KW88F6281 1 /* SOC Name */
-#define CONFIG_MACH_OPENRD_BASE /* 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_AUTOSCRIPT
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ENV
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_USB
-#define CONFIG_CMD_IDE
-
-/*
- * mv-common.h should be defined after CMD configs since it used them
- * to enable certain macros
- */
-#include "mv-common.h"
-
-/*
- * Environment variables configurations
- */
-#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND 1
-#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
-#else
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
-#endif
-/*
- * max 4k env size is enough, but in case of nand
- * it has to be rounded to sector size
- */
-#define CONFIG_ENV_SIZE 0x20000 /* 128k */
-#define CONFIG_ENV_ADDR 0x60000
-#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
-
-/*
- * Default environment variables
- */
-#define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \
- "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \
- "${x_bootcmd_usb}; bootm 0x6400000;"
+#include <configs/openrd.h>

-#define MTDIDS_DEFAULT "nand0=nand_mtd"
-#define MTDPARTS_DEFAULT "mtdparts=nand_mtd:0x100000 at 0x000000(uboot),"\
- "0x400000 at 0x100000(uImage),"\
- "0x1fb00000 at 0x500000(rootfs)"
+#define CONFIG_IDENT_STRING "\nOpenRD-Base"

-#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
- "=ttyS0,115200 "MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0" \
- "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
- "x_bootcmd_usb=usb start\0" \
- "x_bootargs_root=root=ubi0:rootfs rootfstype=ubifs\0" \
- "mtdids="MTDIDS_DEFAULT"\0" \
- "mtdparts="MTDPARTS_DEFAULT"\0"
+/* Machine type */
+#define MACH_TYPE_OPENRD MACH_TYPE_OPENRD_BASE

/*
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 0x8
+/* enable port 0 only */

+#define CONFIG_MVGBE_PORTS      {1, 0}
+#define CONFIG_PHY_BASE_ADR     0x8
+#define PHY_NO                  "88E1116"

#endif /* CONFIG_CMD_NET */

-/*
- * SATA Driver configuration
- */
-#ifdef CONFIG_MVSATA_IDE
-#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
-#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET
-#endif / * CONFIG_MVSATA_IDE * /
-
#endif /* _CONFIG_OPENRD_BASE_H */

-- 1.7.4

------------------------------------------------------------------------------------------------------ 



I believe I did the right thing by adding 'Acked by' line. Correct me if I am wrong. 


Thanks Julian for the efforts. 


Regards, 


Tanmay 

Dear Tanmay Upadhyay - Embedded,

Why are you reposting this old patch? And why in an attachment?

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
The important thing about being a leader is not being right or wrong,
but being *certain*.                    - Terry Pratchett, _Truckers_

Sorry if I made a mess. This was my first email to this mailing list which wasn't sent from 'git send-email'.

I just wanted to ack Julian's mail. I simply replied his mail and added 'Acked by' line. May be my webmail made a mess of it. Sending this mail from Thunderbird. Hope this time it goes ok.

Regards,

Tanmay