date:20061026

[Xenomai-core] 2.6.18 ppc ipipe patch patch

2006-10-26 Thread Paul


Currently have a G3 Mac on loan and thought it worth trying out a 2.6.18.1 
kernel - The prepare-kernel.sh patched without any errors, a few offset lines, 
but that is to be expected.. Once configured however, compilation failed with 
some fatal errors over ipipe.h and line 223 - It would appear that the 
adeos-ipipe patch is adding a malformed line from the preamble of the 
following chunk. The ppc-ipipe_fix patch corrects this issue, and the second 
attempts to clean up the rest of the patch.


Regards, Paul.
Index: ksrc/arch/powerpc/patches/adeos-ipipe-2.6.18-ppc-1.4-01.patch
===
--- ksrc/arch/powerpc/patches/adeos-ipipe-2.6.18-ppc-1.4-01.patch	(revision 1732)
+++ ksrc/arch/powerpc/patches/adeos-ipipe-2.6.18-ppc-1.4-01.patch	(working copy)
@@ -1,4 +1,4 @@
-+ diff -u linux-2.6.18/arch/powerpc/kernel/idle.c.ORIG linux-2.6.18/arch/powerpc/kernel/idle.c
+diff -u linux-2.6.18/arch/powerpc/kernel/idle.c.ORIG linux-2.6.18/arch/powerpc/kernel/idle.c
 --- linux-2.6.18/arch/powerpc/kernel/idle.c.ORIG	2006-09-20 05:42:06.0 +0200
 +++ linux-2.6.18/arch/powerpc/kernel/idle.c	2006-09-30 10:14:30.845052232 +0200
 @@ -51,6 +51,7 @@
@@ -31,7 +31,7 @@
  set_thread_flag(TIF_POLLING_NRFLAG);
  
  			} else {
-+ diff -u linux-2.6.18/arch/powerpc/kernel/irq.c.ORIG linux-2.6.18/arch/powerpc/kernel/irq.c
+diff -u linux-2.6.18/arch/powerpc/kernel/irq.c.ORIG linux-2.6.18/arch/powerpc/kernel/irq.c
 --- linux-2.6.18/arch/powerpc/kernel/irq.c.ORIG	2006-09-20 05:42:06.0 +0200
 +++ linux-2.6.18/arch/powerpc/kernel/irq.c	2006-09-24 20:35:04.0 +0200
 @@ -68,7 +68,11 @@
@@ -46,7 +46,7 @@
  
  #ifdef CONFIG_PPC32
  EXPORT_SYMBOL(__irq_offset_value);
-+ diff -u linux-2.6.18/arch/ppc/Kconfig.ORIG linux-2.6.18/arch/ppc/Kconfig
+diff -u linux-2.6.18/arch/ppc/Kconfig.ORIG linux-2.6.18/arch/ppc/Kconfig
 --- linux-2.6.18/arch/ppc/Kconfig.ORIG	2006-09-20 05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/Kconfig	2006-09-24 14:02:26.0 +0200
 @@ -950,6 +950,8 @@
@@ -58,7 +58,7 @@
  config HIGHMEM
  	bool High memory support
  
-+ diff -u linux-2.6.18/arch/ppc/kernel/entry.S.ORIG linux-2.6.18/arch/ppc/kernel/entry.S
+diff -u linux-2.6.18/arch/ppc/kernel/entry.S.ORIG linux-2.6.18/arch/ppc/kernel/entry.S
 --- linux-2.6.18/arch/ppc/kernel/entry.S.ORIG	2006-09-20 05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/kernel/entry.S	2006-09-30 10:11:25.664204000 +0200
 @@ -132,8 +132,23 @@
@@ -204,7 +204,7 @@
 +bne+ ret_from_except
 +b restore
 +#endif /* CONFIG_IPIPE */
-+ diff -u linux-2.6.18/arch/ppc/kernel/head_44x.S.ORIG linux-2.6.18/arch/ppc/kernel/head_44x.S
+diff -u linux-2.6.18/arch/ppc/kernel/head_44x.S.ORIG linux-2.6.18/arch/ppc/kernel/head_44x.S
 --- linux-2.6.18/arch/ppc/kernel/head_44x.S.ORIG	2006-09-20 05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/kernel/head_44x.S	2006-09-24 14:02:26.0 +0200
 @@ -427,7 +427,11 @@
@@ -220,7 +220,7 @@
  
  	/* Alignment Interrupt */
  	ALIGNMENT_EXCEPTION
-+ diff -u linux-2.6.18/arch/ppc/kernel/head_4xx.S.ORIG linux-2.6.18/arch/ppc/kernel/head_4xx.S
+diff -u linux-2.6.18/arch/ppc/kernel/head_4xx.S.ORIG linux-2.6.18/arch/ppc/kernel/head_4xx.S
 --- linux-2.6.18/arch/ppc/kernel/head_4xx.S.ORIG	2006-09-20 05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/kernel/head_4xx.S	2006-09-24 14:02:26.0 +0200
 @@ -228,6 +228,12 @@
@@ -260,7 +260,7 @@
  
  #if 0
  /* NOTE:
-+ diff -u linux-2.6.18/arch/ppc/kernel/head_8xx.S.ORIG linux-2.6.18/arch/ppc/kernel/head_8xx.S
+diff -u linux-2.6.18/arch/ppc/kernel/head_8xx.S.ORIG linux-2.6.18/arch/ppc/kernel/head_8xx.S
 --- linux-2.6.18/arch/ppc/kernel/head_8xx.S.ORIG	2006-09-20 05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/kernel/head_8xx.S	2006-09-24 14:02:26.0 +0200
 @@ -186,6 +186,11 @@
@@ -299,7 +299,7 @@
  
  	EXCEPTION(0xa00, Trap_0a, unknown_exception, EXC_XFER_EE)
  	EXCEPTION(0xb00, Trap_0b, unknown_exception, EXC_XFER_EE)
-+ diff -u linux-2.6.18/arch/ppc/kernel/head_booke.h.ORIG linux-2.6.18/arch/ppc/kernel/head_booke.h
+diff -u linux-2.6.18/arch/ppc/kernel/head_booke.h.ORIG linux-2.6.18/arch/ppc/kernel/head_booke.h
 --- linux-2.6.18/arch/ppc/kernel/head_booke.h.ORIG	2006-09-20 05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/kernel/head_booke.h	2006-09-24 14:02:26.0 +0200
 @@ -187,6 +187,12 @@
@@ -339,7 +339,7 @@
  
  #define FP_UNAVAILABLE_EXCEPTION	  \
  	START_EXCEPTION(FloatingPointUnavailable)			  \
-+ diff -u linux-2.6.18/arch/ppc/kernel/head_fsl_booke.S.ORIG linux-2.6.18/arch/ppc/kernel/head_fsl_booke.S
+diff -u linux-2.6.18/arch/ppc/kernel/head_fsl_booke.S.ORIG linux-2.6.18/arch/ppc/kernel/head_fsl_booke.S
 --- linux-2.6.18/arch/ppc/kernel/head_fsl_booke.S.ORIG	2006-09-20 05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/kernel/head_fsl_booke.S	2006-09-24 14:02:26.0 +0200
 @@ -526,7 +526,11 @@
@@ -354,7 +354,7 @@
  
  	/* Alignment Interrupt */
  	ALIGNMENT_EXCEPTION
-+ diff -u

Re: [Xenomai-core] 2.6.18 ppc ipipe patch patch

2006-10-26 Thread Wolfgang Grandegger


Paul wrote:
Currently have a G3 Mac on loan and thought it worth trying out a 2.6.18.1 
kernel - The prepare-kernel.sh patched without any errors, a few offset lines, 
but that is to be expected.. Once configured however, compilation failed with 
some fatal errors over ipipe.h and line 223 - It would appear that the 
adeos-ipipe patch is adding a malformed line from the preamble of the 
following chunk. The ppc-ipipe_fix patch corrects this issue, and the second 
attempts to clean up the rest of the patch.


Thanks for the fix. Did it work then? Note that this patch only supports 
systems in the arch/ppc tree (and not in the arch/powerpc tree).


Wolfgang,



Regards, Paul.




Index: ksrc/arch/powerpc/patches/adeos-ipipe-2.6.18-ppc-1.4-01.patch
===
--- ksrc/arch/powerpc/patches/adeos-ipipe-2.6.18-ppc-1.4-01.patch   
(revision 1732)
+++ ksrc/arch/powerpc/patches/adeos-ipipe-2.6.18-ppc-1.4-01.patch   
(working copy)
@@ -1,4 +1,4 @@
-+ diff -u linux-2.6.18/arch/powerpc/kernel/idle.c.ORIG 
linux-2.6.18/arch/powerpc/kernel/idle.c
+diff -u linux-2.6.18/arch/powerpc/kernel/idle.c.ORIG 
linux-2.6.18/arch/powerpc/kernel/idle.c
 --- linux-2.6.18/arch/powerpc/kernel/idle.c.ORIG   2006-09-20 
05:42:06.0 +0200
 +++ linux-2.6.18/arch/powerpc/kernel/idle.c2006-09-30 10:14:30.845052232 
+0200
 @@ -51,6 +51,7 @@
@@ -31,7 +31,7 @@
set_thread_flag(TIF_POLLING_NRFLAG);
  
  			} else {

-+ diff -u linux-2.6.18/arch/powerpc/kernel/irq.c.ORIG 
linux-2.6.18/arch/powerpc/kernel/irq.c
+diff -u linux-2.6.18/arch/powerpc/kernel/irq.c.ORIG 
linux-2.6.18/arch/powerpc/kernel/irq.c
 --- linux-2.6.18/arch/powerpc/kernel/irq.c.ORIG2006-09-20 
05:42:06.0 +0200
 +++ linux-2.6.18/arch/powerpc/kernel/irq.c 2006-09-24 20:35:04.0 
+0200
 @@ -68,7 +68,11 @@
@@ -46,7 +46,7 @@
  
  #ifdef CONFIG_PPC32

  EXPORT_SYMBOL(__irq_offset_value);
-+ diff -u linux-2.6.18/arch/ppc/Kconfig.ORIG linux-2.6.18/arch/ppc/Kconfig
+diff -u linux-2.6.18/arch/ppc/Kconfig.ORIG linux-2.6.18/arch/ppc/Kconfig
 --- linux-2.6.18/arch/ppc/Kconfig.ORIG 2006-09-20 05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/Kconfig  2006-09-24 14:02:26.0 +0200
 @@ -950,6 +950,8 @@
@@ -58,7 +58,7 @@
  config HIGHMEM
bool High memory support
  
-+ diff -u linux-2.6.18/arch/ppc/kernel/entry.S.ORIG linux-2.6.18/arch/ppc/kernel/entry.S

+diff -u linux-2.6.18/arch/ppc/kernel/entry.S.ORIG 
linux-2.6.18/arch/ppc/kernel/entry.S
 --- linux-2.6.18/arch/ppc/kernel/entry.S.ORIG  2006-09-20 05:42:06.0 
+0200
 +++ linux-2.6.18/arch/ppc/kernel/entry.S   2006-09-30 10:11:25.664204000 
+0200
 @@ -132,8 +132,23 @@
@@ -204,7 +204,7 @@
 +bne+ ret_from_except
 +b restore
 +#endif /* CONFIG_IPIPE */
-+ diff -u linux-2.6.18/arch/ppc/kernel/head_44x.S.ORIG 
linux-2.6.18/arch/ppc/kernel/head_44x.S
+diff -u linux-2.6.18/arch/ppc/kernel/head_44x.S.ORIG 
linux-2.6.18/arch/ppc/kernel/head_44x.S
 --- linux-2.6.18/arch/ppc/kernel/head_44x.S.ORIG   2006-09-20 
05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/kernel/head_44x.S2006-09-24 14:02:26.0 
+0200
 @@ -427,7 +427,11 @@
@@ -220,7 +220,7 @@
  
  	/* Alignment Interrupt */

ALIGNMENT_EXCEPTION
-+ diff -u linux-2.6.18/arch/ppc/kernel/head_4xx.S.ORIG 
linux-2.6.18/arch/ppc/kernel/head_4xx.S
+diff -u linux-2.6.18/arch/ppc/kernel/head_4xx.S.ORIG 
linux-2.6.18/arch/ppc/kernel/head_4xx.S
 --- linux-2.6.18/arch/ppc/kernel/head_4xx.S.ORIG   2006-09-20 
05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/kernel/head_4xx.S2006-09-24 14:02:26.0 
+0200
 @@ -228,6 +228,12 @@
@@ -260,7 +260,7 @@
  
  #if 0

  /* NOTE:
-+ diff -u linux-2.6.18/arch/ppc/kernel/head_8xx.S.ORIG 
linux-2.6.18/arch/ppc/kernel/head_8xx.S
+diff -u linux-2.6.18/arch/ppc/kernel/head_8xx.S.ORIG 
linux-2.6.18/arch/ppc/kernel/head_8xx.S
 --- linux-2.6.18/arch/ppc/kernel/head_8xx.S.ORIG   2006-09-20 
05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/kernel/head_8xx.S2006-09-24 14:02:26.0 
+0200
 @@ -186,6 +186,11 @@
@@ -299,7 +299,7 @@
  
  	EXCEPTION(0xa00, Trap_0a, unknown_exception, EXC_XFER_EE)

EXCEPTION(0xb00, Trap_0b, unknown_exception, EXC_XFER_EE)
-+ diff -u linux-2.6.18/arch/ppc/kernel/head_booke.h.ORIG 
linux-2.6.18/arch/ppc/kernel/head_booke.h
+diff -u linux-2.6.18/arch/ppc/kernel/head_booke.h.ORIG 
linux-2.6.18/arch/ppc/kernel/head_booke.h
 --- linux-2.6.18/arch/ppc/kernel/head_booke.h.ORIG 2006-09-20 
05:42:06.0 +0200
 +++ linux-2.6.18/arch/ppc/kernel/head_booke.h  2006-09-24 14:02:26.0 
+0200
 @@ -187,6 +187,12 @@
@@ -339,7 +339,7 @@
  
  #define FP_UNAVAILABLE_EXCEPTION	  \

START_EXCEPTION(FloatingPointUnavailable) \
-+ diff -u linux-2.6.18/arch/ppc/kernel/head_fsl_booke.S.ORIG

[Xenomai-core] [PATCH] prepare-kernel.sh breaks linux-2.4 drivers/Makefile

2006-10-26 Thread Andrew Dennison


Running prepare-kernel on the denx 2.4 kernel adds the following line

mod-subdirs := xenomai

This prevents all other mod-subdirs under drivers from building.

Patch is against r1273 but still seems to apply (and be required) on head.

Andrew
diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index fbc91ce..ca87e7f 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -455,7 +455,7 @@ EOF
 	patch_ed drivers/Makefile EOF
 /include \$(TOPDIR)\/Rules.make
 i
-mod-subdirs := xenomai
+mod-subdirs += xenomai
 subdir-\$(CONFIG_XENOMAI) += xenomai
 
 .
___
Xenomai-core mailing list
Xenomai-core@gna.org
https://mail.gna.org/listinfo/xenomai-core

[Xenomai-core] 2.6.18 ppc ipipe patch patch

Re: [Xenomai-core] 2.6.18 ppc ipipe patch patch

[Xenomai-core] [PATCH] prepare-kernel.sh breaks linux-2.4 drivers/Makefile

3 matches

Site Navigation

Mail list logo

Footer information