Dream in staging: separate Kconfig/Makefile into subdirectory
Separate Kconfig/Makefile glue from dream into subdirectory. I plan to add few more drivers, and changing staging/Makefile each time sounds like inviting conflicts.
drivers/staging/Kconfig +2 -4
@@ -133,11 +133,9 @@ source "drivers/staging/cpc-usb/Kconfig" source "drivers/staging/pata_rdc/Kconfig" -source "drivers/staging/dream/smd/Kconfig" - -source "drivers/staging/dream/camera/Kconfig" - source "drivers/staging/udlfb/Kconfig" +source "drivers/staging/dream/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING
drivers/staging/Makefile +1 -3
@@ -1,7 +1,7 @@ # Makefile for staging directory # fix for build system bug... -obj-$(CONFIG_STAGING) += staging.o +obj-$(CONFIG_STAGING) += staging.o dream/ obj-$(CONFIG_ET131X) += et131x/ obj-$(CONFIG_SLICOSS) += slicoss/
@@ -49,5 +49,3 @@ obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_USB_CPC) += cpc-usb/ obj-$(CONFIG_RDC_17F3101X) += pata_rdc/ obj-$(CONFIG_FB_UDL) += udlfb/ -obj-$(CONFIG_MSM_ADSP) += dream/qdsp5/ dream/smd/ -obj-$(CONFIG_MSM_CAMERA) += dream/camera/
drivers/staging/dream/Kconfig new file +4 -0
@@ -0,0 +1,4 @@ +source "drivers/staging/dream/smd/Kconfig" + +source "drivers/staging/dream/camera/Kconfig" +
drivers/staging/dream/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +obj-$(CONFIG_MSM_ADSP) += qdsp5/ smd/ +obj-$(CONFIG_MSM_CAMERA) += camera/
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Hi Pavel,
Quoted 5 lines · On Monday 20 July 2009 12:35:32 Pavel Machek wrote:
Separate Kconfig/Makefile glue from dream into subdirectory. I plan to add few more drivers, and changing staging/Makefile each time sounds like inviting conflicts.
Signed-off-by Pavel Machek <[email protected]>
While you are at it could you please limit the scope of those Kconfigs to Dream platform somehow (today's -next asked me about MSM_SMD and upon checking I'm pretty sure that I don't need it on x86-32 ;)..
Quoted 8 lines · Bartlomiej Zolnierkiewicz
Hi Pavel,
Quoted 4 lines · On Monday 20 July 2009 12:35:32 Pavel Machek wrote:
Separate Kconfig/Makefile glue from dream into subdirectory. I plan to add few more drivers, and changing staging/Makefile each time sounds like inviting conflicts.
Quoted 5 lines
Quoted 1 line
Signed-off-by Pavel Machek <[email protected]>While you are at it could you please limit the scope of those Kconfigs to Dream platform somehow (today's -next asked me about
MSM_SMDand upon checking I'm pretty sure that I don't need it on x86-32 ;)..
Umm, yes.
---
Limit SMD communication glue to MSM platform. It is closely tied to MSM architecture.
drivers/staging/dream/smd/Kconfig +1 -0
@@ -1,4 +1,5 @@ config MSM_SMD + depends on ARCH_MSM default y bool "MSM Shared Memory Driver (SMD)" help
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 29 lines · Pavel Machek
Separate Kconfig/Makefile glue from dream into subdirectory. I plan to add few more drivers, and changing staging/Makefile each time sounds like inviting conflicts.
Signed-off-by Pavel Machek <[email protected]>drivers/staging/Kconfig +2
-4@@ -133,11 +133,9 @@ source "drivers/staging/cpc-usb/Kconfig" source "drivers/staging/pata_rdc/Kconfig" -source "drivers/staging/dream/smd/Kconfig" - -source "drivers/staging/dream/camera/Kconfig" - source "drivers/staging/udlfb/Kconfig" +source "drivers/staging/dream/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGINGdrivers/staging/Makefile +0
-0
drivers/staging/Makefile line 4
Quoted 5 lines
drivers/staging/Makefile +1
-1@@ -1,7 +1,7 @@ # Makefile for staging directory # fix for build system bug... -obj-$(CONFIG_STAGING) += staging.o +obj-$(CONFIG_STAGING) += staging.o dream/
Ick, no, you shouldn't have to do this.
Please jump into the dream subdir based on a Kconfig option, don't go there every single time.
Care to fix this up?
thanks,
greg k-h
Quoted 38 lines · Greg KH
Quoted 29 lines · Pavel Machek
Separate Kconfig/Makefile glue from dream into subdirectory. I plan to add few more drivers, and changing staging/Makefile each time sounds like inviting conflicts.
Signed-off-by Pavel Machek <[email protected]>drivers/staging/Kconfig +2
-4@@ -133,11 +133,9 @@ source "drivers/staging/cpc-usb/Kconfig" source "drivers/staging/pata_rdc/Kconfig" -source "drivers/staging/dream/smd/Kconfig" - -source "drivers/staging/dream/camera/Kconfig" - source "drivers/staging/udlfb/Kconfig" +source "drivers/staging/dream/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGINGdrivers/staging/Makefile +0
-0drivers/staging/Makefile line 4
Quoted 5 lines
drivers/staging/Makefile +1
-1@@ -1,7 +1,7 @@ # Makefile for staging directory # fix for build system bug... -obj-$(CONFIG_STAGING) += staging.o +obj-$(CONFIG_STAGING) += staging.o dream/Ick, no, you shouldn't have to do this.
Quoted 4 lines
Please jump into the dream subdir based on a
Kconfigoption, don't go there every single time.Care to fix this up?
I'm afraid I don't quite have suitable config option. At least synaptics touchpad should be usable outside dream.
OTOH Dream is still major user; and I guess I can just introduce "CONFIG_DREAM". Should I?
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 42 lines · Pavel Machek
Quoted 41 lines · Greg KH
Quoted 29 lines · Pavel Machek
Separate Kconfig/Makefile glue from dream into subdirectory. I plan to add few more drivers, and changing staging/Makefile each time sounds like inviting conflicts.
Signed-off-by Pavel Machek <[email protected]>drivers/staging/Kconfig +2
-4@@ -133,11 +133,9 @@ source "drivers/staging/cpc-usb/Kconfig" source "drivers/staging/pata_rdc/Kconfig" -source "drivers/staging/dream/smd/Kconfig" - -source "drivers/staging/dream/camera/Kconfig" - source "drivers/staging/udlfb/Kconfig" +source "drivers/staging/dream/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGINGdrivers/staging/Makefile +0
-0drivers/staging/Makefile line 4
Quoted 5 lines
drivers/staging/Makefile +1
-1@@ -1,7 +1,7 @@ # Makefile for staging directory # fix for build system bug... -obj-$(CONFIG_STAGING) += staging.o +obj-$(CONFIG_STAGING) += staging.o dream/Ick, no, you shouldn't have to do this.
Please jump into the dream subdir based on a
Kconfigoption, don't go there every single time.
Quoted 7 lines
Quoted 1 line
Care to fix this up?
I'm afraid I don't quite have suitable config option. At least synaptics touchpad should be usable outside dream.
OTOH Dream is still major user; and I guess I can just introduce "
CONFIG_DREAM". Should I?
What's wrong with using the CONFIG_ANDROID dependancy here? Actually, why not use it for all of the dream files?
Or yes, you can create CONFIG_DREAM if you want, but there's probably a better, arch-specific config item that you want to use.
thanks,
greg k-h
Quoted 11 lines
Quoted 8 lines
Quoted 2 lines
Care to fix this up?
I'm afraid I don't quite have suitable config option. At least synaptics touchpad should be usable outside dream.
OTOH Dream is still major user; and I guess I can just introduce "
CONFIG_DREAM". Should I?What's wrong with using the
CONFIG_ANDROIDdependancy here? Actually, why not use it for all of the dream files?
Well, my goal is to run Debian on Dream, so I do not need extensions provided by CONFIG_ANDROID...
OTOH that is probably easiest and makes some sense.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 6 lines
Quoted 3 lines
OTOH Dream is still major user; and I guess I can just introduce "
CONFIG_DREAM". Should I?What's wrong with using the
CONFIG_ANDROIDdependancy here? Actually, why not use it for all of the dream files?
Ok... simple enough and should do the trick, done :-).
---
Separate Kconfig/Makefile glue from dream into subdirectory. I plan to add few more drivers, and changing staging/Makefile each time sounds like inviting conflicts.
drivers/staging/Kconfig +2 -4
@@ -99,6 +99,8 @@ source "drivers/staging/frontier/Kconfig" source "drivers/staging/android/Kconfig" +source "drivers/staging/dream/Kconfig" + source "drivers/staging/dst/Kconfig" source "drivers/staging/pohmelfs/Kconfig"
@@ -129,10 +131,6 @@ source "drivers/staging/vt6656/Kconfig" source "drivers/staging/cpc-usb/Kconfig" -source "drivers/staging/dream/smd/Kconfig" - -source "drivers/staging/dream/camera/Kconfig" - source "drivers/staging/udlfb/Kconfig" source "drivers/staging/hv/Kconfig"
drivers/staging/Makefile +1 -2
@@ -32,6 +32,7 @@ obj-$(CONFIG_USB_RSPI) += rspiusb/ obj-$(CONFIG_INPUT_MIMIO) += mimio/ obj-$(CONFIG_TRANZPORT) += frontier/ obj-$(CONFIG_ANDROID) += android/ +obj-$(CONFIG_ANDROID) += dream/ obj-$(CONFIG_DST) += dst/ obj-$(CONFIG_POHMELFS) += pohmelfs/ obj-$(CONFIG_STLC45XX) += stlc45xx/
@@ -47,7 +48,5 @@ obj-$(CONFIG_VT6655) += vt6655/ obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_USB_CPC) += cpc-usb/ obj-$(CONFIG_FB_UDL) += udlfb/ -obj-$(CONFIG_MSM_ADSP) += dream/qdsp5/ dream/smd/ -obj-$(CONFIG_MSM_CAMERA) += dream/camera/ obj-$(CONFIG_HYPERV) += hv/ obj-$(CONFIG_VME) += vme/
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[email protected]
Appliedpatch staging-dream-separate-kconfig-makefile-into-subdirectory.patch added to gregkh-2.6 tree
This is a note to let you know that I've just added the patch titled
Subject: Staging: Dream: separate Kconfig/Makefile into subdirectory
to my gregkh-2.6 tree. Its filename is
staging-dream-separate-kconfig-makefile-into-subdirectory.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
Quoted 1 line
From [email protected] Mon Aug 17 13:03:17 2009
From: Pavel Machek <[email protected]>
Date: Sat, 8 Aug 2009 14:27:02 +0200
Subject: Staging: Dream: separate Kconfig/Makefile into subdirectory
To: Greg KH <[email protected]>
Cc: kernel list <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline
Separate Kconfig/Makefile glue from dream into subdirectory. I plan to add few more drivers, and changing staging/Makefile each time sounds like inviting conflicts.
--- drivers/staging/Kconfig | 6 ++---- drivers/staging/Makefile | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/staging/Kconfig +2 -4
@@ -99,6 +99,8 @@ source "drivers/staging/epl/Kconfig" source "drivers/staging/android/Kconfig" +source "drivers/staging/dream/Kconfig" + source "drivers/staging/dst/Kconfig" source "drivers/staging/pohmelfs/Kconfig"
@@ -131,10 +133,6 @@ source "drivers/staging/cpc-usb/Kconfig" source "drivers/staging/pata_rdc/Kconfig" -source "drivers/staging/dream/smd/Kconfig" - -source "drivers/staging/dream/camera/Kconfig" - source "drivers/staging/udlfb/Kconfig" source "drivers/staging/hv/Kconfig"
drivers/staging/Makefile +1 -2
@@ -32,6 +32,7 @@ obj-$(CONFIG_INPUT_MIMIO) += mimio/ obj-$(CONFIG_TRANZPORT) += frontier/ obj-$(CONFIG_EPL) += epl/ obj-$(CONFIG_ANDROID) += android/ +obj-$(CONFIG_ANDROID) += dream/ obj-$(CONFIG_DST) += dst/ obj-$(CONFIG_POHMELFS) += pohmelfs/ obj-$(CONFIG_STLC45XX) += stlc45xx/
@@ -48,6 +49,4 @@ obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_USB_CPC) += cpc-usb/ obj-$(CONFIG_RDC_17F3101X) += pata_rdc/ obj-$(CONFIG_FB_UDL) += udlfb/ -obj-$(CONFIG_MSM_ADSP) += dream/qdsp5/ dream/smd/ -obj-$(CONFIG_MSM_CAMERA) += dream/camera/ obj-$(CONFIG_HYPERV) += hv/
[email protected]
Appliedpatch staging-dream-separate-kconfig-makefile-into-subdirectory.patch added to gregkh-2.6 tree
In reply to Pavel MachekThis is a note to let you know that I've just added the patch titled
Subject: Staging: Dream: separate Kconfig/Makefile into subdirectory
to my gregkh-2.6 tree. Its filename is
staging-dream-separate-kconfig-makefile-into-subdirectory.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
Quoted 1 line
From [email protected] Mon Aug 17 13:03:17 2009
From: Pavel Machek <[email protected]>
Date: Sat, 8 Aug 2009 14:27:02 +0200
Subject: Staging: Dream: separate Kconfig/Makefile into subdirectory
To: Greg KH <[email protected]>
Cc: kernel list <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline
Separate Kconfig/Makefile glue from dream into subdirectory. I plan to add few more drivers, and changing staging/Makefile each time sounds like inviting conflicts.
--- drivers/staging/Kconfig | 6 ++---- drivers/staging/Makefile | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/staging/Kconfig +2 -4
@@ -99,6 +99,8 @@ source "drivers/staging/epl/Kconfig" source "drivers/staging/android/Kconfig" +source "drivers/staging/dream/Kconfig" + source "drivers/staging/dst/Kconfig" source "drivers/staging/pohmelfs/Kconfig"
@@ -131,10 +133,6 @@ source "drivers/staging/cpc-usb/Kconfig" source "drivers/staging/pata_rdc/Kconfig" -source "drivers/staging/dream/smd/Kconfig" - -source "drivers/staging/dream/camera/Kconfig" - source "drivers/staging/udlfb/Kconfig" source "drivers/staging/hv/Kconfig"
drivers/staging/Makefile +1 -2
@@ -32,6 +32,7 @@ obj-$(CONFIG_INPUT_MIMIO) += mimio/ obj-$(CONFIG_TRANZPORT) += frontier/ obj-$(CONFIG_EPL) += epl/ obj-$(CONFIG_ANDROID) += android/ +obj-$(CONFIG_ANDROID) += dream/ obj-$(CONFIG_DST) += dst/ obj-$(CONFIG_POHMELFS) += pohmelfs/ obj-$(CONFIG_STLC45XX) += stlc45xx/
@@ -48,6 +49,4 @@ obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_USB_CPC) += cpc-usb/ obj-$(CONFIG_RDC_17F3101X) += pata_rdc/ obj-$(CONFIG_FB_UDL) += udlfb/ -obj-$(CONFIG_MSM_ADSP) += dream/qdsp5/ dream/smd/ -obj-$(CONFIG_MSM_CAMERA) += dream/camera/ obj-$(CONFIG_HYPERV) += hv/