Dream in staging: separate Kconfig/Makefile into subdirectory

Dream in staging: separate Kconfig/Makefile into subdirectory

[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 <pavel@ucw.cz>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 300b83e..50f9ab0 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -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
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 8d2e1c2..4fa2e07 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -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/
diff --git a/drivers/staging/dream/Kconfig b/drivers/staging/dream/Kconfig
new file mode 100644
index 0000000..2e0c972
--- /dev/null
+++ b/drivers/staging/dream/Kconfig
@@ -0,0 +1,4 @@
+source "drivers/staging/dream/smd/Kconfig"
+
+source "drivers/staging/dream/camera/Kconfig"
+
diff --git a/drivers/staging/dream/Makefile b/drivers/staging/dream/Makefile
new file mode 100644
index 0000000..ab76800
--- /dev/null
+++ b/drivers/staging/dream/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_MSM_ADSP)		+= qdsp5/ smd/
+obj-$(CONFIG_MSM_CAMERA)	+= camera/

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: Dream in staging: separate Kconfig/Makefile into subdirectory

[Bartlomiej Zolnierkiewicz]

Hi Pavel,

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 <pavel@ucw.cz>

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 ;)..

Re: Dream in staging: separate Kconfig/Makefile into subdirectory

[Pavel Machek]

On Tue 2009-07-21 14:16:20, Bartlomiej Zolnierkiewicz wrote:
> 
> Hi Pavel,
> 
> 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 <pavel@ucw.cz>
> 
> 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 ;)..

Umm, yes.

---

Limit SMD communication glue to MSM platform. It is closely tied to
MSM architecture.

Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/staging/dream/smd/Kconfig b/drivers/staging/dream/smd/Kconfig
index 3c1db3c..17b8bdc 100644
--- a/drivers/staging/dream/smd/Kconfig
+++ b/drivers/staging/dream/smd/Kconfig
@@ -1,4 +1,5 @@
 config MSM_SMD
+	depends on ARCH_MSM
 	default y
 	bool "MSM Shared Memory Driver (SMD)"
 	help

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: Dream in staging: separate Kconfig/Makefile into subdirectory

[Greg KH]

On Mon, Jul 20, 2009 at 12:35:32PM +0200, 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 <pavel@ucw.cz>
> 
> diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
> index 300b83e..50f9ab0 100644
> --- a/drivers/staging/Kconfig
> +++ b/drivers/staging/Kconfig
> @@ -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
> diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
> index 8d2e1c2..4fa2e07 100644
> --- a/drivers/staging/Makefile
> +++ b/drivers/staging/Makefile
> @@ -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

Re: Dream in staging: separate Kconfig/Makefile into subdirectory

[Pavel Machek]

On Mon 2009-07-27 08:37:11, Greg KH wrote:
> On Mon, Jul 20, 2009 at 12:35:32PM +0200, 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 <pavel@ucw.cz>
> > 
> > diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
> > index 300b83e..50f9ab0 100644
> > --- a/drivers/staging/Kconfig
> > +++ b/drivers/staging/Kconfig
> > @@ -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
> > diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
> > index 8d2e1c2..4fa2e07 100644
> > --- a/drivers/staging/Makefile
> > +++ b/drivers/staging/Makefile
> > @@ -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?

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
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: Dream in staging: separate Kconfig/Makefile into subdirectory

[Greg KH]

On Wed, Aug 05, 2009 at 05:27:21PM +0200, Pavel Machek wrote:
> On Mon 2009-07-27 08:37:11, Greg KH wrote:
> > On Mon, Jul 20, 2009 at 12:35:32PM +0200, 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 <pavel@ucw.cz>
> > > 
> > > diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
> > > index 300b83e..50f9ab0 100644
> > > --- a/drivers/staging/Kconfig
> > > +++ b/drivers/staging/Kconfig
> > > @@ -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
> > > diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
> > > index 8d2e1c2..4fa2e07 100644
> > > --- a/drivers/staging/Makefile
> > > +++ b/drivers/staging/Makefile
> > > @@ -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?
> 
> 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

Re: Dream in staging: separate Kconfig/Makefile into subdirectory

[Pavel Machek]

> > > 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?

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
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Dream in staging: separate Kconfig/Makefile into subdirectory

[Pavel Machek]

> > 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?

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.

Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index c0ae9db..7d0ad5a 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -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"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 48cae04..7439983 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -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/

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

patch staging-dream-separate-kconfig-makefile-into-subdirectory.patch added to gregkh-2.6 tree

[gregkh]

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/


>From pavel@ucw.cz  Mon Aug 17 13:03:17 2009
From: Pavel Machek <pavel@ucw.cz>
Date: Sat, 8 Aug 2009 14:27:02 +0200
Subject: Staging: Dream: separate Kconfig/Makefile into subdirectory
To: Greg KH <greg@kroah.com>
Cc: kernel list <linux-kernel@vger.kernel.org>
Message-ID: <20090808122701.GD11163@elf.ucw.cz>
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.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/staging/Kconfig  |    6 ++----
 drivers/staging/Makefile |    3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -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"
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -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/

patch staging-dream-separate-kconfig-makefile-into-subdirectory.patch added to gregkh-2.6 tree

[gregkh]

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/


>From pavel@ucw.cz  Mon Aug 17 13:03:17 2009
From: Pavel Machek <pavel@ucw.cz>
Date: Sat, 8 Aug 2009 14:27:02 +0200
Subject: Staging: Dream: separate Kconfig/Makefile into subdirectory
To: Greg KH <greg@kroah.com>
Cc: kernel list <linux-kernel@vger.kernel.org>
Message-ID: <20090808122701.GD11163@elf.ucw.cz>
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.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/staging/Kconfig  |    6 ++----
 drivers/staging/Makefile |    3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -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"
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -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/