Skip to contentSkip to conversation

Kirkwood: add lschlv2 and lsxhl board support

PATCH Superseded Michael Walle 4 participants 16 messages Jun 5, 2012 – Jul 8, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v9 cover Kirkwood: add lschlv2 and lsxhl board support

Changes:
v9:
- rebase to marvell custodian tree, merged with wolfgangs master

v8:
- revert CONFIG_RAND to old CONFIG_RANDOM_MACADDR
- the features CONFIG_BOOTP_RANDOM_DELAY and CONFIG_CMD_LINK_LOCAL pulls rand.o implicitly now as suggested by Joe Hershberger
- remove reset_phy() from board code. Thanks Luka Perkov for pointing this out
- dont derive the seed from the timer in seed_mac()

v7:
- rebase to new master
- new function rand_r()
- lib/rand.c is now selected by CONFIG_RAND, because it is used by three features (CONFIG_BOOTP_RANDOM_DELAY, CONFIG_RANDOM_MACADDR and CONFIG_CMD_LINK_LOCAL)
- new patch: use the common rand() functions as a replacement for net_rand.c. This will fix the confliction function declarations, too.

v6:
- remove dead code in Makefile
- use eth_{g,s}etenv_enetaddr() instead of eth_{g,s}etenv_enetaddr_by_index() since index is always 0

v5:
- combine patchset again. the "net: *" patches should be individually acked by net custodian
- make features configurable at compile time (CONFIG_RANDOM_MACADDR and CONFIG_SETENV_ENETADDR_BY_INDEX)
- remove unused variable in boards/buffalo/lsxl.c
- fix potential compiler warning "too many arguments for format"
- new patch which fixes eth_getenv_enetaddr_by_index() and eth_mac_skip()
- change initial seed of rand() to 1
- enable CONFIG_API and CONFIG_CMD_ELF for lsxl boards

v4:
- typo fixes (thanks Mike)
- seed all 46bits of the generated ethernet address (suggested by Mike)
- split patchset (generic net helpers and lsxl support)
- fix typo in bootcmd_hdd
- removed board/buffalo/lsxl/config.mk patch from patchset

v3:
- add "Kirkwood:" prefix to patch subject
- moved board/buffalo/lsxl/config.mk to an own patch, so it can be separately acked/naked ;)
- removed any hardcoding, that is the mac address is now automatically generated (random, locally administered) and the IP settings are fetched with DHCP/BOOTP.
- add detailed comments to every configuration line in kwbimage.cfg
- add comments in MPP configuration about GPIO usage
- removed lschlv2 ramboot
- use short board ident string
- small cleanups

v2:
- add to buffalo vendor directory instead of Marvell
- add both boards to MAINTAINERS
- don't define values for feature macros
- use tab for vertical alignment
- remove static network configuration, instead introduce a rescue mode
- add some convenience scripts
- small cleanups

Michael Walle (4):
lib: add rand() function
net: use common rand()/srand() functions
net: add helper to generate random mac address
Kirkwood: add lschlv2 and lsxhl board support

 MAINTAINERS                           |    5 +
 board/buffalo/lsxl/Makefile           |   44 +++++
 board/buffalo/lsxl/kwbimage-lschl.cfg |  229 ++++++++++++++++++++++++++
 board/buffalo/lsxl/kwbimage-lsxhl.cfg |  229 ++++++++++++++++++++++++++
 board/buffalo/lsxl/lsxl.c             |  283 +++++++++++++++++++++++++++++++++
 board/buffalo/lsxl/lsxl.h             |   75 +++++++++
 boards.cfg                            |    2 +
 include/common.h                      |   10 ++
 include/configs/lsxl.h                |  182 +++++++++++++++++++++
 include/net.h                         |   17 ++
 lib/Makefile                          |    5 +-
 lib/rand.c                            |   48 ++++++
 net/Makefile                          |    2 -
 net/eth.c                             |   22 +++
 net/link_local.c                      |    7 +-
 net/net_rand.c                        |   68 --------
 net/net_rand.h                        |   31 +++-
 17 files changed, 1178 insertions(+), 81 deletions(-)
 create mode 100644 board/buffalo/lsxl/Makefile
 create mode 100644 board/buffalo/lsxl/kwbimage-lschl.cfg
 create mode 100644 board/buffalo/lsxl/kwbimage-lsxhl.cfg
 create mode 100644 board/buffalo/lsxl/lsxl.c
 create mode 100644 board/buffalo/lsxl/lsxl.h
 create mode 100644 include/configs/lsxl.h
 create mode 100644 lib/rand.c
 delete mode 100644 net/net_rand.c
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH v9 1/4 lib: add rand() function

It's a PRNG using the simple and fast xorshift method.

---
 include/common.h |    8 ++++++++
 lib/Makefile     |    1 +
 lib/rand.c       |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 0 deletions(-)
 create mode 100644 lib/rand.c
include/common.h +8 -0
index 8564a65..6ba27bc 100644
@@ -751,6 +751,14 @@ char *	strmhz(char *buf, unsigned long hz);
 /* lib/crc32.c */
 #include <u-boot/crc.h>
 
+/* lib/rand.c */
+#ifdef CONFIG_RANDOM_MACADDR
+#define RAND_MAX -1U
+void srand(unsigned int seed);
+unsigned int rand(void);
+unsigned int rand_r(unsigned int *seedp);
+#endif
+
 /* common/console.c */
 int	console_init_f(void);	/* Before relocation; uses the serial  stuff	*/
 int	console_init_r(void);	/* After  relocation; uses the console stuff	*/
lib/Makefile +1 -0
index 1e8478f..0ca45fc 100644
@@ -66,6 +66,7 @@ COBJS-y += string.o
 COBJS-y += time.o
 COBJS-$(CONFIG_BOOTP_PXE) += uuid.o
 COBJS-y += vsprintf.o
+COBJS-$(CONFIG_RANDOM_MACADDR) += rand.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
lib/rand.c new file +48 -0

48 lines not on this page · raw message

Signature · 1 line
1.7.2.5
#2 lore raw

PATCH v9 2/4 net: use common rand()/srand() functions

In reply to Michael Walle

Replace rand() with the functions from lib/. The link-local network code stores its own seed, derived from the MAC address. Thus making it independent from calls to srand() in other modules.

---
 include/common.h |    4 ++-
 lib/Makefile     |    4 ++-
 net/Makefile     |    2 -
 net/link_local.c |    7 +++--
 net/net_rand.c   |   68 ------------------------------------------------------
 net/net_rand.h   |   31 +++++++++++++++++++-----
 6 files changed, 34 insertions(+), 82 deletions(-)
 delete mode 100644 net/net_rand.c
include/common.h +3 -1
index 6ba27bc..c42f93b 100644
@@ -752,7 +752,9 @@ char *	strmhz(char *buf, unsigned long hz);
 #include <u-boot/crc.h>
 
 /* lib/rand.c */
-#ifdef CONFIG_RANDOM_MACADDR
+#if defined(CONFIG_RANDOM_MACADDR) || \
+	defined(CONFIG_BOOTP_RANDOM_DELAY) || \
+	defined(CONFIG_CMD_LINK_LOCAL)
 #define RAND_MAX -1U
 void srand(unsigned int seed);
 unsigned int rand(void);
lib/Makefile +3 -1
index 0ca45fc..556601c 100644
@@ -67,8 +67,10 @@ COBJS-y += time.o
 COBJS-$(CONFIG_BOOTP_PXE) += uuid.o
 COBJS-y += vsprintf.o
 COBJS-$(CONFIG_RANDOM_MACADDR) += rand.o
+COBJS-$(CONFIG_BOOTP_RANDOM_DELAY) += rand.o
+COBJS-$(CONFIG_CMD_LINK_LOCAL) += rand.o
 
-COBJS	:= $(COBJS-y)
+COBJS	:= $(sort $(COBJS-y))
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
net/Makefile +0 -2
index 5264687..e7764ce 100644
@@ -34,8 +34,6 @@ COBJS-$(CONFIG_CMD_DNS)  += dns.o
 COBJS-$(CONFIG_CMD_NET)  += eth.o
 COBJS-$(CONFIG_CMD_LINK_LOCAL) += link_local.o
 COBJS-$(CONFIG_CMD_NET)  += net.o
-COBJS-$(CONFIG_BOOTP_RANDOM_DELAY) += net_rand.o
-COBJS-$(CONFIG_CMD_LINK_LOCAL) += net_rand.o
 COBJS-$(CONFIG_CMD_NFS)  += nfs.o
 COBJS-$(CONFIG_CMD_PING) += ping.o
 COBJS-$(CONFIG_CMD_RARP) += rarp.o
net/link_local.c +4 -3
index 3362863..582d011 100644
@@ -56,6 +56,7 @@ static unsigned conflicts;
 static unsigned nprobes;
 static unsigned nclaims;
 static int ready;
+static unsigned int seed;
 
 static void link_local_timeout(void);
 
@@ -68,7 +69,7 @@ static IPaddr_t pick(void)
 	unsigned tmp;
 
 	do {
-		tmp = rand() & IN_CLASSB_HOST;
+		tmp = rand_r(&seed) & IN_CLASSB_HOST;
 	} while (tmp > (IN_CLASSB_HOST - 0x0200));
 	return (IPaddr_t) htonl((LINKLOCAL_ADDR + 0x0100) + tmp);
 }
@@ -78,7 +79,7 @@ static IPaddr_t pick(void)
  */
 static inline unsigned random_delay_ms(unsigned secs)
 {
-	return rand() % (secs * 1000);
+	return rand_r(&seed) % (secs * 1000);
 }
 
 static void configure_wait(void)
@@ -109,7 +110,7 @@ void link_local_start(void)
 	}
 	NetOurSubnetMask = IN_CLASSB_NET;
 
-	srand_mac();
+	seed = seed_mac();
 	if (ip == 0)
 		ip = pick();
 
net/net_rand.c deleted +0 -68

68 lines not on this page · raw message

net/net_rand.h +24 -7
index c98db64..ba9d064 100644
@@ -9,18 +9,35 @@
 #ifndef __NET_RAND_H__
 #define __NET_RAND_H__
 
-#define RAND_MAX 0xffffffff
+#include <common.h>
 
 /*
- * Seed the random number generator using the eth0 MAC address
+ * Return a seed for the PRNG derived from the eth0 MAC address.
  */
-void srand_mac(void);
+static inline unsigned int seed_mac(void)
+{
+	unsigned char enetaddr[6];
+	unsigned int seed;
+
+	/* get our mac */
+	eth_getenv_enetaddr("ethaddr", enetaddr);
+
+	seed = enetaddr[5];
+	seed ^= enetaddr[4] << 8;
+	seed ^= enetaddr[3] << 16;
+	seed ^= enetaddr[2] << 24;
+	seed ^= enetaddr[1];
+	seed ^= enetaddr[0] << 8;
+
+	return seed;
+}
 
 /*
- * Get a random number (after seeding with MAC address)
- *
- * @return random number
+ * Seed the random number generator using the eth0 MAC address.
  */
-unsigned long rand(void);
+static inline void srand_mac(void)
+{
+	srand(seed_mac());
+}
 
 #endif /* __NET_RAND_H__ */
Signature · 1 line
1.7.2.5
#3 lore raw

PATCH v9 2/4 net: use common rand()/srand() functions

Dear Michael,

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

Replace rand() with the functions from lib/. The link-local network code stores its own seed, derived from the MAC address. Thus making it independent from calls to srand() in other modules.

Quoted 9 lines
---
 include/common.h |    4 ++-
 lib/Makefile     |    4 ++-
 net/Makefile     |    2 -
 net/link_local.c |    7 +++--
 net/net_rand.c   |   68 ------------------------------------------------------
 net/net_rand.h   |   31 +++++++++++++++++++-----
 6 files changed, 34 insertions(+), 82 deletions(-)
 delete mode 100644 net/net_rand.c

This commit causes build warnings like these for a zillion of boards:

net_rand.h:40:2: warning: implicit declaration of function 'srand' [-Wimplicit-function-declaration]

Please fix!

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
Unix is supported by IBM, like a hanging man is supported by rope.
		        - Don Libes & Sandy Ressler: _Life With Unix_
#4 lore raw

PATCH v9 2/4 net: use common rand()/srand() functions

Hi Wolfgang,

Am Sonntag 08 Juli 2012, 22:31:36 schrieben Sie:

Quoted 3 lines

Dear Michael,

In message <1338931997-13419-3-git-send-email-

Quoted 1 line · [email protected]> you wrote:
Quoted 1 line

Replace rand() with the functions from lib/. The

link-local network code

Quoted 1 line
Quoted 1 line

stores its own seed, derived from the MAC address.

Thus making it

Quoted 6 lines
Quoted 6 lines

independent from calls to srand() in other modules.

---

Quoted 6 lines
Quoted 6 lines
 include/common.h |    4 ++-
 lib/Makefile     |    4 ++-
 net/Makefile     |    2 -
 net/link_local.c |    7 +++--
 net/net_rand.c   |   68

------------------------------------------------------
net/net_rand.h

Quoted 5 lines
Quoted 3 lines

| 31 +++++++++++++++++++-----

 6 files changed, 34 insertions(+), 82 deletions(-)
 delete mode 100644 net/net_rand.c

This commit causes build warnings like these for a

zillion of boards:

Quoted 2 lines

net_rand.h:40:2: warning: implicit declaration of

function 'srand'

Quoted 1 line

[-Wimplicit-function-declaration]

Kim Philipps already posted a patch for this, see here:
http://patchwork.ozlabs.org/patch/169295/
and here:
http://lists.denx.de/pipermail/u-boot/2012-
July/127745.html

Signature · 1 line
Michael
#5 lore raw

PATCH v9 2/4 net: use common rand()/srand() functions

Dear Michael,

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

Kim Philipps already posted a patch for this, see here:
http://patchwork.ozlabs.org/patch/169295/

I see. Tnx.

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
Am I your nanny? The kernel is there to support  user  programs,  but
it's a _resource_ handler, not a baby feeder.     - Linus Torvalds in
      <[email protected]>
#6 lore raw

PATCH v9 3/4 net: add helper to generate random mac address

In reply to Michael Walle

Add new function eth_random_enetaddr() to generate a locally administered ethernet address.

---
 include/net.h |   17 +++++++++++++++++
 net/eth.c     |   22 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 0 deletions(-)
include/net.h +17 -0
index a092f29..6d2d6cd 100644
@@ -122,6 +122,23 @@ extern int eth_setenv_enetaddr(char *name, const uchar *enetaddr);
 extern int eth_getenv_enetaddr_by_index(const char *base_name, int index,
 					uchar *enetaddr);
 
+#ifdef CONFIG_RANDOM_MACADDR
+/*
+ * The u-boot policy does not allow hardcoded ethernet addresses. Under the
+ * following circumstances a random generated address is allowed:
+ *  - in emergency cases, where you need a working network connection to set
+ *    the ethernet address.
+ *    Eg. you want a rescue boot and don't have a serial port to access the
+ *    CLI to set environment variables.
+ *
+ * In these cases, we generate a random locally administered ethernet address.
+ *
+ * Args:
+ *  enetaddr - returns 6 byte hardware address
+ */
+extern void eth_random_enetaddr(uchar *enetaddr);
+#endif
+
 extern int usb_eth_initialize(bd_t *bi);
 extern int eth_init(bd_t *bis);			/* Initialize the device */
 extern int eth_send(void *packet, int length);	   /* Send a packet */
net/eth.c +22 -0
index d9a6430..d526264 100644
@@ -70,6 +70,28 @@ static int eth_mac_skip(int index)
 	return ((skip_state = getenv(enetvar)) != NULL);
 }
 
+#ifdef CONFIG_RANDOM_MACADDR
+void eth_random_enetaddr(uchar *enetaddr)
+{
+	uint32_t rval;
+
+	srand(get_timer(0));
+
+	rval = rand();
+	enetaddr[0] = rval & 0xff;
+	enetaddr[1] = (rval >> 8) & 0xff;
+	enetaddr[2] = (rval >> 16) & 0xff;
+
+	rval = rand();
+	enetaddr[3] = rval & 0xff;
+	enetaddr[4] = (rval >> 8) & 0xff;
+	enetaddr[5] = (rval >> 16) & 0xff;
+
+	/* make sure it's local and unicast */
+	enetaddr[0] = (enetaddr[0] | 0x02) & ~0x01;
+}
+#endif
+
 /*
  * CPU and board-specific Ethernet initializations.  Aliased function
  * signals caller to move on
Signature · 1 line
1.7.2.5
#7 lore raw

PATCH v9 4/4 Kirkwood: add lschlv2 and lsxhl board support

In reply to Michael Walle

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

Cc Prafulla Wadaskar <[email protected]>
---
 MAINTAINERS                           |    5 +
 board/buffalo/lsxl/Makefile           |   44 +++++
 board/buffalo/lsxl/kwbimage-lschl.cfg |  229 ++++++++++++++++++++++++++
 board/buffalo/lsxl/kwbimage-lsxhl.cfg |  229 ++++++++++++++++++++++++++
 board/buffalo/lsxl/lsxl.c             |  283 +++++++++++++++++++++++++++++++++
 board/buffalo/lsxl/lsxl.h             |   75 +++++++++
 boards.cfg                            |    2 +
 include/configs/lsxl.h                |  182 +++++++++++++++++++++
 8 files changed, 1049 insertions(+), 0 deletions(-)
 create mode 100644 board/buffalo/lsxl/Makefile
 create mode 100644 board/buffalo/lsxl/kwbimage-lschl.cfg
 create mode 100644 board/buffalo/lsxl/kwbimage-lsxhl.cfg
 create mode 100644 board/buffalo/lsxl/lsxl.c
 create mode 100644 board/buffalo/lsxl/lsxl.h
 create mode 100644 include/configs/lsxl.h
MAINTAINERS +5 -0
index 0445539..70f1fe4 100644
@@ -902,6 +902,11 @@ Prafulla Wadaskar <[email protected]>
 	rd6281a		ARM926EJS (Kirkwood SoC)
 	sheevaplug	ARM926EJS (Kirkwood SoC)
 
+Michael Walle <[email protected]>
+
+	lschlv2		ARM926EJS (Kirkwood SoC)
+	lsxhl		ARM926EJS (Kirkwood SoC)
+
 Tom Warren <[email protected]>
 
 	harmony		Tegra2 (ARM7 & A9 Dual Core)
board/buffalo/lsxl/Makefile new file +44 -0

44 lines not on this page · raw message

board/buffalo/lsxl/kwbimage-lschl.cfg new file +229 -0

229 lines not on this page · raw message

board/buffalo/lsxl/kwbimage-lsxhl.cfg new file +229 -0

229 lines not on this page · raw message

board/buffalo/lsxl/lsxl.c new file +283 -0

283 lines not on this page · raw message

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

75 lines not on this page · raw message

boards.cfg +2 -0
index b711e0d..4376699 100644
@@ -138,6 +138,8 @@ enbw_cmc                     arm         arm926ejs   enbw_cmc            enbw
 calimain                     arm         arm926ejs   calimain            omicron        davinci
 pogo_e02                     arm         arm926ejs   -                   cloudengines   kirkwood
 dns325                       arm         arm926ejs   -                   d-link         kirkwood
+lschlv2                      arm         arm926ejs   lsxl                buffalo        kirkwood    lsxl:LSCHLV2
+lsxhl                        arm         arm926ejs   lsxl                buffalo        kirkwood    lsxl:LSXHL
 km_kirkwood                  arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_KIRKWOOD,KM_DISABLE_PCI
 km_kirkwood_pci              arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_KIRKWOOD_PCI,KM_RECONFIG_XLX
 mgcoge3un                    arm         arm926ejs   km_arm              keymile        kirkwood
include/configs/lsxl.h new file +182 -0

182 lines not on this page · raw message

Signature · 1 line
1.7.2.5
#8 lore raw

v9 cover Kirkwood: add lschlv2 and lsxhl board support

In reply to Michael Walle

Hi Prafulla,

Am Dienstag 05 Juni 2012, 23:33:13 schrieb Michael Walle:

Quoted 3 lines

Changes:
v9:
- rebase to marvell custodian tree, merged with wolfgangs master

[..snip..]

I had to merge your tree with wolfgangs master, because my second net patch depends on the latest net patches by Joe.

So please make sure you merge wolfgangs master with your tree before applying these patches.

Signature · 1 line
Michael
#9 lore raw

v9 cover Kirkwood: add lschlv2 and lsxhl board support

Hi Prafulla,

Quoted 7 lines · Michael Walle

Hi Prafulla,

Am Dienstag 05 Juni 2012, 23:33:13 schrieb Michael Walle:

Quoted 3 lines

Changes:
v9:
?- rebase to marvell custodian tree, merged with wolfgangs master

Quoted 8 lines

[..snip..]

I had to merge your tree with wolfgangs master, because my second net patch depends on the latest net patches by Joe.

So please make sure you merge wolfgangs master with your tree before applying these patches.

It seems a better way to handle this is to rebase marvell onto WD's master and push that to the marvell tree, allowing Michael to rebase his patches onto that version. It seems there should not be a merge here.

-Joe

#10 lore raw

v9 cover Kirkwood: add lschlv2 and lsxhl board support

Quoted 17 lines · Joe Hershberger

Hi Prafulla,

Quoted 11 lines · Michael Walle

Hi Prafulla,

Am Dienstag 05 Juni 2012, 23:33:13 schrieb Michael Walle:

Quoted 3 lines

Changes:
v9:
?- rebase to marvell custodian tree, merged with wolfgangs master

[..snip..]

I had to merge your tree with wolfgangs master, because my second net

patch

Quoted 2 lines

depends on the latest net patches by Joe.

Quoted 8 lines
Quoted 1 line

So please make sure you merge wolfgangs master with your tree before

applying

Quoted 1 line

these patches.

It seems a better way to handle this is to rebase marvell onto WD's master and push that to the marvell tree, allowing Michael to rebase his patches onto that version. It seems there should not be a merge here.

that should work too. but my patcheset v9 should apply cleanly regardless of which way you choose.

michael

#11 lore raw

v9 cover Kirkwood: add lschlv2 and lsxhl board support

Quoted 28 lines

-----Original Message-----
From: Michael Walle [mailto:michael at walle.cc]
Sent: 06 June 2012 12:39
To: Joe Hershberger
Cc: Prafulla Wadaskar; u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH v9 0/4] Kirkwood: add lschlv2 and lsxhl board support

Quoted 3 lines · Joe Hershberger

Hi Prafulla,

On Tue, Jun 5, 2012 at 4:36 PM, Michael Walle <[email protected]>

Quoted 10 lines · wrote:
Quoted 10 lines

Hi Prafulla,

Am Dienstag 05 Juni 2012, 23:33:13 schrieb Michael Walle:

Quoted 3 lines

Changes:
v9:
?- rebase to marvell custodian tree, merged with wolfgangs master

[..snip..]

Quoted 9 lines
Quoted 1 line
Quoted 1 line

I had to merge your tree with wolfgangs master, because my second

net

Quoted 4 lines

patch

Quoted 3 lines

depends on the latest net patches by Joe.

So please make sure you merge wolfgangs master with your tree

before

Quoted 2 lines

applying

Quoted 1 line

these patches.

u-boot-marvell.git is cloned from u-boot-arm.git, and I always sync with this before any task. And just to keep it clean for pull requests I would not like to pull any other repository in it.

Copying Albert on this, who can sync u-boot.git into u-boot-arm.git if something is missing.

Regards..
Prafulla . . .

Quoted 12 lines
Quoted 5 lines

It seems a better way to handle this is to rebase marvell onto WD's master and push that to the marvell tree, allowing Michael to rebase his patches onto that version. It seems there should not be a merge here.

that should work too. but my patcheset v9 should apply cleanly regardless of which way you choose.

michael

#12 lore raw

v9 cover Kirkwood: add lschlv2 and lsxhl board support

Hi all,

Am Mittwoch 06 Juni 2012, 13:26:40 schrieb Prafulla Wadaskar:

Quoted 6 lines

u-boot-marvell.git is cloned from u-boot-arm.git, and I always sync with this before any task. And just to keep it clean for pull requests I would not like to pull any other repository in it.

Copying Albert on this, who can sync u-boot.git into u-boot-arm.git if something is missing.

ping, any news on this? :)

Signature · 1 line
michael
#13 lore raw

v9 cover Kirkwood: add lschlv2 and lsxhl board support

In reply to Prafulla Wadaskar

Hi Prafulla,

Quoted 3 lines

u-boot-marvell.git is cloned from u-boot-arm.git, and I always sync with this before any task. And just to keep it clean for pull requests I would not like to pull any other repository in it.

i just got informed by albert, that he updated his tree. So hopefully the patchset can now be merged without a conflict. If not, i'll rebase it again.

Signature · 1 line
Michael
#14 lore raw

v9 cover Kirkwood: add lschlv2 and lsxhl board support

Quoted 15 lines

-----Original Message-----
From: Michael Walle [mailto:michael at walle.cc]
Sent: 26 June 2012 03:00
To: Prafulla Wadaskar
Cc: Joe Hershberger; u-boot at lists.denx.de; albert.u.boot at aribaud.net
Subject: Re: [U-Boot] [PATCH v9 0/4] Kirkwood: add lschlv2 and lsxhl board support

Hi Prafulla,

Quoted 1 line

u-boot-marvell.git is cloned from u-boot-arm.git, and I always sync

with

Quoted 8 lines
Quoted 1 line

this before any task. And just to keep it clean for pull requests I

would

Quoted 1 line

not like to pull any other repository in it.

i just got informed by albert, that he updated his tree. So hopefully the
patchset can now be merged without a conflict. If not, i'll rebase it again.

Hi Michael
I know that, but even I am also bit busy with some priority task. I will do it by end of day today.

Sorry for inconvenience :-(

Regards..
Prafulla . ..

#15 lore raw

v9 cover Kirkwood: add lschlv2 and lsxhl board support

In reply to Michael Walle
Quoted 15 lines

-----Original Message-----
From: Michael Walle [mailto:michael at walle.cc]
Sent: 26 June 2012 03:00
To: Prafulla Wadaskar
Cc: Joe Hershberger; u-boot at lists.denx.de; albert.u.boot at aribaud.net
Subject: Re: [U-Boot] [PATCH v9 0/4] Kirkwood: add lschlv2 and lsxhl board support

Hi Prafulla,

Quoted 1 line

u-boot-marvell.git is cloned from u-boot-arm.git, and I always sync

with

Quoted 8 lines
Quoted 1 line

this before any task. And just to keep it clean for pull requests I

would

Quoted 1 line

not like to pull any other repository in it.

i just got informed by albert, that he updated his tree. So hopefully the
patchset can now be merged without a conflict. If not, i'll rebase it again.

Hi Michael,

Applied this entire patch series to u-boot-marvell.git master branch. Sorry for the delays on our side and many thanks for your patience.

Regards...
Prafulla . . .