Minor changes to allow clean creation of new i386/sc520 boards

PATCH New Graeme Russ 3 participants 5 messages Nov 20, 2008 – Dec 9, 2008

lore

Share & tools

lore

Graeme Russ

author

2008-11-20 19:28 UTC #0 lore raw

PATCH 2/2 Minor changes to allow clean creation of new i386/sc520 boards

Signed-off-by Graeme Russ <[email protected]>

---

Moved PCI specific definitions out of sc520.h into a new file plus fixed include path to ssi.h

 cpu/i386/sc520.c            |    2 +-
 include/asm-i386/ic/pci.h   |   52 +++++++++++++++++++++++++++++++++++++++++++
 include/asm-i386/ic/sc520.h |   22 ------------------
 3 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 include/asm-i386/ic/pci.h

cpu/i386/sc520.c +1 -1

index 8bcb979..cb6bc03 100644
@@ -32,7 +32,7 @@
 #include <config.h>
 #include <pci.h>
 #ifdef CONFIG_SC520_SSI
-#include <ssi.h>
+#include <asm/ic/ssi.h>
 #endif
 #include <asm/io.h>
 #include <asm/pci.h>

include/asm-i386/ic/pci.h new file +52 -0

52 lines not on this page · raw message

include/asm-i386/ic/sc520.h +0 ~~-22~~

index 0f7e7a5..bf39516 100644
@@ -282,24 +282,6 @@
 #define SC520_IRQ14 9
 #define SC520_IRQ15 10
 
-
-/* pin number used for PCI interrupt mappings */
-#define SC520_PCI_INTA 0
-#define SC520_PCI_INTB 1
-#define SC520_PCI_INTC 2
-#define SC520_PCI_INTD 3
-#define SC520_PCI_GPIRQ0 4
-#define SC520_PCI_GPIRQ1 5
-#define SC520_PCI_GPIRQ2 6
-#define SC520_PCI_GPIRQ3 7
-#define SC520_PCI_GPIRQ4 8
-#define SC520_PCI_GPIRQ5 9
-#define SC520_PCI_GPIRQ6 10
-#define SC520_PCI_GPIRQ7 11
-#define SC520_PCI_GPIRQ8 12
-#define SC520_PCI_GPIRQ9 13
-#define SC520_PCI_GPIRQ10 14
-
 /* utility functions */
 void write_mmcr_byte(u16 mmcr, u8 data);
 void write_mmcr_word(u16 mmcr, u16 data);

@@ -308,11 +290,7 @@ u8 read_mmcr_byte(u16 mmcr);
 u16 read_mmcr_word(u16 mmcr);
 u32 read_mmcr_long(u16 mmcr);
 
-extern int sc520_pci_ints[];
-
 void init_sc520(void);
 unsigned long init_sc520_dram(void);
-void pci_sc520_init(struct pci_controller *hose);
-int pci_sc520_set_irq(int pci_pin, int irq);
 
 #endif

--
1.5.4.3

Jean-Christophe PLAGNIOL-VILLARD

2008-11-20 20:21 UTC #1 lore raw

PATCH 2/2 Minor changes to allow clean creation of new i386/sc520 boards

Quoted 5 lines · Graeme Russ

Signed-off-by Graeme Russ <[email protected]>
---
Moved PCI specific definitions out of sc520.h into a new file plus fixed include path to ssi.h

please split it in 2 patch

Quoted 26 lines

 cpu/i386/sc520.c            |    2 +-
 include/asm-i386/ic/pci.h   |   52 +++++++++++++++++++++++++++++++++++++++++++
 include/asm-i386/ic/sc520.h |   22 ------------------
 3 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 include/asm-i386/ic/pci.h

cpu/i386/sc520.c +1 -1

index 8bcb979..cb6bc03 100644
@@ -32,7 +32,7 @@
 #include <config.h>
 #include <pci.h>
 #ifdef CONFIG_SC520_SSI
-#include <ssi.h>
+#include <asm/ic/ssi.h>
 #endif
 #include <asm/io.h>
 #include <asm/pci.h>

include/asm-i386/ic/pci.h new file +0 -0

new file mode 100644
index 0000000..9721110

include/asm-i386/ic/pci.h line 3

Quoted 3 lines

include/asm-i386/ic/pci.h new file +3 -0

@@ -0,0 +1,52 @@
+/*
+ * (C) Copyright 2008
+ * Graeme Russ <[email protected]>.

you do not do enough modification to add it

Best Regards,
J.

Graeme Russ

author

2008-11-21 21:43 UTC #2 lore raw

PATCH 1/1 Fixed path to sc520 SSI include file

Signed Off By: Graeme Russ <[email protected]>
---

Split '[U-Boot] [PATCH 2/2] Minor changes to allow clean creation of new i386/sc520 boards' as requested

 cpu/i386/sc520.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

cpu/i386/sc520.c +1 -1

index 8bcb979..cb6bc03 100644
@@ -32,7 +32,7 @@
 #include <config.h>
 #include <pci.h>
 #ifdef CONFIG_SC520_SSI
-#include <ssi.h>
+#include <asm/ic/ssi.h>
 #endif
 #include <asm/io.h>
 #include <asm/pci.h>

Signature · 1 line

1.5.4.3

Graeme Russ

author

2008-11-21 21:43 UTC #3 lore raw

PATCH 1/1 Moved sc520 PCI definitions to stand-alone file

In reply to Jean-Christophe PLAGNIOL-VILLARD

Signed Off By: Graeme Russ <[email protected]>
---

Split '[U-Boot] [PATCH 2/2] Minor changes to allow clean creation of new i386/sc520 boards' as requested

 include/asm-i386/ic/pci.h   |   49 +++++++++++++++++++++++++++++++++++++++++++
 include/asm-i386/ic/sc520.h |   22 -------------------
 2 files changed, 49 insertions(+), 22 deletions(-)
 create mode 100644 include/asm-i386/ic/pci.h

include/asm-i386/ic/pci.h new file +49 -0

new file mode 100644
index 0000000..bcccdbe
@@ -0,0 +1,49 @@
+/*
+ * (C) Copyright 2002
+ * Daniel Engstr?m, Omicron Ceti AB <[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., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _ASM_IC_SC520_PCI_H_
+#define _ASM_IC_SC520_PCI_H_ 1
+
+/* pin number used for PCI interrupt mappings */
+#define SC520_PCI_INTA 0
+#define SC520_PCI_INTB 1
+#define SC520_PCI_INTC 2
+#define SC520_PCI_INTD 3
+#define SC520_PCI_GPIRQ0 4
+#define SC520_PCI_GPIRQ1 5
+#define SC520_PCI_GPIRQ2 6
+#define SC520_PCI_GPIRQ3 7
+#define SC520_PCI_GPIRQ4 8
+#define SC520_PCI_GPIRQ5 9
+#define SC520_PCI_GPIRQ6 10
+#define SC520_PCI_GPIRQ7 11
+#define SC520_PCI_GPIRQ8 12
+#define SC520_PCI_GPIRQ9 13
+#define SC520_PCI_GPIRQ10 14
+
+extern int sc520_pci_ints[];
+
+void pci_sc520_init(struct pci_controller *hose);
+int pci_sc520_set_irq(int pci_pin, int irq);
+
+#endif

include/asm-i386/ic/sc520.h +0 ~~-22~~

index 0f7e7a5..bf39516 100644
@@ -282,24 +282,6 @@
 #define SC520_IRQ14 9
 #define SC520_IRQ15 10
 
-
-/* pin number used for PCI interrupt mappings */
-#define SC520_PCI_INTA 0
-#define SC520_PCI_INTB 1
-#define SC520_PCI_INTC 2
-#define SC520_PCI_INTD 3
-#define SC520_PCI_GPIRQ0 4
-#define SC520_PCI_GPIRQ1 5
-#define SC520_PCI_GPIRQ2 6
-#define SC520_PCI_GPIRQ3 7
-#define SC520_PCI_GPIRQ4 8
-#define SC520_PCI_GPIRQ5 9
-#define SC520_PCI_GPIRQ6 10
-#define SC520_PCI_GPIRQ7 11
-#define SC520_PCI_GPIRQ8 12
-#define SC520_PCI_GPIRQ9 13
-#define SC520_PCI_GPIRQ10 14
-
 /* utility functions */
 void write_mmcr_byte(u16 mmcr, u8 data);
 void write_mmcr_word(u16 mmcr, u16 data);

@@ -308,11 +290,7 @@ u8 read_mmcr_byte(u16 mmcr);
 u16 read_mmcr_word(u16 mmcr);
 u32 read_mmcr_long(u16 mmcr);
 
-extern int sc520_pci_ints[];
-
 void init_sc520(void);
 unsigned long init_sc520_dram(void);
-void pci_sc520_init(struct pci_controller *hose);
-int pci_sc520_set_irq(int pci_pin, int irq);
 
 #endif

Signature · 1 line

1.5.4.3

Wolfgang Denk

Applied

2008-12-09 23:33 UTC #4 lore raw

PATCH 2/2 Minor changes to allow clean creation of new i386/sc520 boards

In reply to Graeme Russ

Dear Graeme Russ,

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

Signed-off-by Graeme Russ <[email protected]>
---
Moved PCI specific definitions out of sc520.h into a new file plus fixed include path to ssi.h

Quoted 6 lines

 cpu/i386/sc520.c            |    2 +-
 include/asm-i386/ic/pci.h   |   52 +++++++++++++++++++++++++++++++++++++++=
++++
 include/asm-i386/ic/sc520.h |   22 ------------------
 3 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 include/asm-i386/ic/pci.h

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 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
Of all the things I've lost, I miss my mind the most.