Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c784ef7 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 4155/1: S3C24XX: remove obj-dma-* from Makefile 



In preperation for splitting the arch-s3c2410 directory
up, remove the use of obj-dma-y in the Makefile and move
to using CONFIG_S3C2440_DMA, CONFIG_S3C2412_DMA, etc.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ae0a846e

arch/arm/mach-s3c2410/Kconfig

+14 −1
Original line number Original line Diff line number Diff line
@@ -192,10 +192,17 @@ config S3C2412_PM 
	help

	help

	  Internal config node to apply S3C2412 power management

	  Internal config node to apply S3C2412 power management





config S3C2412_DMA

	bool

	depends on CPU_S3C2412

	help

	  Internal config node for S3C2412 DMA support



config CPU_S3C2412

config CPU_S3C2412

	bool

	bool

	depends on ARCH_S3C2410

	depends on ARCH_S3C2410

	select S3C2412_PM if PM

	select S3C2412_PM if PM

	select S3C2412_DMA if S3C2410_DMA

	help

	help

	  Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line

	  Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
@@ -205,11 +212,18 @@ config CPU_S3C244X 
	help

	help

	  Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.

	  Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.





config S3C2440_DMA

	bool

	depends on ARCH_S3C2410 && CPU_S3C24405B

	help

	  Support for S3C2440 specific DMA code5A



config CPU_S3C2440

config CPU_S3C2440

	bool

	bool

	depends on ARCH_S3C2410

	depends on ARCH_S3C2410

	select S3C2410_CLOCK

	select S3C2410_CLOCK

	select S3C2410_PM if PM

	select S3C2410_PM if PM

	select S3C2440_DMA if S3C2410_DMA

	select CPU_S3C244X

	select CPU_S3C244X

	help

	help

	  Support for S3C2440 Samsung Mobile CPU based systems.

	  Support for S3C2440 Samsung Mobile CPU based systems.
@@ -272,7 +286,6 @@ config S3C2410_DMA_DEBUG 
	  amount of time, as well as using an significant percentage of

	  amount of time, as well as using an significant percentage of

	  the CPU time doing so.

	  the CPU time doing so.







config S3C2410_PM_DEBUG

config S3C2410_PM_DEBUG

	bool "S3C2410 PM Suspend debug"

	bool "S3C2410 PM Suspend debug"

	depends on ARCH_S3C2410 && PM

	depends on ARCH_S3C2410 && PM

arch/arm/mach-s3c2410/Makefile

+2 −8
Original line number Original line Diff line number Diff line
@@ -9,8 +9,6 @@ obj-y := cpu.o irq.o time.o gpio.o clock.o devs.o 
obj-m			:=

obj-m			:=

obj-n			:=

obj-n			:=

obj-			:=

obj-			:=

obj-dma-y		:=

obj-dma-n		:=





# DMA

# DMA

obj-$(CONFIG_S3C2410_DMA)	+= dma.o

obj-$(CONFIG_S3C2410_DMA)	+= dma.o
@@ -37,9 +35,9 @@ obj-$(CONFIG_PM_H1940) += pm-h1940.o 
obj-$(CONFIG_CPU_S3C2412)	+= s3c2412.o

obj-$(CONFIG_CPU_S3C2412)	+= s3c2412.o

obj-$(CONFIG_CPU_S3C2412)	+= s3c2412-irq.o

obj-$(CONFIG_CPU_S3C2412)	+= s3c2412-irq.o

obj-$(CONFIG_CPU_S3C2412)	+= s3c2412-clock.o

obj-$(CONFIG_CPU_S3C2412)	+= s3c2412-clock.o

obj-dma-$(CONFIG_CPU_S3C2412)	+= s3c2412-dma.o





obj-$(CONFIG_S3C2412_PM)	+= s3c2412-pm.o

obj-$(CONFIG_S3C2412_PM)	+= s3c2412-pm.o

obj-$(CONFIG_S3C2412_DMA)	+= s3c2412-dma.o





#

#

# S3C244X support

# S3C244X support
@@ -57,7 +55,7 @@ obj-$(CONFIG_CPU_S3C2440) += s3c2440.o s3c2440-dsc.o 
obj-$(CONFIG_CPU_S3C2440)	+= s3c2440-irq.o

obj-$(CONFIG_CPU_S3C2440)	+= s3c2440-irq.o

obj-$(CONFIG_CPU_S3C2440)	+= s3c2440-clock.o

obj-$(CONFIG_CPU_S3C2440)	+= s3c2440-clock.o

obj-$(CONFIG_CPU_S3C2440)	+= s3c2410-gpio.o

obj-$(CONFIG_CPU_S3C2440)	+= s3c2410-gpio.o

obj-dma-$(CONFIG_CPU_S3C2440)	+= s3c2440-dma.o

obj-$(CONFIG_S3C2440_DMA)	+= s3c2440-dma.o





# S3C2442 support

# S3C2442 support
@@ -68,10 +66,6 @@ obj-$(CONFIG_CPU_S3C2442) += s3c2442-clock.o 




obj-$(CONFIG_BAST_PC104_IRQ)	+= bast-irq.o

obj-$(CONFIG_BAST_PC104_IRQ)	+= bast-irq.o





# merge in dma objects



obj-y				+= $(obj-dma-y)



# machine specific support

# machine specific support





obj-$(CONFIG_MACH_AML_M5900)	+= mach-amlm5900.o

obj-$(CONFIG_MACH_AML_M5900)	+= mach-amlm5900.o