linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/10] Xilinx Virtex-* updates
@ 2006-01-09  8:32 grant.likely
  2006-01-09  8:32 ` [PATCH 01/10] Move xparameters.h into xilinx virtex device specific path grant.likely
                   ` (10 more replies)
  0 siblings, 11 replies; 24+ messages in thread
From: grant.likely @ 2006-01-09  8:32 UTC (permalink / raw)
  To: glikely, mporter, linuxppc-embedded, gnathita, dhlii

Here's a repost of my Xilinx ML300 and ML403 patches with a few
cleanups, a bit of patch reordering, and rebased to 2.6.15.

Changes:
 - Remove xparameters.h as a dependancy to most of the kernel tree
 - Rework Virtex-II Pro support to be generic for Virtex-4 also
 - Move serial drivers from the OCP bus to the platform bus
 - Modify ML300 to use platform bus
 - Add support for ML403
 - Add ML300 & ML403 defconfigs

I've tested on an ML403
Can someone test on an ML300?  (I no longer have one)

Cheers,
g.

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [PATCH 01/10] Move xparameters.h into xilinx virtex device specific path
@ 2006-01-14  9:47 Grant C. Likely
  0 siblings, 0 replies; 24+ messages in thread
From: Grant C. Likely @ 2006-01-14  9:47 UTC (permalink / raw)
  To: linuxppc-embedded, mporter, glikely

xparameters should not be needed by anything but virtex platform code.
Move it from include/asm-ppc/ to platforms/4xx/xparameters/

This is preparing for work to remove xparameters from the dependancy tree
for most c files.  xparam changes should not cause a recompile of the world.
Instead, drivers should get device info from the platform bus (populated
by the boot code)

Signed-off-by: Grant C. Likely <grant.likely@secretlab.ca>

---

 arch/ppc/platforms/4xx/virtex-ii_pro.h           |    2 +-
 arch/ppc/platforms/4xx/xparameters/xparameters.h |   18 ++++++++++++++++++
 arch/ppc/syslib/xilinx_pic.c                     |    2 +-
 include/asm-ppc/xparameters.h                    |   18 ------------------
 4 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 arch/ppc/platforms/4xx/xparameters/xparameters.h
 delete mode 100644 include/asm-ppc/xparameters.h

1f13966f8322fae8c0c0804e1480e50d2be955d7
diff --git a/arch/ppc/platforms/4xx/virtex-ii_pro.h b/arch/ppc/platforms/4xx/virtex-ii_pro.h
index 9014c48..026130c 100644
--- a/arch/ppc/platforms/4xx/virtex-ii_pro.h
+++ b/arch/ppc/platforms/4xx/virtex-ii_pro.h
@@ -16,7 +16,7 @@
 #define __ASM_VIRTEXIIPRO_H__
 
 #include <linux/config.h>
-#include <asm/xparameters.h>
+#include <platforms/4xx/xparameters/xparameters.h>
 
 /* serial defines */
 
diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters.h b/arch/ppc/platforms/4xx/xparameters/xparameters.h
new file mode 100644
index 0000000..fe4eac6
--- /dev/null
+++ b/arch/ppc/platforms/4xx/xparameters/xparameters.h
@@ -0,0 +1,18 @@
+/*
+ * include/asm-ppc/xparameters.h
+ *
+ * This file includes the correct xparameters.h for the CONFIG'ed board
+ *
+ * Author: MontaVista Software, Inc.
+ *         source@mvista.com
+ *
+ * 2004 (c) MontaVista Software, Inc.  This file is licensed under the terms
+ * of the GNU General Public License version 2.  This program is licensed
+ * "as is" without any warranty of any kind, whether express or implied.
+ */
+
+#include <linux/config.h>
+
+#if defined(CONFIG_XILINX_ML300)
+#include <platforms/4xx/xparameters/xparameters_ml300.h>
+#endif
diff --git a/arch/ppc/syslib/xilinx_pic.c b/arch/ppc/syslib/xilinx_pic.c
index 47f04c7..848fb51 100644
--- a/arch/ppc/syslib/xilinx_pic.c
+++ b/arch/ppc/syslib/xilinx_pic.c
@@ -15,7 +15,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <asm/io.h>
-#include <asm/xparameters.h>
+#include <platforms/4xx/xparameters/xparameters.h>
 #include <asm/ibm4xx.h>
 #include <asm/machdep.h>
 
diff --git a/include/asm-ppc/xparameters.h b/include/asm-ppc/xparameters.h
deleted file mode 100644
index fe4eac6..0000000
--- a/include/asm-ppc/xparameters.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * include/asm-ppc/xparameters.h
- *
- * This file includes the correct xparameters.h for the CONFIG'ed board
- *
- * Author: MontaVista Software, Inc.
- *         source@mvista.com
- *
- * 2004 (c) MontaVista Software, Inc.  This file is licensed under the terms
- * of the GNU General Public License version 2.  This program is licensed
- * "as is" without any warranty of any kind, whether express or implied.
- */
-
-#include <linux/config.h>
-
-#if defined(CONFIG_XILINX_ML300)
-#include <platforms/4xx/xparameters/xparameters_ml300.h>
-#endif
-- 
1.1.2-g9e9b-dirty

^ permalink raw reply related	[flat|nested] 24+ messages in thread
end of thread, other threads:[~2006-01-16  7:30 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-09  8:32 [PATCH 00/10] Xilinx Virtex-* updates grant.likely
2006-01-09  8:32 ` [PATCH 01/10] Move xparameters.h into xilinx virtex device specific path grant.likely
2006-01-12 17:26   ` Andrei Konovalov
2006-01-14  9:55     ` ML300 & ML403 patches Grant Likely
2006-01-09  8:32 ` [PATCH 02/10] Make Virtex-II Pro support generic for all Virtex devices grant.likely
2006-01-12 17:28   ` Andrei Konovalov
2006-01-13 17:52     ` Grant Likely
2006-01-09  8:33 ` [PATCH 03/10] Migrate Xilinx Vertex support from the OCP bus to the platfom bus grant.likely
2006-01-13 18:20   ` Peter Korsgaard
2006-01-09  8:33 ` [PATCH 05/10] Add Virtex-4 FX to cpu table grant.likely
2006-01-09  8:33 ` [PATCH 06/10] Add xparameters file for Xilinx ML403 reference design grant.likely
2006-01-09  8:33 ` [PATCH 04/10] Migrate ML300 reference design to the platform bus grant.likely
2006-01-09  8:33 ` [PATCH 09/10] defconfigs for Xilinx ML300 and ML403 reference designs grant.likely
2006-01-09  8:33 ` [PATCH 08/10] ML300 & ML403 need embed_config.o linked in grant.likely
2006-01-12 17:29   ` Andrei Konovalov
2006-01-13 18:18   ` Peter Korsgaard
2006-01-13 18:31     ` Matt Porter
2006-01-13 18:34     ` Grant Likely
2006-01-09  8:33 ` [PATCH 07/10] Add support for Xilinx ML403 reference design grant.likely
2006-01-09  8:33 ` [PATCH 10/10] Bug fix for Xilinx silicon errata 213 grant.likely
2006-01-13 18:17 ` [PATCH 00/10] Xilinx Virtex-* updates Peter Korsgaard
2006-01-16  5:27   ` David H. Lynch Jr.
2006-01-16  7:30     ` Grant Likely
  -- strict thread matches above, loose matches on Subject: below --
2006-01-14  9:47 [PATCH 01/10] Move xparameters.h into xilinx virtex device specific path Grant C. Likely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).