[U-Boot] [PATCH 1/1] dreamplug: Initial support.

Jason u-boot at lakedaemon.net
Wed Jun 8 17:08:01 CEST 2011


On Wed, Jun 08, 2011 at 12:51:01AM -0700, Prafulla Wadaskar wrote:
> 
> 
> > -----Original Message-----
> > From: u-boot at lakedaemon.net [mailto:u-boot at lakedaemon.net]
> > Sent: Tuesday, June 07, 2011 11:07 PM
> > To: u-boot at lists.denx.de
> > Cc: Prafulla Wadaskar; Siddarth Gore; Jason Cooper
> > Subject: [PATCH 1/1] dreamplug: Initial support.
> > 
> > From: Jason Cooper <u-boot at lakedaemon.net>
> > 
> > Copied files from boards/Marvell/guruplug/ and did
> > 	s/GURUPLUG/DREAMPLUG/g
> > 	s/guruplug/dreamplug/g
> > 
> > Switched from NAND flash to SPI flash.
> > 	MPP._SPI_ configuration copied from
> > 	boards/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
> >

Prafulla,

Please note: I literally copied the files from boards/Marvell/guruplug,
and then copied the SPI config from the mv88f6281gtw_ge...  There isn't
a single original thought of mine in there. ;-)
 
> > Also, MACH_TYPE_DREAMPLUG (board id 3550) has been registered at
> > http://www.arm.linux.co.uk/developer/machines/, once support has
> > been added to mainline Linux, we'll update the board id here.
> > For now, we use MACH_TYPE_GURUPLUG, just as the factory U-Boot does.
> > 
> > Signed-off-by: Jason Cooper <u-boot at lakedaemon.net>
> > ---
> >  MAINTAINERS                          |    1 +
> >  MAKEALL                              |    1 +
> >  board/Marvell/dreamplug/Makefile     |   51 +++++++++++
> >  board/Marvell/dreamplug/dreamplug.c  |  154
> > ++++++++++++++++++++++++++++++++
> >  board/Marvell/dreamplug/dreamplug.h  |   39 ++++++++
> >  board/Marvell/dreamplug/kwbimage.cfg |  160
> > ++++++++++++++++++++++++++++++++++
> >  boards.cfg                           |    1 +
> >  include/configs/dreamplug.h          |  111 +++++++++++++++++++++++
> >  8 files changed, 518 insertions(+), 0 deletions(-)
> >  create mode 100644 board/Marvell/dreamplug/Makefile
> >  create mode 100644 board/Marvell/dreamplug/dreamplug.c
> >  create mode 100644 board/Marvell/dreamplug/dreamplug.h
> >  create mode 100644 board/Marvell/dreamplug/kwbimage.cfg
> >  create mode 100644 include/configs/dreamplug.h
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index c462ae2..c3711a8 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -202,6 +202,7 @@ Niklaus Giger <niklaus.giger at netstal.com>
> >  Siddarth Gore <gores at marvell.com>
> > 
> >  	guruplug	ARM926EJS (Kirkwood SoC)
> > +	dreamplug	ARM926EJS (Kirkwood SoC)
> 
> Dreamplug entry should be under your name. maintain alphabetical order too.
>

Ok, I assumed I didn't have enough experience yet.  No problem.

> > 
> >  Paul Gortmaker <paul.gortmaker at windriver.com>
> > 
> > diff --git a/MAKEALL b/MAKEALL
> > index d592374..35fc5b7 100755
> > --- a/MAKEALL
> > +++ b/MAKEALL
> > @@ -345,6 +345,7 @@ LIST_ARM9="			\
> >  	edb9315a		\
> >  	edminiv2		\
> >  	guruplug		\
> > +	dreamplug		\
> 
> Not in order.
> 

Ok.

> >  	imx27lite		\
> >  	jadecpu			\
> >  	lpd7a400		\
> > diff --git a/board/Marvell/dreamplug/Makefile
> > b/board/Marvell/dreamplug/Makefile
> > new file mode 100644
> > index 0000000..b7e5270
> > --- /dev/null
> > +++ b/board/Marvell/dreamplug/Makefile
> > @@ -0,0 +1,51 @@
> > +#
> > +# (C) Copyright 2009
> 
> 2011 ?? and everywhere
> 

This probably needs to be fixed throughout the boards/Marvell/*
codebase.  Can I do that since I'm not Marvell?  If so, I'll do a
separate patch.

> > +# Marvell Semiconductor <www.marvell.com>
> > +# Written-by: Siddarth Gore <gores at marvell.com>
> 
> You can say, based on or referenced from..
> You as an author should reflect for the new files being added.
> 

Will do, but see my above comment about no original thoughts. ;-)  

> > +#
> > +# 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
> > +#
> > +
> > +include $(TOPDIR)/config.mk
> > +
> > +LIB	= $(obj)lib$(BOARD).o
> > +
> > +COBJS	:= dreamplug.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/Marvell/dreamplug/dreamplug.c
> > b/board/Marvell/dreamplug/dreamplug.c
> > new file mode 100644
> > index 0000000..3797af1
> > --- /dev/null
> > +++ b/board/Marvell/dreamplug/dreamplug.c
> > @@ -0,0 +1,154 @@
> > +/*
> > + * (C) Copyright 2009
> > + * Marvell Semiconductor <www.marvell.com>
> > + * Written-by: Siddarth Gore <gores at marvell.com>
> 
> Same here..
> 

Ok.
 
> > + *
> > + * 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
> > + */
> > +
> > +#include <common.h>
> > +#include <miiphy.h>
> > +#include <asm/arch/kirkwood.h>
> > +#include <asm/arch/mpp.h>
> > +#include "dreamplug.h"
> > +
> > +DECLARE_GLOBAL_DATA_PTR;
> > +
> > +int board_early_init_f(void)
> > +{
> > +	/*
> > +	 * default gpio configuration
> > +	 * There are maximum 64 gpios controlled through 2 sets of registers
> > +	 * the  below configuration configures mainly initial LED status
> > +	 */
> > +	kw_config_gpio(DREAMPLUG_OE_VAL_LOW,
> > +			DREAMPLUG_OE_VAL_HIGH,
> > +			DREAMPLUG_OE_LOW, DREAMPLUG_OE_HIGH);
> > +
> > +	/* Multi-Purpose Pins Functionality configuration */
> > +	u32 kwmpp_config[] = {
> > +		MPP0_SPI_SCn,
> > +		MPP1_SPI_MOSI,
> > +		MPP2_SPI_SCK,
> > +		MPP3_SPI_MISO,
> > +		MPP4_GPIO,
> > +		MPP5_GPO,
> > +		MPP6_SYSRST_OUTn,
> > +		MPP7_SPI_SCn,
> > +		MPP8_TW_SDA,
> > +		MPP9_TW_SCK,
> > +		MPP10_UART0_TXD,
> > +		MPP11_UART0_RXD,
> > +		MPP12_SD_CLK,
> > +		MPP13_SD_CMD,
> > +		MPP14_SD_D0,
> > +		MPP15_SD_D1,
> > +		MPP16_SD_D2,
> > +		MPP17_SD_D3,
> > +		MPP18_GPO,
> > +		MPP19_GPO,
> > +		MPP20_GE1_0,
> > +		MPP21_GE1_1,
> > +		MPP22_GE1_2,
> > +		MPP23_GE1_3,
> > +		MPP24_GE1_4,
> > +		MPP25_GE1_5,
> > +		MPP26_GE1_6,
> > +		MPP27_GE1_7,
> > +		MPP28_GE1_8,
> > +		MPP29_GE1_9,
> > +		MPP30_GE1_10,
> > +		MPP31_GE1_11,
> > +		MPP32_GE1_12,
> > +		MPP33_GE1_13,
> > +		MPP34_GE1_14,
> > +		MPP35_GE1_15,
> > +		MPP36_GPIO,
> > +		MPP37_GPIO,
> > +		MPP38_GPIO,
> > +		MPP39_GPIO,
> > +		MPP40_TDM_SPI_SCK,
> > +		MPP41_TDM_SPI_MISO,
> > +		MPP42_TDM_SPI_MOSI,
> > +		MPP43_GPIO,
> > +		MPP44_GPIO,
> > +		MPP45_GPIO,
> > +		MPP46_GPIO, 	/* M_RLED */
> > +		MPP47_GPIO,	/* M_GLED */
> > +		MPP48_GPIO,	/* B_RLED */
> > +		MPP49_GPIO,	/* B_GLED */
> 
> Similar comments for all above configurations will be helpful
> 

I'll have to do some research, with the exception of the SPI pins, this
is verbatim what guruplug has.  Perhaps a second pre-patch is in order
to go with the Copyright update?

> > +		0
> > +	};
> > +	kirkwood_mpp_conf(kwmpp_config);
> > +	return 0;
> > +}
> > +
> > +int board_init(void)
> > +{
> > +	/*
> > +	 * arch number of board
> > +	 * XXX: change to MACH_TYPE_DREAMPLUG once in Linux mainline.
> > +	 */
> > +	gd->bd->bi_arch_number = MACH_TYPE_GURUPLUG;
> 
> This need to be changed, you have to wait and post patch once machine
> ID/arch no for this board reflects in mach-types.h
> 

Ok.  I'm working on the Linux patch series now.  I'll continue to label
future versions of this series as RFC until mach-types is updated.

> > +
> > +	/* adress of boot parameters */
> > +	gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
> > +
> > +	return 0;
> > +}
> > +
> > +#ifdef CONFIG_RESET_PHY_R
> > +void mv_phy_88e1121_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",
> > +			__FUNCTION__);
> > +		return;
> > +	}
> > +
> > +	/*
> > +	 * Enable RGMII delay on Tx and Rx for CPU port
> > +	 * Ref: sec 4.7.2 of chip datasheet
> > +	 */
> > +	miiphy_write(name, devadr, MV88E1121_PGADR_REG, 2);
> > +	miiphy_read(name, devadr, MV88E1121_MAC_CTRL2_REG, &reg);
> > +	reg |= (MV88E1121_RGMII_RXTM_CTRL | MV88E1121_RGMII_TXTM_CTRL);
> > +	miiphy_write(name, devadr, MV88E1121_MAC_CTRL2_REG, reg);
> > +	miiphy_write(name, devadr, MV88E1121_PGADR_REG, 0);
> > +
> > +	/* reset the phy */
> > +	miiphy_reset(name, devadr);
> > +
> > +	printf("88E1121 Initialized on %s\n", name);
> > +}
> > +
> > +void reset_phy(void)
> > +{
> > +	/* configure and initialize both PHY's */
> > +	mv_phy_88e1121_init("egiga0");
> > +	mv_phy_88e1121_init("egiga1");
> > +}
> > +#endif /* CONFIG_RESET_PHY_R */
> > diff --git a/board/Marvell/dreamplug/dreamplug.h
> > b/board/Marvell/dreamplug/dreamplug.h
> > new file mode 100644
> > index 0000000..b597859
> > --- /dev/null
> > +++ b/board/Marvell/dreamplug/dreamplug.h
> > @@ -0,0 +1,39 @@
> > +/*
> > + * (C) Copyright 2009
> > + * Marvell Semiconductor <www.marvell.com>
> > + * Written-by: Siddarth Gore <gores at 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.
> > + *
> > + * 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
> > + */
> > +
> > +#ifndef __DREAMPLUG_H
> > +#define __DREAMPLUG_H
> > +
> > +#define DREAMPLUG_OE_LOW	(~(0))
> > +#define DREAMPLUG_OE_HIGH	(~(0))
> > +#define DREAMPLUG_OE_VAL_LOW	0
> > +#define DREAMPLUG_OE_VAL_HIGH	(0xf << 16) /* 4 LED Pins high */
> > +
> > +/* PHY related */
> > +#define MV88E1121_MAC_CTRL2_REG		21
> > +#define MV88E1121_PGADR_REG		22
> > +#define MV88E1121_RGMII_TXTM_CTRL	(1 << 4)
> > +#define MV88E1121_RGMII_RXTM_CTRL	(1 << 5)
> > +
> > +#endif /* __DREAMPLUG_H */
> > diff --git a/board/Marvell/dreamplug/kwbimage.cfg
> 
> Is this file pure copy paste from any reference from mainlined code?
> If yes, then you can avoid this file and reuse the referred one.
> Pls clarify
> 

It's copied from boards/Marvell/guruplug/kwbimage.cfg, then:
	/^BOOT_FROM/ s/nand/spi/

I'll look into #include (or equivalent) the original file and making the
one change.

> > b/board/Marvell/dreamplug/kwbimage.cfg
> > new file mode 100644
> > index 0000000..ae76b32
> > --- /dev/null
> ...snip...
> 
> > diff --git a/boards.cfg b/boards.cfg
> > index d2cacc8..a69ada6 100644
> > --- a/boards.cfg
> > +++ b/boards.cfg
> > @@ -110,6 +110,7 @@ suen3                        arm         arm926ejs
> > km_arm              keymile
> >  suen8                        arm         arm926ejs   km_arm
> > keymile        kirkwood
> >  mgcoge3un                    arm         arm926ejs   km_arm
> > keymile        kirkwood
> >  guruplug                     arm         arm926ejs   -
> > Marvell        kirkwood
> > +dreamplug                    arm         arm926ejs   -
> > Marvell        Kirkwood
> 
> Please maintain order
> 

Ok.

> Regards..
> Prafulla.. .

Thanks again for all the help!

Jason.


More information about the U-Boot mailing list