Skip to contentSkip to conversation

Add the RapidIO framework for U-Boot

PATCH New Zhang Wei 3 participants 4 messages Nov 13, 2007 – Jan 10, 2008

lore
Share & tools
lore

Zhang Wei

author
#0 lore raw

PATCH 1/1 Add the RapidIO framework for U-Boot

The patch adds the RapidIO framework into U-Boot. The board configuration can be added into individual rio_init_board() function. Some functions about RapidIO can be added later.

---
 drivers/Makefile |    1 +
 drivers/rio.c    |   30 ++++++++++++++++++++++++++++++
 include/common.h |    3 +++
 lib_ppc/board.c  |    5 +++++
 4 files changed, 39 insertions(+), 0 deletions(-)
 create mode 100644 drivers/rio.c
drivers/Makefile +1 -0
index 00978d8..c9fb135 100755
@@ -40,6 +40,7 @@ COBJS	= 3c589.o 5701rls.o ali512x.o at45.o ata_piix.o \
 	  ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
 	  omap24xx_i2c.o pc_keyb.o \
 	  pci.o pci_auto.o pci_indirect.o \
+	  rio.o \
 	  pcnet.o plb2800_eth.o ps2ser.o ps2mult.o pxa_pcmcia.o \
 	  rpx_pcmcia.o rtl8019.o rtl8139.o rtl8169.o \
 	  s3c4510b_eth.o s3c4510b_uart.o \
drivers/rio.c new file +30 -0
new file mode 100644
index 0000000..a50dde7
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * Author: Zhang Wei, wei.zhang at freescale.com, Jun 2007
+ *
+ * Description:
+ * RapidIO initialization file.
+ *
+ * This 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.
+ *
+ */
+
+#include <common.h>
+
+#ifdef CONFIG_RAPIDIO
+
+#include <command.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+
+void rio_init(void)
+{
+	/* Call board specific rio_init() */
+	rio_init_board();
+}
+
+#endif /* CONFIG_RAPIDIO */
include/common.h +3 -0
index aca281b..8e89e6b 100644
@@ -279,6 +279,9 @@ void	pciinfo	      (int, int);
 #endif
 #endif
 
+void	rio_init      (void);
+void	rio_init_board(void);
+
 int	misc_init_f   (void);
 int	misc_init_r   (void);
 
lib_ppc/board.c +5 -0
index 9aa67f9..c797948 100644
@@ -921,6 +921,11 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	pci_init ();
 #endif
 
+#if defined(CONFIG_RAPIDIO)
+	/* Do RapidIO configuration */
+	rio_init ();
+#endif
+
 /** leave this here (after malloc(), environment and PCI are working) **/
 	/* Initialize devices */
 	devices_init ();
Signature · 1 line
1.5.2
#1 lore raw

PATCH 1/1 Add the RapidIO framework for U-Boot

Dear Zhang Wei,

Quoted 5 lines · in message <[email protected]> you wrote:

The patch adds the RapidIO framework into U-Boot. The board configuration can be added into individual rio_init_board() function. Some functions about RapidIO can be added later.

Can you please rebase your patch against current U-Boot?

drivers/Makefile COBJS = 3c589.o 5701rls.o ali512x.o at45.o ata_piix.o \ · line 46

Quoted 12 lines
drivers/Makefile +1 -0
index 00978d8..c9fb135 100755
@@ -40,6 +40,7 @@ COBJS	= 3c589.o 5701rls.o ali512x.o at45.o ata_piix.o \
 	  ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
 	  omap24xx_i2c.o pc_keyb.o \
 	  pci.o pci_auto.o pci_indirect.o \
+	  rio.o \
 	  pcnet.o plb2800_eth.o ps2ser.o ps2mult.o pxa_pcmcia.o \
 	  rpx_pcmcia.o rtl8019.o rtl8139.o rtl8169.o \
 	  s3c4510b_eth.o s3c4510b_uart.o \

And please keep the list sorted!

Best regards,

Wolfgang Denk

Signature · 4 lines
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Too much of anything, even love, isn't necessarily a good thing.
	-- Kirk, "The Trouble with Tribbles", stardate 4525.6
author
#2 lore raw

PATCH 1/1 Add the RapidIO framework for U-Boot

Hi, Wolfgang,

I'll rebase the code and commit soon.

Thanks!
Wei.

Quoted 47 lines

-----Original Message-----
From: wd at denx.de [mailto:wd at denx.de]
Sent: Wednesday, January 09, 2008 9:20 PM
To: Zhang Wei
Cc: u-boot-users at lists.sourceforge.net
Subject: Re: [PATCH] Add the RapidIO framework for U-Boot

Dear Zhang Wei,

in message

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

The patch adds the RapidIO framework into U-Boot. The board

configuration

Quoted 1 line

can be added into individual rio_init_board() function.

Some functions

Quoted 3 lines

about RapidIO can be added later.

Can you please rebase your patch against current U-Boot?

drivers/Makefile COBJS = 3c589.o 5701rls.o ali512x.o

Quoted 5 lines
drivers/Makefile +0 -0
index 00978d8..c9fb135 100755
@@ -40,6 +40,7 @@ COBJS	= 3c589.o 5701rls.o ali512x.o 

at45.o ata_piix.o \

drivers/Makefile COBJS = 3c589.o 5701rls.o ali512x.o at45.o ata_piix.o \ · line 46

Quoted 7 lines
drivers/Makefile +1 -0
 	  ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
 	  omap24xx_i2c.o pc_keyb.o \
 	  pci.o pci_auto.o pci_indirect.o \
+	  rio.o \
 	  pcnet.o plb2800_eth.o ps2ser.o ps2mult.o pxa_pcmcia.o \
 	  rpx_pcmcia.o rtl8019.o rtl8139.o rtl8169.o \
 	  s3c4510b_eth.o s3c4510b_uart.o \

And please keep the list sorted!

Best regards,

Wolfgang Denk

Signature · 4 lines
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Too much of anything, even love, isn't necessarily a good thing.
	-- Kirk, "The Trouble with Tribbles", stardate 4525.6
#3 lore raw

PATCH 1/1 Add the RapidIO framework for U-Boot

In reply to Zhang Wei
Quoted 18 lines · Zhang Wei

The patch adds the RapidIO framework into U-Boot. The board configuration can be added into individual rio_init_board() function. Some functions about RapidIO can be added later.

---
 drivers/Makefile |    1 +
 drivers/rio.c    |   30 ++++++++++++++++++++++++++++++
 include/common.h |    3 +++
 lib_ppc/board.c  |    5 +++++
 4 files changed, 39 insertions(+), 0 deletions(-)
 create mode 100644 drivers/rio.c
drivers/Makefile +0 -0
index 00978d8..c9fb135 100755

drivers/Makefile COBJS = 3c589.o 5701rls.o ali512x.o at45.o ata_piix.o \ · line 46

Quoted 7 lines
drivers/Makefile +1 -0
@@ -40,6 +40,7 @@ COBJS	= 3c589.o 5701rls.o ali512x.o at45.o ata_piix.o \
 	  ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
 	  omap24xx_i2c.o pc_keyb.o \
 	  pci.o pci_auto.o pci_indirect.o \
+	  rio.o \
 	  pcnet.o plb2800_eth.o ps2ser.o ps2mult.o pxa_pcmcia.o \
 	  rpx_pcmcia.o rtl8019.o rtl8139.o rtl8169.o \
 	  s3c4510b_eth.o s3c4510b_uart.o \

Please rebase your patch to match with the new drivers organisation

Best Regards,
J.