Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

Re: [PATCH] staging/dream: add missing include files/fix compilation

99 views
Skip to first unread message

Greg KH

unread,
Jan 14, 2010, 7:40:03 PM1/14/10
to
On Fri, Dec 25, 2009 at 09:59:18PM +0100, Pavel Machek wrote:
> This adds missing include files, so it should now compile. ifdef
> guards were added to Kconfig, so it should not cause problems on
> non-arch-msm machines.
>
> Signed-off-by: Pavel Machek <pa...@ucw.cz>

Odd, this doesn't apply to the linux-next tree, some of the files are
already there.

Care to refresh this?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Pavel Machek

unread,
Jan 19, 2010, 12:50:02 AM1/19/10
to
On Thu 2010-01-14 16:24:19, Greg KH wrote:
> On Fri, Dec 25, 2009 at 09:59:18PM +0100, Pavel Machek wrote:
> > This adds missing include files, so it should now compile. ifdef
> > guards were added to Kconfig, so it should not cause problems on
> > non-arch-msm machines.
> >
> > Signed-off-by: Pavel Machek <pa...@ucw.cz>
>
> Odd, this doesn't apply to the linux-next tree, some of the files are
> already there.

Strange, it seems it is almost all already in. Well, good :-).

But there's small problem. linux-next now contains dwalker's tree, and
I could not get it to compile, even with staging disabled. I'll need
to look into that.

Here are remaining few patches, now easy to read. (It also shows that
at least CONFIG_AMSS_VERSION and CONFIG_GPIO should really be in
arch/arm. I believe it will get there in .34 or so...)

---

Guard whole dream/ specific Kconfig with CONFIG_DREAM so that we don't
cause compile failures in other architectures. Add missing pieces so
that it compiles.

I am not sure if this is ready for staging. I guess we should wait
till I get tree to compile in -next...?

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

diff --git a/drivers/staging/dream/Kconfig b/drivers/staging/dream/Kconfig
index 4afa081..a824417 100644
--- a/drivers/staging/dream/Kconfig
+++ b/drivers/staging/dream/Kconfig
@@ -1,16 +1,55 @@
config DREAM
- tristate "HTC Dream support"
- depends on BROKEN
+ bool "HTC Dream support"
+ depends on ARCH_MSM
+
+if DREAM

source "drivers/staging/dream/smd/Kconfig"

source "drivers/staging/dream/camera/Kconfig"

+config MSM_AMSS_VERSION
+ int
+ default 6210 if MSM_AMSS_VERSION_6210
+ default 6220 if MSM_AMSS_VERSION_6220
+ default 6225 if MSM_AMSS_VERSION_6225
+ default 6350 if MSM_AMSS_VERSION_6350
+
+choice
+ prompt "AMSS modem firmware version"
+
+ default MSM_AMSS_VERSION_6225
+
+ config MSM_AMSS_VERSION_6210
+ bool "6.2.10"
+
+ config MSM_AMSS_VERSION_6220
+ bool "6.2.20"
+
+ config MSM_AMSS_VERSION_6225
+ bool "6.2.20 + New ADSP"
+
+ config MSM_AMSS_VERSION_6350
+ bool "6.3.50"
+endchoice
+
+config MSM_ADSP
+ tristate "MSM ADSP driver"
+ default y
+ help
+ Provides access to registers needed by the userspace aDSP library.

config INPUT_GPIO
tristate "GPIO driver support"
help
Say Y here if you want to support gpio based keys, wheels etc...

+config GENERIC_GPIO
+ bool
+ default y

+config ANDROID_PMEM
+ bool "Android pmem allocator"
+ default y

+endif
diff --git a/drivers/staging/dream/Makefile b/drivers/staging/dream/Makefile
index 2b79151..f1e0429 100644
--- a/drivers/staging/dream/Makefile
+++ b/drivers/staging/dream/Makefile
@@ -1,4 +1,7 @@
+EXTRA_CFLAGS=-Idrivers/staging/dream/include
obj-$(CONFIG_MSM_ADSP) += qdsp5/ smd/
obj-$(CONFIG_MSM_CAMERA) += camera/
obj-$(CONFIG_INPUT_GPIO) += gpio_axis.o gpio_event.o gpio_input.o gpio_matrix.o gpio_output.o
+obj-$(CONFIG_ANDROID_PMEM) += pmem.o
+obj-y += generic_gpio.o

diff --git a/drivers/staging/dream/camera/mt9t013.c b/drivers/staging/dream/camera/mt9t013.c
index 88229f2..ecb4866 100644
--- a/drivers/staging/dream/camera/mt9t013.c
+++ b/drivers/staging/dream/camera/mt9t013.c
@@ -9,7 +9,7 @@
#include <linux/miscdevice.h>
#include <linux/kernel.h>
#include <media/msm_camera.h>
-#include <mach/gpio.h>
+#include <linux/gpio.h>
#include <mach/camera.h>
#include <asm/mach-types.h>
#include "mt9t013.h"
diff --git a/drivers/staging/dream/qdsp5/adsp.c b/drivers/staging/dream/qdsp5/adsp.c
index 9069535..1fab9ce 100644
--- a/drivers/staging/dream/qdsp5/adsp.c
+++ b/drivers/staging/dream/qdsp5/adsp.c
@@ -45,6 +45,7 @@ static inline void allow_suspend(void)
#include "adsp.h"

#define INT_ADSP INT_ADSP_A9_A11
+#define MSM_AD5_BASE IOMEM(0xE0300000)

static struct adsp_info adsp_info;
static struct msm_rpc_endpoint *rpc_cb_server_client;
diff --git a/drivers/staging/dream/qdsp5/snd.c b/drivers/staging/dream/qdsp5/snd.c
index 037d7ff..9ee0d90 100644
--- a/drivers/staging/dream/qdsp5/snd.c
+++ b/drivers/staging/dream/qdsp5/snd.c
@@ -28,6 +28,16 @@
#include <mach/board.h>
#include <mach/msm_rpcrouter.h>

+struct snd_endpoint {
+ int id;
+ const char *name;
+};
+
+struct msm_snd_endpoints {
+ struct snd_endpoint *endpoints;
+ unsigned num;
+};
+
struct snd_ctxt {
struct mutex lock;
int opened;


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

Daniel Walker

unread,
Jan 19, 2010, 10:20:03 AM1/19/10
to
On Tue, 2010-01-19 at 06:45 +0100, Pavel Machek wrote:
> On Thu 2010-01-14 16:24:19, Greg KH wrote:
> > On Fri, Dec 25, 2009 at 09:59:18PM +0100, Pavel Machek wrote:
> > > This adds missing include files, so it should now compile. ifdef
> > > guards were added to Kconfig, so it should not cause problems on
> > > non-arch-msm machines.
> > >
> > > Signed-off-by: Pavel Machek <pa...@ucw.cz>
> >
> > Odd, this doesn't apply to the linux-next tree, some of the files are
> > already there.
>
> Strange, it seems it is almost all already in. Well, good :-).
>
> But there's small problem. linux-next now contains dwalker's tree, and
> I could not get it to compile, even with staging disabled. I'll need
> to look into that.

I worked on it a little, but I won't have time to really start cleaning
up that tree till next week, or this weekend.

I pushed a new tree for next that should compile for dream with the
attached config. I also included the patch that I added to get it to
compile (you'll need the machine types too which I didn't include).

Daniel


dream-compile-state.patch
pavel-dream-g1.config

Greg KH

unread,
Jan 19, 2010, 11:00:02 AM1/19/10
to
On Tue, Jan 19, 2010 at 06:45:17AM +0100, Pavel Machek wrote:
> On Thu 2010-01-14 16:24:19, Greg KH wrote:
> > On Fri, Dec 25, 2009 at 09:59:18PM +0100, Pavel Machek wrote:
> > > This adds missing include files, so it should now compile. ifdef
> > > guards were added to Kconfig, so it should not cause problems on
> > > non-arch-msm machines.
> > >
> > > Signed-off-by: Pavel Machek <pa...@ucw.cz>
> >
> > Odd, this doesn't apply to the linux-next tree, some of the files are
> > already there.
>
> Strange, it seems it is almost all already in. Well, good :-).
>
> But there's small problem. linux-next now contains dwalker's tree, and
> I could not get it to compile, even with staging disabled. I'll need
> to look into that.
>
> Here are remaining few patches, now easy to read. (It also shows that
> at least CONFIG_AMSS_VERSION and CONFIG_GPIO should really be in
> arch/arm. I believe it will get there in .34 or so...)
>
> ---
>
> Guard whole dream/ specific Kconfig with CONFIG_DREAM so that we don't
> cause compile failures in other architectures. Add missing pieces so
> that it compiles.
>
> I am not sure if this is ready for staging. I guess we should wait
> till I get tree to compile in -next...?

Ok, I'll wait for you to get things building. Feel free to send the
patch to me after that.

thanks,

greg k-h

Pavel Machek

unread,
Jan 31, 2010, 3:50:02 AM1/31/10
to
Hi!

> > > > This adds missing include files, so it should now compile. ifdef
> > > > guards were added to Kconfig, so it should not cause problems on
> > > > non-arch-msm machines.
> > > >
> > > > Signed-off-by: Pavel Machek <pa...@ucw.cz>
> > >
> > > Odd, this doesn't apply to the linux-next tree, some of the files are
> > > already there.
> >
> > Strange, it seems it is almost all already in. Well, good :-).
> >
> > But there's small problem. linux-next now contains dwalker's tree, and
> > I could not get it to compile, even with staging disabled. I'll need
> > to look into that.
>
> I worked on it a little, but I won't have time to really start cleaning
> up that tree till next week, or this weekend.
>
> I pushed a new tree for next that should compile for dream with the
> attached config. I also included the patch that I added to get it to
> compile (you'll need the machine types too which I didn't include).

Thanks! I checked out linux-next version, and it seems to include

> commit cdf6c137865357112aa31666b65b938ab29fa736
> msm: compile fixes for dream.

this patch. It still fails with:

arch/arm/mach-msm/rpc_hsusb.c: In function 'msm_chg_rpc_connect':
arch/arm/mach-msm/rpc_hsusb.c:156: error: implicit declaration of
function 'machine_is_msm7201a_surf'
arch/arm/mach-msm/rpc_hsusb.c:156: error: implicit declaration of
function 'machine_is_msm7x27_surf'
arch/arm/mach-msm/rpc_hsusb.c:157: error: implicit declaration of
function 'machine_is_qsd8x50_surf'
make[1]: *** [arch/arm/mach-msm/rpc_hsusb.o] Error 1
make: *** [arch/arm/mach-msm] Error 2

(and similar error further down). This fixes it, but you probably want
to add machine_is_* to your git. (Aha, is that what you meant by
"machine types"?

With this patch it compiles.

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

diff --git a/arch/arm/mach-msm/rpc_hsusb.c b/arch/arm/mach-msm/rpc_hsusb.c
index 22dee1c..52ba8b0 100644
--- a/arch/arm/mach-msm/rpc_hsusb.c
+++ b/arch/arm/mach-msm/rpc_hsusb.c
@@ -152,11 +152,6 @@ EXPORT_SYMBOL(msm_hsusb_rpc_connect);
/* rpc connect for charging */
int msm_chg_rpc_connect(void)
{
-
- if (machine_is_msm7201a_surf() || machine_is_msm7x27_surf() ||
- machine_is_qsd8x50_surf())
- return -ENOTSUPP;
-
if (chg_ep && !IS_ERR(chg_ep)) {
printk(KERN_INFO "%s: chg_ep already connected\n", __func__);
return 0;
diff --git a/arch/arm/mach-msm/rpc_server_handset.c b/arch/arm/mach-msm/rpc_server_handset.c
index f2df4ac..2b3d33e 100644
--- a/arch/arm/mach-msm/rpc_server_handset.c
+++ b/arch/arm/mach-msm/rpc_server_handset.c
@@ -369,12 +369,6 @@ static int __init hs_rpc_init(void)
{
int rc;

- if (machine_is_msm7x27_surf() || machine_is_msm7x27_ffa()) {
- rc = hs_rpc_cb_init();
- if (rc)
- pr_err("%s: failed to initialize\n", __func__);
- }
-
return msm_rpc_create_server(&hs_rpc_server);
}
module_init(hs_rpc_init);

Pavel Machek

unread,
Jan 31, 2010, 4:30:02 AM1/31/10
to
Hi!

Ok, it compiles, but I do not see it booting. You config has:

CONFIG_MSM_DEBUG_UART=3
# CONFIG_MSM_DEBUG_UART_NONE is not set
# CONFIG_MSM_DEBUG_UART1 is not set
# CONFIG_MSM_DEBUG_UART2 is not set
CONFIG_MSM_DEBUG_UART3=y
...
CONFIG_DEBUG_LL=y
CONFIG_EARLY_PRINTK=y

set, so I'd expect it to say something on the serial line... (right?
Or do I still need to patch printk.c to get that?). And I see nothing
:-(.

I'm using

./fastboot -c "console=ttyMSM2 root=/dev/mmcblk0p1 rootdelay=5 fbcon=rotate:1" boot /data/l/linux-dwalker/arch/arm/boot/zImage

...with different kernel, it works (as in "I get most of the boot on
serial line; it will not actually mount root").
Pavel

Daniel Walker

unread,
Jan 31, 2010, 8:40:02 AM1/31/10
to
On Sun, 2010-01-31 at 09:44 +0100, Pavel Machek wrote:

> arch/arm/mach-msm/rpc_hsusb.c: In function 'msm_chg_rpc_connect':
> arch/arm/mach-msm/rpc_hsusb.c:156: error: implicit declaration of
> function 'machine_is_msm7201a_surf'
> arch/arm/mach-msm/rpc_hsusb.c:156: error: implicit declaration of
> function 'machine_is_msm7x27_surf'
> arch/arm/mach-msm/rpc_hsusb.c:157: error: implicit declaration of
> function 'machine_is_qsd8x50_surf'
> make[1]: *** [arch/arm/mach-msm/rpc_hsusb.o] Error 1
> make: *** [arch/arm/mach-msm] Error 2
>
> (and similar error further down). This fixes it, but you probably want
> to add machine_is_* to your git. (Aha, is that what you meant by
> "machine types"?

Yeah, those machines aren't registered so the inlines don't get
generated ..

> With this patch it compiles.

I need to actually register those machine types, So I can't remove them.
They are valid boards.

Daniel

Daniel Walker

unread,
Jan 31, 2010, 11:00:02 AM1/31/10
to

Have you seen this error?

GEN /local/mnt/workspace/c_dwalke/git-trees/dream-test/Makefile
scripts/kconfig/conf -s arch/arm/Kconfig
GEN /local/mnt/workspace/c_dwalke/git-trees/dream-test/Makefile
CHK include/linux/version.h
CHK include/generated/utsrelease.h
Using /local/mnt/workspace/c_dwalke/git-trees/linux-2.6 as source for kernel
make[2]: `include/generated/mach-types.h' is up to date.
CALL /local/mnt/workspace/c_dwalke/git-trees/linux-2.6/scripts/checksyscalls.sh
CHK include/generated/compile.h
GZIP kernel/config_data.gz
IKCFG kernel/config_data.h
CC kernel/configs.o
LD kernel/built-in.o
CC drivers/video/msm/msm_fb.o
CC drivers/video/cfbcopyarea.o
/home/dwalker/linux-2.6/drivers/video/msm/msm_fb.c:24: fatal error: linux/msm_mdp.h: No such file or directory
compilation terminated.
make[4]: *** [drivers/video/msm/msm_fb.o] Error 1
make[3]: *** [drivers/video/msm] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [drivers/video] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2

Even with the framebuffer off I still don't get any serial output on a
plain 2.6.33-rc6 .. I'm using a config that you sent me when you first
tested my -next tree .

Daniel

Pavel Machek

unread,
Feb 25, 2010, 2:40:01 PM2/25/10
to
Hi!

> > > (and similar error further down). This fixes it, but you probably want
> > > to add machine_is_* to your git. (Aha, is that what you meant by
> > > "machine types"?
> > >
> > > With this patch it compiles.
> >
> > Ok, it compiles, but I do not see it booting. You config has:
> >
> > CONFIG_MSM_DEBUG_UART=3
> > # CONFIG_MSM_DEBUG_UART_NONE is not set
> > # CONFIG_MSM_DEBUG_UART1 is not set
> > # CONFIG_MSM_DEBUG_UART2 is not set
> > CONFIG_MSM_DEBUG_UART3=y
> > ...
> > CONFIG_DEBUG_LL=y
> > CONFIG_EARLY_PRINTK=y
> >
> > set, so I'd expect it to say something on the serial line... (right?
> > Or do I still need to patch printk.c to get that?). And I see nothing
> > :-(.
> >
> > I'm using
> >
> > ./fastboot -c "console=ttyMSM2 root=/dev/mmcblk0p1 rootdelay=5 fbcon=rotate:1" boot /data/l/linux-dwalker/arch/arm/boot/zImage
> >
> > ...with different kernel, it works (as in "I get most of the boot on
> > serial line; it will not actually mount root").
>
> Have you seen this error?

...


> /home/dwalker/linux-2.6/drivers/video/msm/msm_fb.c:24: fatal error: linux/msm_mdp.h: No such file or directory
> compilation terminated.
> make[4]: *** [drivers/video/msm/msm_fb.o] Error 1
> make[3]: *** [drivers/video/msm] Error 2
> make[3]: *** Waiting for unfinished jobs....
> make[2]: *** [drivers/video] Error 2
> make[1]: *** [drivers] Error 2
> make: *** [sub-make] Error 2

Yes, framebuffer has problems.

> Even with the framebuffer off I still don't get any serial output on a
> plain 2.6.33-rc6 .. I'm using a config that you sent me when you first
> tested my -next tree .

2.6.33 boots here, with attached config. I'll try -next next.

commandline from head: console=ttyMSM2 root=/dev/mmcblk0p1 rootdelay=5
fbcon=ro1command line length =344
active commandline: board_trout.disable_uart3=0
board_trout.usb_h2w_sw=0 board_1
PARTITIOM_NUM_MAX =6 Valid partition num=6
Uncompressing Linux... done, booting the kernel.
[ 0.000000] Linux version 2.6.33-00001-gbaac35c (pavel@amd) (gcc
version 4.30[ 0.000000] CPU: ARMv6-compatible processor [4117b362]
revision 2 (ARMv6TEJ)f[ 0.000000] CPU: VIPT aliasing data cache,
VIPT aliasing instruction cache
[ 0.000000] Machine: HTC Dream
[ 0.000000] Ignoring unrecognised tag 0x4d534d70
[ 0.000000] Ignoring unrecognised tag 0x57494649
[ 0.000000] Ignoring unrecognised tag 0x89768976
[ 0.000000] Memory policy: ECC disabled, Data cache writeback
[ 0.000000] Built 1 zonelists in Zone order, mobility grouping on.
Total pa4[ 0.000000] Kernel command line:
board_trout.disable_uart3=0 board_trout.usb1[ 0.000000] PID hash
table entries: 512 (order: -1, 2048 bytes)
...
[ 4.960000] NET: Registered protocol family 17
[ 4.970000] clock_late_init() disabled 21 unused clocks
[ 4.970000] drivers/rtc/hctosys.c: unable to open rtc device (rtc0)
[ 4.980000] Waiting 5sec before mounting root device...
[ 9.990000] VFS: Cannot open root device "mmcblk0p1" or
unknown-block(0,0)
[ 9.990000] Please append a correct "root=" boot option; here are
the availa:[ 10.000000] Kernel panic - not syncing: VFS: Unable to
mount root fs on unkn)

.config

Daniel Walker

unread,
Feb 25, 2010, 2:40:03 PM2/25/10
to

My -next tree hasn't changed much since you last looked at it .. I
wouldn't bother testing it. I might take some small fixes from that tree
to merge, but what's there is still too much of a mess to merge.

I just pushed another tree called "working-mmc" which still needs some
clean up but should have working mmc if you want to test that.

Daniel Walker

unread,
Feb 25, 2010, 2:50:02 PM2/25/10
to
On Thu, 2010-02-25 at 20:41 +0100, Pavel Machek wrote:
> Hi!
>
> > > > /home/dwalker/linux-2.6/drivers/video/msm/msm_fb.c:24: fatal error: linux/msm_mdp.h: No such file or directory
> > > > compilation terminated.
> > > > make[4]: *** [drivers/video/msm/msm_fb.o] Error 1
> > > > make[3]: *** [drivers/video/msm] Error 2
> > > > make[3]: *** Waiting for unfinished jobs....
> > > > make[2]: *** [drivers/video] Error 2
> > > > make[1]: *** [drivers] Error 2
> > > > make: *** [sub-make] Error 2
> > >
> > > Yes, framebuffer has problems.
> > >
> > > > Even with the framebuffer off I still don't get any serial output on a
> > > > plain 2.6.33-rc6 .. I'm using a config that you sent me when you first
> > > > tested my -next tree .
> > >
> > > 2.6.33 boots here, with attached config. I'll try -next next.
> >
> > My -next tree hasn't changed much since you last looked at it .. I
> > wouldn't bother testing it. I might take some small fixes from that tree
> > to merge, but what's there is still too much of a mess to merge.
>
> Ok, so your -next tree will not be merged for 2.6.34?

No it won't be. I was still planning to merge some more stripped down
board file for other targets, along with some other minor stuff..

> > I just pushed another tree called "working-mmc" which still needs some
> > clean up but should have working mmc if you want to test that.
>

> Do you have git url? Yes, I'd like to play.


git://codeaurora.org/quic/kernel/dwalker/linux-msm.git working-mmc

or

https://www.codeaurora.org/gitweb/quic/kernel/?p=dwalker/linux-msm.git;a=shortlog;h=refs/heads/working-mmc

Pavel Machek

unread,
Feb 25, 2010, 2:50:03 PM2/25/10
to
Hi!

> > > /home/dwalker/linux-2.6/drivers/video/msm/msm_fb.c:24: fatal error: linux/msm_mdp.h: No such file or directory
> > > compilation terminated.
> > > make[4]: *** [drivers/video/msm/msm_fb.o] Error 1
> > > make[3]: *** [drivers/video/msm] Error 2
> > > make[3]: *** Waiting for unfinished jobs....
> > > make[2]: *** [drivers/video] Error 2
> > > make[1]: *** [drivers] Error 2
> > > make: *** [sub-make] Error 2
> >
> > Yes, framebuffer has problems.
> >
> > > Even with the framebuffer off I still don't get any serial output on a
> > > plain 2.6.33-rc6 .. I'm using a config that you sent me when you first
> > > tested my -next tree .
> >
> > 2.6.33 boots here, with attached config. I'll try -next next.
>
> My -next tree hasn't changed much since you last looked at it .. I
> wouldn't bother testing it. I might take some small fixes from that tree
> to merge, but what's there is still too much of a mess to merge.

Ok, so your -next tree will not be merged for 2.6.34?

> I just pushed another tree called "working-mmc" which still needs some


> clean up but should have working mmc if you want to test that.

Do you have git url? Yes, I'd like to play.


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

Daniel Walker

unread,
Mar 1, 2010, 4:20:02 PM3/1/10
to
On Mon, 2010-03-01 at 22:10 +0100, Pavel Machek wrote:

> How do I get that one? I tried killing the repository and redoing git
> pull, followed up by

You should just be able to do "git remotes update" , then checkout the
branch again.

> git checkout refs/remotes/origin/working-mmc
>
> only to get (git log): [I think I was there before].
>
> commit 2b0bcf161e83fc7d45476f3330f06b656a1f03d4
> Author: Daniel Walker <dwa...@codeaurora.org>
> Date: Mon Feb 22 12:29:17 2010 -0800
>
> DMA fixes (get MMC working).
>
> commit 5fc33446739aa7a0826d98a00cc50a712c6d60eb
> Author: San Mehat <s...@google.com>
> Date: Wed Feb 3 12:59:29 2010 -0800
>
> drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support
>
> Signed-off-by: Dmitry Shmidt <dimi...@google.com>

I actually dropped a patch between the two above, otherwise the history
is very similar. I think you have the right one, are you still getting
the compile errors?

Pavel Machek

unread,
Mar 1, 2010, 4:20:03 PM3/1/10
to
Hi!


> > arch/arm/mach-msm/smd.c:429: warning: 'smd_dsp_irq_handler' defined
> > but not used
> > CC arch/arm/mach-msm/smd_debug.o
> > arch/arm/mach-msm/smd_debug.c:240: warning: initialization from
> > incompatible pointer type
> > CC arch/arm/mach-msm/board-dream.o
> > make[1]: *** No rule to make target
> > `arch/arm/mach-msm/board-dream-gpio.o', needed by
> > `arch/arm/mach-msm/built-in.o'. Stop.


> > make: *** [arch/arm/mach-msm] Error 2

> > 24.39user 5.08system 97.43 (1m37.437s) elapsed 30.24%CPU
> > pavel@amd:/data/l/linux-dwalker-mmc$ emacs .conf
> >
> > ....maybe board-dream-gpio.c needs to be added to git?
>
> I pushed a new branch into working-mmc . I added the board-dream-gpio.c
> file.. It's not the one you wrote tho, but eventually it will be. It
> should work now if you want to test it.

How do I get that one? I tried killing the repository and redoing git
pull, followed up by

git checkout refs/remotes/origin/working-mmc

only to get (git log): [I think I was there before].

commit 2b0bcf161e83fc7d45476f3330f06b656a1f03d4
Author: Daniel Walker <dwa...@codeaurora.org>
Date: Mon Feb 22 12:29:17 2010 -0800

DMA fixes (get MMC working).

commit 5fc33446739aa7a0826d98a00cc50a712c6d60eb
Author: San Mehat <s...@google.com>
Date: Wed Feb 3 12:59:29 2010 -0800

drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support

Signed-off-by: Dmitry Shmidt <dimi...@google.com>

Pavel

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

Pavel Machek

unread,
Mar 1, 2010, 4:50:01 PM3/1/10
to
On Mon 2010-03-01 13:15:18, Daniel Walker wrote:
> On Mon, 2010-03-01 at 22:10 +0100, Pavel Machek wrote:
>
> > How do I get that one? I tried killing the repository and redoing git
> > pull, followed up by
>
> You should just be able to do "git remotes update" , then checkout the
> branch again.

Thanks!

> > commit 5fc33446739aa7a0826d98a00cc50a712c6d60eb
> > Author: San Mehat <s...@google.com>
> > Date: Wed Feb 3 12:59:29 2010 -0800
> >
> > drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support
> >
> > Signed-off-by: Dmitry Shmidt <dimi...@google.com>
>
> I actually dropped a patch between the two above, otherwise the history
> is very similar. I think you have the right one, are you still getting
> the compile errors?

Different one this time :-(

make[1]: *** No rule to make target

`arch/arm/mach-msm/board-halibut-keypad.o', needed by
`arch/arm/mach-msm/built-in.o'. Stop.

Ok, I worked around it by config change, and had to disable msm
framebuffer, too. Then it compiles... more testing tommorow.

Pavel

--- ../linux-dwalker-delme/.config 2010-02-26 21:49:02.000000000 +0100
+++ .config 2010-03-01 22:39:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.33-rc8
-# Fri Feb 26 21:49:02 2010
+# Mon Mar 1 22:39:26 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -224,7 +224,7 @@


# CONFIG_MSM_DEBUG_UART1 is not set
# CONFIG_MSM_DEBUG_UART2 is not set
CONFIG_MSM_DEBUG_UART3=y

-CONFIG_MACH_HALIBUT=y
+# CONFIG_MACH_HALIBUT is not set
CONFIG_MACH_TROUT=y
CONFIG_MSM_SMD=y

@@ -821,9 +821,9 @@
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
# CONFIG_FB_SYS_FILLRECT is not set
# CONFIG_FB_SYS_COPYAREA is not set
@@ -843,7 +843,7 @@
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
-CONFIG_FB_MSM=y
+# CONFIG_FB_MSM is not set
# CONFIG_FB_BROADSHEET is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

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

Pavel Machek

unread,
Mar 3, 2010, 1:50:01 AM3/3/10
to
Hi!

> > git checkout refs/remotes/origin/working-mmc
> >
> > only to get (git log): [I think I was there before].
> >
> > commit 2b0bcf161e83fc7d45476f3330f06b656a1f03d4
> > Author: Daniel Walker <dwa...@codeaurora.org>
> > Date: Mon Feb 22 12:29:17 2010 -0800
> >
> > DMA fixes (get MMC working).
> >
> > commit 5fc33446739aa7a0826d98a00cc50a712c6d60eb
> > Author: San Mehat <s...@google.com>
> > Date: Wed Feb 3 12:59:29 2010 -0800
> >
> > drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support
> >
> > Signed-off-by: Dmitry Shmidt <dimi...@google.com>
>
> I actually dropped a patch between the two above, otherwise the history
> is very similar. I think you have the right one, are you still getting
> the compile errors?

No, now it compiles and detects MMC, which is very very good. Now
framebuffer needs to be sorted and we'll have usable machine :-).

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

0 new messages