From: Kumar Gala <hidden> Date: 2007-08-22 15:24:47
Guys,
I was wondering if I could get your help with looking at the
following lists and determining if we have an issue or not related
the following files:
Getting some classification on these would be good. Possibly
classifications, doesn't build in ARCH=powerpc, remove include, real
issue, etc.
- k
./include/asm-powerpc/irq.h:#include <asm/mpc83xx.h> - protected by !
CONFIG_PPC_MERGE
./drivers/ide/ppc/mpc8xx.c:#include <asm/residual.h>
./drivers/mtd/maps/tqm834x.c:#include <asm/ppcboot.h>
./drivers/mtd/maps/pq2fads.c:#include <asm/ppcboot.h>
./drivers/i2c/busses/i2c-ibm_iic.c:#include <asm/ibm4xx.h>
./drivers/mtd/maps/walnut.c:#include <asm/ibm4xx.h>
./include/asm-powerpc/irq.h:#include <asm/ibm4xx.h> - protected by !
CONFIG_PPC_MERGE
./drivers/mtd/maps/ebony.c:#include <asm/ibm44x.h>
./drivers/mtd/maps/ocotea.c:#include <asm/ibm44x.h>
./drivers/mtd/nand/ndfc.c:#include <asm/ibm44x.h>
./include/asm-powerpc/irq.h:#include <asm/ibm44x.h> - protected by !
CONFIG_PPC_MERGE
./drivers/i2c/busses/i2c-ibm_iic.c:#include <asm/ocp.h>
./drivers/net/ucc_geth_mii.c:#include <asm/ocp.h> - just bogus, needs
removal
./drivers/net/ibm_emac/ibm_emac_core.c:#include <asm/ocp.h>
./drivers/net/ibm_emac/ibm_emac_core.h:#include <asm/ocp.h>
./drivers/net/ibm_emac/ibm_emac_tah.h:#include <asm/ocp.h>
./drivers/net/ibm_emac/ibm_emac_phy.c:#include <asm/ocp.h>
./drivers/net/ibm_emac/ibm_emac_mal.c:#include <asm/ocp.h>
./drivers/net/ibm_emac/ibm_emac_zmii.h:#include <asm/ocp.h>
./drivers/macintosh/adb-iop.c:#include <asm/bootinfo.h>
./drivers/char/vme_scc.c:#include <asm/bootinfo.h>
./drivers/char/serial167.c:#include <asm/bootinfo.h>
./drivers/serial/dz.c:#include <asm/bootinfo.h>
./drivers/mtd/devices/ms02-nv.c:#include <asm/bootinfo.h>
./drivers/net/macsonic.c:#include <asm/bootinfo.h>
./drivers/net/jazzsonic.c:#include <asm/bootinfo.h>
./drivers/video/pmag-aa-fb.c:#include <asm/bootinfo.h>
./drivers/video/maxinefb.c:#include <asm/bootinfo.h>
./drivers/video/logo/logo.c:#include <asm/bootinfo.h>
./drivers/video/valkyriefb.c:#include <asm/bootinfo.h>
./drivers/video/macfb.c:#include <asm/bootinfo.h>
On Wed, 22 Aug 2007 10:19:21 -0500
Kumar Gala [off-list ref] wrote:
Guys,
I was wondering if I could get your help with looking at the
following lists and determining if we have an issue or not related
the following files:
Getting some classification on these would be good. Possibly
classifications, doesn't build in ARCH=powerpc, remove include, real
issue, etc.
These are guarded by !PPC_MERGE in Kconfig, so they won't be built in
arch/powerpc. And we all know we're waiting for the ibm_newemac driver
to show up for arch/powerpc... ;)
ndfc.c doesn't even need asm/ibm44x.h in arch/ppc. It could be removed
safely. However, the build will fail on arch/powerpc because of the
call to ioremap64. So we should guard it for now, until I get the
flash stuff working on Bamboo and come up with something better.
The patch below fixes these, similar to how drivers/mtd/maps/ebony.c is
guarded.
josh
[POWERPC] Don't build arch/ppc dependent drivers in arch/powerpc
These drivers are specific to 4xx support in arch/ppc at the moment. Make
sure they don't get built on arch/powerpc.
Signed-off-by: Josh Boyer <redacted>
---
drivers/mtd/maps/Kconfig | 4 ++--
drivers/mtd/nand/Kconfig | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
From: David Gibson <hidden> Date: 2007-08-23 02:47:57
On Wed, Aug 22, 2007 at 10:19:21AM -0500, Kumar Gala wrote:
Guys,
I was wondering if I could get your help with looking at the
following lists and determining if we have an issue or not related
the following files:
Getting some classification on these would be good. Possibly
classifications, doesn't build in ARCH=powerpc, remove include, real
issue, etc.
- k
./include/asm-powerpc/irq.h:#include <asm/mpc83xx.h> - protected by !
CONFIG_PPC_MERGE
irq.h seems to have a big slab of CONFIG_PPC_MERGE dependent stuff.
Looks like a good candidate for splitting into asm-ppc/irq.h and
asm-powerpc/irq.h
Although these both have an extern of type bd_t (defined in
ppcboot.h), afaict they don't actually use it, so these should be
removable. Longer term, all these ugly hardcoded map files should be
relegated to arch/ppc only, replaced with physmap_of and suitable
information in the device tree for arch/powerpc. However, being able
to build them on arch/powerpc may be useful during transition.
This driver will need significant reworking to port to arch/powerpc
(similar to the treatment ibm_emac has received). Such rework will
remove the dependency on ibm4xx.h and ocp.h
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
From: David Gibson <hidden> Date: 2007-08-23 02:53:23
On Wed, Aug 22, 2007 at 02:30:47PM -0500, Josh Boyer wrote:
On Wed, 22 Aug 2007 10:19:21 -0500
Kumar Gala [off-list ref] wrote:
quoted
Guys,
I was wondering if I could get your help with looking at the
following lists and determining if we have an issue or not related
the following files:
Getting some classification on these would be good. Possibly
classifications, doesn't build in ARCH=powerpc, remove include, real
issue, etc.
These one depends on IBM_OCP in Kconfig. We don't select/enable that on
any existing arch/powerpc 4xx stuff so it won't be built anyway.
Nor will we ever enable IBM_OCP in arch/powerpc: the device tree
entirely obsoletes the OCP crap.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
From: Kumar Gala <hidden> Date: 2007-08-23 03:08:19
On Aug 22, 2007, at 9:49 PM, David Gibson wrote:
On Wed, Aug 22, 2007 at 02:30:47PM -0500, Josh Boyer wrote:
quoted
On Wed, 22 Aug 2007 10:19:21 -0500
Kumar Gala [off-list ref] wrote:
quoted
Guys,
I was wondering if I could get your help with looking at the
following lists and determining if we have an issue or not related
the following files:
Getting some classification on these would be good. Possibly
classifications, doesn't build in ARCH=powerpc, remove include, real
issue, etc.
From: Kumar Gala <hidden> Date: 2007-08-23 03:22:10
On Aug 22, 2007, at 9:47 PM, David Gibson wrote:
On Wed, Aug 22, 2007 at 10:19:21AM -0500, Kumar Gala wrote:
quoted
Guys,
I was wondering if I could get your help with looking at the
following lists and determining if we have an issue or not related
the following files:
Getting some classification on these would be good. Possibly
classifications, doesn't build in ARCH=powerpc, remove include, real
issue, etc.
- k
./include/asm-powerpc/irq.h:#include <asm/mpc83xx.h> - protected by !
CONFIG_PPC_MERGE
irq.h seems to have a big slab of CONFIG_PPC_MERGE dependent stuff.
Looks like a good candidate for splitting into asm-ppc/irq.h and
asm-powerpc/irq.h
Yeah was going to look at a bit of that since the list of
CONFIG_PPC_MERGE headers is pretty short:
dcr.h, i8259.h, ipic.h, irq.h
Although these both have an extern of type bd_t (defined in
ppcboot.h), afaict they don't actually use it, so these should be
removable. Longer term, all these ugly hardcoded map files should be
relegated to arch/ppc only, replaced with physmap_of and suitable
information in the device tree for arch/powerpc. However, being able
to build them on arch/powerpc may be useful during transition.
Yeah was going to kill tqm834x.c since there is no way to Kconfig it
into existence, and !MERGE pq2fads.c.
This driver will need significant reworking to port to arch/powerpc
(similar to the treatment ibm_emac has received). Such rework will
remove the dependency on ibm4xx.h and ocp.h
From: David Gibson <hidden> Date: 2007-08-23 03:33:18
On Wed, Aug 22, 2007 at 10:33:55PM -0500, Kumar Gala wrote:
On Aug 22, 2007, at 10:19 AM, Kumar Gala wrote:
quoted
Guys,
I was wondering if I could get your help with looking at the
following lists and determining if we have an issue or not related
the following files:
Getting some classification on these would be good. Possibly
classifications, doesn't build in ARCH=powerpc, remove include, real
issue, etc.
- k
Uh.. I'm pretty sure valkyriefb.c is for (old) PowerMacs, not 68k.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
From: Kumar Gala <hidden> Date: 2007-08-23 03:33:55
On Aug 22, 2007, at 10:19 AM, Kumar Gala wrote:
Guys,
I was wondering if I could get your help with looking at the
following lists and determining if we have an issue or not related
the following files:
Getting some classification on these would be good. Possibly
classifications, doesn't build in ARCH=powerpc, remove include, real
issue, etc.
- k
My analysis of <asm/bootinfo.h> usage:
./drivers/macintosh/adb-iop.c:#include <asm/bootinfo.h> remove
./drivers/char/vme_scc.c:#include <asm/bootinfo.h> 68k only
./drivers/char/serial167.c:#include <asm/bootinfo.h> 68k only
./drivers/serial/dz.c:#include <asm/bootinfo.h> decstation
./drivers/mtd/devices/ms02-nv.c:#include <asm/bootinfo.h> decstation
./drivers/net/macsonic.c:#include <asm/bootinfo.h> 68k
./drivers/net/jazzsonic.c:#include <asm/bootinfo.h> mips
./drivers/video/pmag-aa-fb.c:#include <asm/bootinfo.h> mips
./drivers/video/maxinefb.c:#include <asm/bootinfo.h> mips
./drivers/video/logo/logo.c:#include <asm/bootinfo.h> mips
./drivers/video/macfb.c:#include <asm/bootinfo.h> 68k
./drivers/video/valkyriefb.c:#include <asm/bootinfo.h> 68k
- k
From: Kumar Gala <hidden> Date: 2007-08-23 04:16:03
On Aug 22, 2007, at 10:33 PM, David Gibson wrote:
On Wed, Aug 22, 2007 at 10:33:55PM -0500, Kumar Gala wrote:
quoted
On Aug 22, 2007, at 10:19 AM, Kumar Gala wrote:
quoted
Guys,
I was wondering if I could get your help with looking at the
following lists and determining if we have an issue or not related
the following files:
Getting some classification on these would be good. Possibly
classifications, doesn't build in ARCH=powerpc, remove include, real
issue, etc.
- k
On Wed, Aug 22, 2007 at 10:33:55PM -0500, Kumar Gala wrote:
quoted
On Aug 22, 2007, at 10:19 AM, Kumar Gala wrote:
quoted
I was wondering if I could get your help with looking at the
following lists and determining if we have an issue or not related
the following files:
Getting some classification on these would be good. Possibly
classifications, doesn't build in ARCH=powerpc, remove include, real
issue, etc.
Uh.. I'm pretty sure valkyriefb.c is for (old) PowerMacs, not 68k.
It appears to be both. If you look at the include its protected by a
#ifdef CONFIG_MAC which we is only defined on m68k.
Indeed, drivers/video/Kconfig says it depends on MAC || (PPC_PMAC && PPC32)
With kind regards,
Geert Uytterhoeven
Software Architect
Sony Network and Software Technology Center Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
Phone: +32 (0)2 700 8453
Fax: +32 (0)2 700 8622
E-mail: Geert.Uytterhoeven@sonycom.com
Internet: http://www.sony-europe.com/
Sony Network and Software Technology Center Europe
A division of Sony Service Centre (Europe) N.V.
Registered office: Technologielaan 7 · B-1840 Londerzeel · Belgium
VAT BE 0413.825.160 · RPR Brussels
Fortis Bank Zaventem · Swift GEBABEBB08A · IBAN BE39001382358619
Although these both have an extern of type bd_t (defined in
ppcboot.h), afaict they don't actually use it, so these should be
removable.
They look like they're using it to me... See the bd->bi_flashstart
and
bd->bi_flashsize references in init_pq2fads_mtd.
Both of these are dead in one way or another. pq2fads.c isn't in the
makefile and you can't Kconfig tqm834x.c into existence. Thus my
patch to remove them.
- k
Uh.. I'm pretty sure valkyriefb.c is for (old) PowerMacs, not 68k.
It appears to be both. If you look at the include its protected by a
#ifdef CONFIG_MAC which we is only defined on m68k.
According to drivers/video/macfb.c, both the Quadra 630 and Performa 588
have the Valkyrie chip for their video. I don't remember which ppc based
models have it, but it's definitely on both architectures.
Just as an extra note, the file drivers/macintosh/adb-iop.c is m68k only,
so you should probably leave that alone as well. It probably doesn't need
that header, but the change should really come from the 68k side of things.
Brad Boyer
flar@allandria.com
Just as an extra note, the file drivers/macintosh/adb-iop.c is m68k only,
so you should probably leave that alone as well. It probably doesn't need
that header, but the change should really come from the 68k side of things.
Thanks, it's indeed not needed.
With kind regards,
Geert Uytterhoeven
Software Architect
Sony Network and Software Technology Center Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
Phone: +32 (0)2 700 8453
Fax: +32 (0)2 700 8622
E-mail: Geert.Uytterhoeven@sonycom.com
Internet: http://www.sony-europe.com/
Sony Network and Software Technology Center Europe
A division of Sony Service Centre (Europe) N.V.
Registered office: Technologielaan 7 · B-1840 Londerzeel · Belgium
VAT BE 0413.825.160 · RPR Brussels
Fortis Bank Zaventem · Swift GEBABEBB08A · IBAN BE39001382358619
From: Kumar Gala <hidden> Date: 2007-08-24 07:24:19
On Aug 24, 2007, at 2:10 AM, Geert Uytterhoeven wrote:
On Thu, 23 Aug 2007, Brad Boyer wrote:
quoted
Just as an extra note, the file drivers/macintosh/adb-iop.c is
m68k only,
so you should probably leave that alone as well. It probably
doesn't need
that header, but the change should really come from the 68k side
of things.
Thanks, it's indeed not needed.
If its ok that the removal comes from my patchset that would be
great. I'm tired of re-spinning these patches at this point ;)
- k
On Aug 24, 2007, at 2:10 AM, Geert Uytterhoeven wrote:
quoted
On Thu, 23 Aug 2007, Brad Boyer wrote:
quoted
Just as an extra note, the file drivers/macintosh/adb-iop.c is m68k only,
so you should probably leave that alone as well. It probably doesn't need
that header, but the change should really come from the 68k side of
things.
Thanks, it's indeed not needed.
If its ok that the removal comes from my patchset that would be great. I'm
tired of re-spinning these patches at this point ;)
Sure, less work for me! ;-)
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
With kind regards,
Geert Uytterhoeven
Software Architect
Sony Network and Software Technology Center Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
Phone: +32 (0)2 700 8453
Fax: +32 (0)2 700 8622
E-mail: Geert.Uytterhoeven@sonycom.com
Internet: http://www.sony-europe.com/
Sony Network and Software Technology Center Europe
A division of Sony Service Centre (Europe) N.V.
Registered office: Technologielaan 7 · B-1840 Londerzeel · Belgium
VAT BE 0413.825.160 · RPR Brussels
Fortis Bank Zaventem · Swift GEBABEBB08A · IBAN BE39001382358619