* Patch for SystemACE without CONFIG_XILINX_OCP
@ 2004-07-26 19:16 Stephen Williams
2004-07-26 20:04 ` Stephen Williams
2004-07-28 16:56 ` Scott Anderson
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Williams @ 2004-07-26 19:16 UTC (permalink / raw)
To: Andrei Konovalov, linuxppc-embedded
hI,
I passed around the attached patch in hopes that it could be
integrated into the linuxppc-2.4 bitkeeper tree, assuming that
is the best place to maintain linux 2.4 for PPC. But I don't
see it showing up in the repository.
Actually, I noticed that there were no changes to the tree
in a little while. Is everybody off working on 2.6? Should
I be there too?
- --
Steve Williams "The woods are lovely, dark and deep.
steve at icarus.com But I have promises to keep,
http://www.icarus.com and lines to code before I sleep,
http://www.picturel.com And lines to code before I sleep."
** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Patch for SystemACE without CONFIG_XILINX_OCP
2004-07-26 19:16 Patch for SystemACE without CONFIG_XILINX_OCP Stephen Williams
@ 2004-07-26 20:04 ` Stephen Williams
2004-07-28 16:56 ` Scott Anderson
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Williams @ 2004-07-26 20:04 UTC (permalink / raw)
To: Andrei Konovalov, linuxppc-embedded
[-- Attachment #1: Type: text/plain, Size: 610 bytes --]
Stephen Williams wrote:
|
|
|
| hI,
|
| I passed around the attached patch in hopes that it could be
| integrated into the linuxppc-2.4 bitkeeper tree, assuming that
| is the best place to maintain linux 2.4 for PPC. But I don't
| see it showing up in the repository.
And of course I forgot to attach the patch. This time, it
really is attached.
- --
Steve Williams "The woods are lovely, dark and deep.
steve at icarus.com But I have promises to keep,
http://www.icarus.com and lines to code before I sleep,
http://www.picturel.com And lines to code before I sleep."
[-- Attachment #2: sysace-without-virtex.patch --]
[-- Type: text/plain, Size: 1764 bytes --]
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/06/10 18:45:08-07:00 steve@wing.icarus.com
# Condition Xilinx on-chip processor config with
# CONFIG_VIRTEX_II_PRO
#
# arch/ppc/kernel/ppc405_pci.c
# 2004/06/10 18:45:06-07:00 steve@wing.icarus.com +1 -1
# Condition Xilinx on-chip processor support with
# CONFIG_VIRTEX_II_PRO
#
# arch/ppc/kernel/Makefile
# 2004/06/10 18:45:06-07:00 steve@wing.icarus.com +1 -1
# Condition Xilinx on-chip processor support with
# CONFIG_VIRTEX_II_PRO
#
# BitKeeper/etc/ignore
# 2004/06/10 18:45:06-07:00 steve@wing.icarus.com +4 -0
# Added arch/ppc/boot/images/uImage arch/ppc/boot/images/vmlinux.UBoot arch/ppc/boot/images/vmlinux.gz arch/ppc/kernel/ppc_defs.h to the ignore list
#
diff -Nru a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
--- a/arch/ppc/kernel/Makefile 2004-06-10 19:57:40 -07:00
+++ b/arch/ppc/kernel/Makefile 2004-06-10 19:57:40 -07:00
@@ -61,7 +61,7 @@
obj-$(CONFIG_PPC_OCP) += ocp.o
obj-$(CONFIG_40x) += ppc4xx_setup.o
obj-$(CONFIG_4xx) += todc_time.o idle_4xx.o
-ifeq ($(CONFIG_XILINX_OCP),y)
+ifeq ($(CONFIG_XILINX_OCP)$(CONFIG_VIRTEX_II_PRO),yy)
obj-$(CONFIG_40x) += xilinx_pic.o
else
obj-$(CONFIG_40x) += ppc4xx_pic.o
diff -Nru a/arch/ppc/kernel/ppc405_pci.c b/arch/ppc/kernel/ppc405_pci.c
--- a/arch/ppc/kernel/ppc405_pci.c 2004-06-10 19:57:40 -07:00
+++ b/arch/ppc/kernel/ppc405_pci.c 2004-06-10 19:57:40 -07:00
@@ -132,7 +132,7 @@
setup_indirect_pci(hose_a, PPC405_PCI_CONFIG_ADDR,
PPC405_PCI_CONFIG_DATA);
-#ifdef CONFIG_XILINX_OCP
+#if defined(CONFIG_XILINX_OCP) && defined(CONFIG_VIRTEX_II_PRO)
/* Eliminate "unused variable" warning for pcip. Optimizer removes. */
pcip = NULL;
new_pmm_min = PPC405_PCI_LOWER_MEM;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Patch for SystemACE without CONFIG_XILINX_OCP
2004-07-26 19:16 Patch for SystemACE without CONFIG_XILINX_OCP Stephen Williams
2004-07-26 20:04 ` Stephen Williams
@ 2004-07-28 16:56 ` Scott Anderson
2004-07-29 21:56 ` Stephen Williams
1 sibling, 1 reply; 6+ messages in thread
From: Scott Anderson @ 2004-07-28 16:56 UTC (permalink / raw)
To: Stephen Williams; +Cc: Andrei Konovalov, linuxppc-embedded
Stephen Williams wrote:
> I passed around the attached patch in hopes that it could be
> integrated into the linuxppc-2.4 bitkeeper tree, assuming that
> is the best place to maintain linux 2.4 for PPC. But I don't
> see it showing up in the repository.
Looks like it went into linuxppc-2.4 back on June 17th to me:
http://ppc.bkbits.net:8080/linuxppc-2.4/patch@1.1273?nav=index.html|src/|src/arch|src/arch/ppc|src/arch/ppc/kernel|related/arch/ppc/kernel/Makefile|cset@1.1273
Scott
** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Patch for SystemACE without CONFIG_XILINX_OCP
2004-07-28 16:56 ` Scott Anderson
@ 2004-07-29 21:56 ` Stephen Williams
2004-07-29 23:38 ` new home for this list? Tom Curran
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Williams @ 2004-07-29 21:56 UTC (permalink / raw)
To: Scott Anderson; +Cc: Andrei Konovalov, linuxppc-embedded
Scott Anderson wrote:
|
| Stephen Williams wrote:
|
|> I passed around the attached patch in hopes that it could be
|> integrated into the linuxppc-2.4 bitkeeper tree, assuming that
|> is the best place to maintain linux 2.4 for PPC. But I don't
|> see it showing up in the repository.
|
|
| Looks like it went into linuxppc-2.4 back on June 17th to me:
I see it has indeed. My mistake, thanks.
- --
Steve Williams "The woods are lovely, dark and deep.
steve at icarus.com But I have promises to keep,
http://www.icarus.com and lines to code before I sleep,
http://www.picturel.com And lines to code before I sleep."
** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-07-30 1:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-07-26 19:16 Patch for SystemACE without CONFIG_XILINX_OCP Stephen Williams
2004-07-26 20:04 ` Stephen Williams
2004-07-28 16:56 ` Scott Anderson
2004-07-29 21:56 ` Stephen Williams
2004-07-29 23:38 ` new home for this list? Tom Curran
2004-07-30 1:47 ` Dave Wolfe
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).