ppc: Marvell mv64x60 drivers for ppc platforms fix

PATCH In review Yuri Tikhonov 3 participants 3 messages Jun 24, 2007 – Jun 25, 2007 PowerPC

Share & tools

Yuri Tikhonov

author

2007-06-24 12:08 UTC #0 lore raw

PATCH 1/1 ppc: Marvell mv64x60 drivers for ppc platforms fix

This patch fixes the issue of erroneously involving the
arch/powerpc/sysdev/mv64x60*.c files into the compilation process for ppc- (not powerpc-) based platforms (e.g., P3M750).

Signed-off-by Yuri Tikhonov <[email protected]>

arch/powerpc/sysdev/Makefile +2 -0

index c3ce0bd..25eaa14 100644
@@ -17,7 +17,9 @@ obj-$(CONFIG_FSL_PCIE)		+= fsl_pcie.o
 obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
 mv64x60-$(CONFIG_PCI)		+= mv64x60_pci.o
+ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_MV64X60)		+= $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o
+endif
 
 # contains only the suspend handler for time
 obj-$(CONFIG_PM)		+= timer.o

Dale Farnsworth

2007-06-24 22:46 UTC #1 lore raw

In article <[email protected]> you write:

Quoted 14 lines

This patch fixes the issue of erroneously involving the
arch/powerpc/sysdev/mv64x60*.c files into the compilation process for ppc- (not powerpc-) based platforms (e.g., P3M750).
Signed-off-by Yuri Tikhonov <[email protected]>
--
arch/powerpc/sysdev/Makefile +0 -0
index c3ce0bd..25eaa14 100644

arch/powerpc/sysdev/Makefile obj-$(CONFIG_FSL_PCIE) += fsl_pcie.o · line 19

Quoted 3 lines

arch/powerpc/sysdev/Makefile +0 -0

@@ -17,7 +17,9 @@ obj-$(CONFIG_FSL_PCIE)		+= fsl_pcie.o
 obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
 mv64x60-$(CONFIG_PCI)		+= mv64x60_pci.o

Shouldn't the above line also be placed inside the of following ifeq ?

arch/powerpc/sysdev/Makefile obj-$(CONFIG_FSL_PCIE) += fsl_pcie.o · line 25

Quoted 6 lines

arch/powerpc/sysdev/Makefile +2 -0

+ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_MV64X60)		+= $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o
+endif
 
 # contains only the suspend handler for time
 obj-$(CONFIG_PM)		+= timer.o

Thanks,

-Dale

Kumar Gala

2007-06-25 01:50 UTC #2 lore raw

Quoted 21 lines · Dale Farnsworth

In article <[email protected]> you write:
Quoted 14 lines
This patch fixes the issue of erroneously involving the
arch/powerpc/sysdev/mv64x60*.c files into the compilation process for ppc- (not powerpc-) based platforms (e.g., P3M750).
Signed-off-by Yuri Tikhonov <[email protected]>
--
arch/powerpc/sysdev/Makefile +0 -0
index c3ce0bd..25eaa14 100644
arch/powerpc/sysdev/Makefile obj-$(CONFIG_FSL_PCIE) += fsl_pcie.o · line 19
Quoted 3 lines
arch/powerpc/sysdev/Makefile +0 -0
@@ -17,7 +17,9 @@ obj-$(CONFIG_FSL_PCIE)		+= fsl_pcie.o
 obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
 mv64x60-$(CONFIG_PCI)		+= mv64x60_pci.o
Shouldn't the above line also be placed inside the of following ifeq ?

Quoted 6 lines

arch/powerpc/sysdev/Makefile obj-$(CONFIG_FSL_PCIE) += fsl_pcie.o · line 25
Quoted 6 lines
arch/powerpc/sysdev/Makefile +2 -0
+ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_MV64X60)		+= $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o
+endif
 
 # contains only the suspend handler for time
 obj-$(CONFIG_PM)		+= timer.o

Also, lets just move these into the existing ifeq ($CONFIG_PPC_MERGE,y) block in that makefile rather than introducing a new one.

- k