2008-06-06 11:37:59

by Hinko Kocevar

[permalink] [raw]
Subject: [PATCH 2.6.26-rc5 0/2] cris: compile fixes for 2.6.26-rc5

Hi,

Current status of cris architecture is that current GIT tree at 2.6.26-rc5 does
not even compile.

To remedy this I've created two patches that are sent as a reply to this post:
1. add dummy ops for serial debug port
2. make compile succeed when building with O= (srctree != objtree)

Best regards,
Hinko

--
ČETRTA POT, d.o.o., Kranj
Planina 3
4000 Kranj
Slovenia, Europe
Tel. +386 (0) 4 280 66 03
E-mail: [email protected]
Http: http://www.cetrtapot.si




2008-06-06 11:39:20

by Hinko Kocevar

[permalink] [raw]
Subject: Re: [PATCH 2.6.26-rc5 1/2] cris: compile fixes for 2.6.26-rc5

Add dummy ops for serial debug port.

Signed-off-by: Hinko Kocevar <[email protected]>

---


Attachments:
001-cris-debugport-add-dummy-ops.patch (969.00 B)

2008-06-06 11:40:13

by Hinko Kocevar

[permalink] [raw]
Subject: Re: [PATCH 2.6.26-rc5 2/2] cris: compile fixes for 2.6.26-rc5

Make compile succeed when building with O= (srctree != objtree).

Signed-off-by: Hinko Kocevar <[email protected]>

---


Attachments:
002-cris-compile-with-src-ne-obj-dir.patch (1.03 kB)

2008-06-06 11:57:42

by Alan

[permalink] [raw]
Subject: Re: [PATCH 2.6.26-rc5 1/2] cris: compile fixes for 2.6.26-rc5

> +static struct tty_operations dummy_ops = {
> + .open = &dummy_open,
> + .close = &dummy_close,
> + .write = &dummy_write,
> + .write_room = &dummy_write_room,
> +};

Looks ok. From 2.6.26 onward you should be able to omit write/write_room
if you want writes to error, but you will need the dummies if you want
them to vanish.

> @@ -448,10 +455,7 @@ init_dummy_console(void)
> B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */

It should also be setting c_ispeed/c_ospeed

> dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;

Alan

2008-06-06 12:14:00

by Hinko Kocevar

[permalink] [raw]
Subject: Re: [PATCH 2.6.26-rc5 1/2] cris: compile fixes for 2.6.26-rc5

Stab 2

Add dummy ops for serial debug port.
Add setting of c_ispeed/c_ospeed as suggested by Alan Cox.

Signed-off-by: Hinko Kocevar <[email protected]>

---



Attachments:
001-cris-debugport-add-dummy-ops.patch (1.08 kB)

2008-06-06 15:21:34

by Alan

[permalink] [raw]
Subject: Re: [PATCH 2.6.26-rc5 1/2] cris: compile fixes for 2.6.26-rc5

On Fri, 06 Jun 2008 14:12:26 +0200
Hinko Koc(evar <[email protected]> wrote:

> Stab 2
>
> Add dummy ops for serial debug port.
> Add setting of c_ispeed/c_ospeed as suggested by Alan Cox.
>
> Signed-off-by: Hinko Kocevar <[email protected]>

Acked-by: Alan Cox <[email protected]>

2008-06-06 18:33:18

by Adrian Bunk

[permalink] [raw]
Subject: Re: [PATCH 2.6.26-rc5 0/2] cris: compile fixes for 2.6.26-rc5

On Fri, Jun 06, 2008 at 01:36:26PM +0200, Hinko Kočevar wrote:
> Hi,
>
> Current status of cris architecture is that current GIT tree at 2.6.26-rc5 does
> not even compile.
>...

@Mikael, Jesper:

BTW:
What happened with the stuff you have?
It seems you missed to merge for 2.6.26?

Can you try to not miss the merge window for 2.6.27, and also publish
your queued patches in a way that they might get into the -next tree
(Stephen Cc'ed for possibly discussing details)?

> Best regards,
> Hinko

TIA
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2008-06-10 09:51:20

by Jesper Nilsson

[permalink] [raw]
Subject: Re: [PATCH 2.6.26-rc5 0/2] cris: compile fixes for 2.6.26-rc5

On Fri, Jun 06, 2008 at 08:32:22PM +0200, Adrian Bunk wrote:
> On Fri, Jun 06, 2008 at 01:36:26PM +0200, Hinko Ko??evar wrote:
> > Hi,
> >
> > Current status of cris architecture is that current GIT tree at 2.6.26-rc5 does
> > not even compile.
> >...
>
> @Mikael, Jesper:
>
> BTW:
> What happened with the stuff you have?
> It seems you missed to merge for 2.6.26?

Yeah, unfortunately I got swamped just as the 2.6.26 merge window opened up.
I'll push them out for 2.6.27.

> Can you try to not miss the merge window for 2.6.27, and also publish
> your queued patches in a way that they might get into the -next tree
> (Stephen Cc'ed for possibly discussing details)?

Have I understood correctly that a tree exported for -next can be rebased
without causing any problems? I've hesitated a bit to create a -next tree
to avoid problems with later merges.

> > Best regards,
> > Hinko
>
> TIA
> Adrian

/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]

2008-06-10 10:15:26

by Stephen Rothwell

[permalink] [raw]
Subject: Re: [PATCH 2.6.26-rc5 0/2] cris: compile fixes for 2.6.26-rc5

Hi Jasper,

On Tue, 10 Jun 2008 11:49:37 +0200 Jesper Nilsson <[email protected]> wrote:
>
> Have I understood correctly that a tree exported for -next can be rebased
> without causing any problems? I've hesitated a bit to create a -next tree
> to avoid problems with later merges.

Yes, rebases are OK (but not encouraged :-)). The rules are that stuff in
the tree for -next must have been posted somewhere appropriate, reviewed,
and unit tested as much as possible and be reasonably expected to be in
the next merge window.

I also merge trees containing fixes for Linus' current tree.

Also, I accept git trees or quilt series.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/


Attachments:
(No filename) (741.00 B)
(No filename) (197.00 B)
Download all attachments

2008-07-01 14:12:09

by Hinko Kocevar

[permalink] [raw]
Subject: Re: [PATCH linux-next 1/1] cris: look for linker scripts in srctree not in objtree

When building kernel with O= linker looks for linker scripts in output tree, while they are located in source tree.

Signed-off-by: Hinko Kocevar <[email protected]>

---



Attachments:
cris-look-for-linker-scripts-in-srctree.patch (1.00 kB)

2008-07-01 16:02:54

by Jesper Nilsson

[permalink] [raw]
Subject: Re: [PATCH linux-next 1/1] cris: look for linker scripts in srctree not in objtree

Hi!

On Tue, Jul 01, 2008 at 04:08:44PM +0200, Hinko Kocevar wrote:
> When building kernel with O= linker looks for linker scripts in output tree, while they are located in source tree.
>
> Signed-off-by: Hinko Kocevar <[email protected]>

I think this would be cleaner:

diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
--- a/arch/cris/arch-v10/boot/compressed/Makefile
+++ b/arch/cris/arch-v10/boot/compressed/Makefile
@@ -4,7 +4,7 @@

asflags-y += $(LINUXINCLUDE)
ccflags-y += -O2 $(LINUXINCLUDE)
-ldflags-y += -T $(obj)/decompress.ld
+ldflags-y += -T $(srctree)/$(src)/decompress.ld
OBJECTS = $(obj)/head.o $(obj)/misc.o
OBJCOPYFLAGS = -O binary --remove-section=.bss

diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile
--- a/arch/cris/arch-v10/boot/rescue/Makefile
+++ b/arch/cris/arch-v10/boot/rescue/Makefile
@@ -4,7 +4,7 @@

ccflags-y += -O2 $(LINUXINCLUDE)
asflags-y += $(LINUXINCLUDE)
-ldflags-y += -T $(obj)/rescue.ld
+ldflags-y += -T $(srctree)/$(src)/rescue.ld
OBJCOPYFLAGS = -O binary --remove-section=.bss
obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
OBJECT := $(obj)/head.o


> ---
> diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
> index 9ec5f87..cc6527d 100644
> --- a/arch/cris/arch-v10/boot/compressed/Makefile
> +++ b/arch/cris/arch-v10/boot/compressed/Makefile
> @@ -4,7 +4,7 @@
>
> asflags-y += $(LINUXINCLUDE)
> ccflags-y += -O2 $(LINUXINCLUDE)
> -ldflags-y += -T $(obj)/decompress.ld
> +ldflags-y += -T $(srctree)/arch/$(ARCH)/boot/compressed/decompress.ld

> OBJECTS = $(obj)/head.o $(obj)/misc.o
> OBJCOPYFLAGS = -O binary --remove-section=.bss
>
> diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile
> index bea8b9c..476007d 100644
> --- a/arch/cris/arch-v10/boot/rescue/Makefile
> +++ b/arch/cris/arch-v10/boot/rescue/Makefile
> @@ -4,7 +4,7 @@
>
> ccflags-y += -O2 $(LINUXINCLUDE)
> asflags-y += $(LINUXINCLUDE)
> -ldflags-y += -T $(obj)/rescue.ld
> +ldflags-y += -T $(srctree)/arch/$(ARCH)/boot/rescue/rescue.ld
> OBJCOPYFLAGS = -O binary --remove-section=.bss
> obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
> OBJECT := $(obj)/head.o

Thanks!

/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]

2008-07-01 19:28:45

by Sam Ravnborg

[permalink] [raw]
Subject: Re: [PATCH linux-next 1/1] cris: look for linker scripts in srctree not in objtree

On Tue, Jul 01, 2008 at 06:02:41PM +0200, Jesper Nilsson wrote:
> Hi!
>
> On Tue, Jul 01, 2008 at 04:08:44PM +0200, Hinko Kocevar wrote:
> > When building kernel with O= linker looks for linker scripts in output tree, while they are located in source tree.
> >
> > Signed-off-by: Hinko Kocevar <[email protected]>
>
> I think this would be cleaner:
>
> diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
> --- a/arch/cris/arch-v10/boot/compressed/Makefile
> +++ b/arch/cris/arch-v10/boot/compressed/Makefile
> @@ -4,7 +4,7 @@
>
> asflags-y += $(LINUXINCLUDE)
> ccflags-y += -O2 $(LINUXINCLUDE)
> -ldflags-y += -T $(obj)/decompress.ld
> +ldflags-y += -T $(srctree)/$(src)/decompress.ld
> OBJECTS = $(obj)/head.o $(obj)/misc.o
> OBJCOPYFLAGS = -O binary --remove-section=.bss
>

linker scripts are by definition named *.lds in the kernel.
And if you need to preprocess them then name them *.lds.S as
we do in arch/$ARCH/kernel/*

As this is not a generated linker script then the $(srctree)/$(src) prefix
is correct and the $(obj) prefix was plain wrong.

So:
Acked-by: Sam Ravnborg <[email protected]>

Sam

2008-07-02 07:16:47

by Hinko Kocevar

[permalink] [raw]
Subject: Re: [PATCH linux-next 1/1] cris: look for linker scripts in srctree not in objtree

Jesper Nilsson wrote:
> Hi!
>
> On Tue, Jul 01, 2008 at 04:08:44PM +0200, Hinko Kocevar wrote:
>> When building kernel with O= linker looks for linker scripts in output tree, while they are located in source tree.
>>
>> Signed-off-by: Hinko Kocevar <[email protected]>
>
> I think this would be cleaner:
>
> diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
> --- a/arch/cris/arch-v10/boot/compressed/Makefile
> +++ b/arch/cris/arch-v10/boot/compressed/Makefile
> @@ -4,7 +4,7 @@
>
> asflags-y += $(LINUXINCLUDE)
> ccflags-y += -O2 $(LINUXINCLUDE)
> -ldflags-y += -T $(obj)/decompress.ld
> +ldflags-y += -T $(srctree)/$(src)/decompress.ld
> OBJECTS = $(obj)/head.o $(obj)/misc.o
> OBJCOPYFLAGS = -O binary --remove-section=.bss
>
> diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile
> --- a/arch/cris/arch-v10/boot/rescue/Makefile
> +++ b/arch/cris/arch-v10/boot/rescue/Makefile
> @@ -4,7 +4,7 @@
>
> ccflags-y += -O2 $(LINUXINCLUDE)
> asflags-y += $(LINUXINCLUDE)
> -ldflags-y += -T $(obj)/rescue.ld
> +ldflags-y += -T $(srctree)/$(src)/rescue.ld
> OBJCOPYFLAGS = -O binary --remove-section=.bss
> obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
> OBJECT := $(obj)/head.o
>
>

It certainly is.

--
ČETRTA POT, d.o.o., Kranj
Planina 3
4000 Kranj
Slovenia, Europe
Tel. +386 (0) 4 280 66 03
E-mail: [email protected]
Http: http://www.cetrtapot.si