Module: xenomai-forge
Branch: master
Commit: 3840bf00aafc11fb7d53b05601a26823e266f644
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=3840bf00aafc11fb7d53b05601a26823e266f644
Author: Philippe Gerum r...@xenomai.org
Date: Wed Dec 14 10:48:39 2011 +0100
powerpc: upgrade I-pipe support to 3.0.13-powerpc-2.13-06,
ipipe-3.1.5-powerpc-2.13-06
---
...ch = adeos-ipipe-3.0.13-powerpc-2.13-06.patch} | 135 +++-
...tch = adeos-ipipe-3.1.5-powerpc-2.13-06.patch} | 80 +++-
2 files changed, 126 insertions(+), 89 deletions(-)
diff --git
a/kernel/cobalt/arch/powerpc/patches/adeos-ipipe-3.0.8-powerpc-2.13-04.patch
b/kernel/cobalt/arch/powerpc/patches/adeos-ipipe-3.0.13-powerpc-2.13-06.patch
similarity index 99%
rename from
kernel/cobalt/arch/powerpc/patches/adeos-ipipe-3.0.8-powerpc-2.13-04.patch
rename to
kernel/cobalt/arch/powerpc/patches/adeos-ipipe-3.0.13-powerpc-2.13-06.patch
index d28173e..277581f 100644
--- a/kernel/cobalt/arch/powerpc/patches/adeos-ipipe-3.0.8-powerpc-2.13-04.patch
+++
b/kernel/cobalt/arch/powerpc/patches/adeos-ipipe-3.0.13-powerpc-2.13-06.patch
@@ -265,7 +265,7 @@ index bb712c9..8885e9b 100644
* or should we not care like we do now ? --BenH.
diff --git a/arch/powerpc/include/asm/ipipe.h
b/arch/powerpc/include/asm/ipipe.h
new file mode 100644
-index 000..97c12ea
+index 000..416688f
--- /dev/null
+++ b/arch/powerpc/include/asm/ipipe.h
@@ -0,0 +1,278 @@
@@ -317,10 +317,10 @@ index 000..97c12ea
+#include asm/paca.h
+#endif
+
-+#define IPIPE_ARCH_STRING 2.13-04
++#define IPIPE_ARCH_STRING 2.13-06
+#define IPIPE_MAJOR_NUMBER2
+#define IPIPE_MINOR_NUMBER13
-+#define IPIPE_PATCH_NUMBER4
++#define IPIPE_PATCH_NUMBER6
+
+#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+
@@ -3345,7 +3345,7 @@ index 9f82f49..dfa0441 100644
NM=$1
OBJ=$2
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
-index 620d792..e6dc326 100644
+index c7e7b8c..a5a47c8 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -52,6 +52,9 @@ int __initdata boot_cpu_count;
@@ -3359,7 +3359,7 @@ index 620d792..e6dc326 100644
unsigned long ISA_DMA_THRESHOLD;
unsigned int DMA_MODE_READ;
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
-index a88bf27..ac5a3c3 100644
+index 7867fd1..f4ff1eb 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -222,8 +222,10 @@ void __init early_setup(unsigned long dt_ptr)
@@ -3386,7 +3386,7 @@ index a88bf27..ac5a3c3 100644
DBG( - setup_system()\n);
/* Apply the CPUs-specific and firmware specific fixups to kernel
-@@ -456,6 +464,7 @@ static u64 safe_stack_limit(void)
+@@ -457,6 +465,7 @@ static u64 safe_stack_limit(void)
#endif
}
@@ -3394,7 +3394,7 @@ index a88bf27..ac5a3c3 100644
static void __init irqstack_early_init(void)
{
u64 limit = safe_stack_limit();
-@@ -474,6 +483,9 @@ static void __init irqstack_early_init(void)
+@@ -475,6 +484,9 @@ static void __init irqstack_early_init(void)
THREAD_SIZE, limit));
}
}
@@ -3404,7 +3404,7 @@ index a88bf27..ac5a3c3 100644
#ifdef CONFIG_PPC_BOOK3E
static void __init exc_lvl_early_init(void)
-@@ -661,6 +673,10 @@ void __init setup_per_cpu_areas(void)
+@@ -662,6 +674,10 @@ void __init setup_per_cpu_areas(void)
__per_cpu_offset[cpu] = delta + pcpu_unit_offsets[cpu];
paca[cpu].data_offset = __per_cpu_offset[cpu];
}
@@ -3797,10 +3797,10 @@ index 7c975d4..0c163f2 100644
{
unsigned long target;
diff --git a/arch/powerpc/lib/feature-fixups.c
b/arch/powerpc/lib/feature-fixups.c
-index 0d08d01..2c6e946 100644
+index 7a8a748..8f13a2f 100644
--- a/arch/powerpc/lib/feature-fixups.c
+++ b/arch/powerpc/lib/feature-fixups.c
-@@ -29,6 +29,7 @@ struct fixup_entry {
+@@ -31,6 +31,7 @@ struct fixup_entry {
longalt_end_off;
};
@@ -3808,7 +3808,7 @@ index 0d08d01..2c6e946 100644
static unsigned int *calc_addr(struct fixup_entry *fcur, long offset)
{
/*
-@@ -39,6 +40,7 @@ static unsigned int *calc_addr(struct fixup_entry *fcur,
long offset)
+@@ -41,6 +42,7 @@ static unsigned int *calc_addr(struct fixup_entry *fcur,
long offset)
return (unsigned int *)((unsigned long)fcur + offset);
}
@@ -3816,7 +3816,7 @@ index 0d08d01..2c6e946 100644
static int patch_alt_instruction(unsigned int *src, unsigned int *dest,
unsigned int *alt_start, unsigned int *alt_end)
{
-@@ -62,6 +64,7 @@ static int patch_alt_instruction(unsigned int *src, unsigned
int *dest,
+@@ -64,6 +66,7 @@ static int patch_alt_instruction(unsigned int *src, unsigned
int *dest,
return 0;
}
@@ -3824,7 +3824,7 @@ index 0d08d01..2c6e946 100644
static int patch_feature_section(unsigned long value, struct fixup_entry
*fcur)
{
unsigned int *start,
