[Xenomai-core] [PATCH] adeos-ipipe-2.6.30-arm-1.15-01.patch: Fix hang on 'Calibrating delay loop...' on S3C24xx

[Fabian Godehardt]

This patch should fix the hang during 'Calibrating delay loop...' on S3C24xx
based kernels. Problem is that some machines do not have an externel TCLK
signal so the timer doesn't start running.

This patch may also be of interest for the 2.6.28 and 2.6.29 patches.

Tested with a S3C2440 cpu.

Signed-off-by: Fabian Godehardt f...@emlix.com
---
 .../patches/adeos-ipipe-2.6.30-arm-1.15-01.patch   |   17 +++--
 1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/ksrc/arch/arm/patches/adeos-ipipe-2.6.30-arm-1.15-01.patch 
b/ksrc/arch/arm/patches/adeos-ipipe-2.6.30-arm-1.15-01.patch
index 5760e2e..2358cfb 100644
--- a/ksrc/arch/arm/patches/adeos-ipipe-2.6.30-arm-1.15-01.patch
+++ b/ksrc/arch/arm/patches/adeos-ipipe-2.6.30-arm-1.15-01.patch
@@ -6925,18 +6925,7 @@ index 3b27b29..8e6e479 100644
__raw_writel(tcfg1, S3C2410_TCFG1);
} else {
unsigned long pclk;
-@@ -204,12 +254,25 @@ static void s3c2410_timer_setup (void)
-   clk_set_parent(tin, tdiv);
- 
-   tcnt = clk_get_rate(tin) / HZ;
-+
-+  tcfg1 = __raw_readl(S3C2410_TCFG1);
-+  tcfg1 = ~(S3C2410_TCFG1_MUX4_MASK | S3C2410_TCFG1_MUX3_MASK);
-+  tcfg1 |= (S3C2410_TCFG1_MUX4_TCLK1 | S3C2410_TCFG1_MUX3_TCLK1);
-+  __raw_writel(tcfg1, S3C2410_TCFG1);
-   }
- 
-   tcon = __raw_readl(S3C2410_TCON);
+@@ -210,6 +260,14 @@ static void s3c2410_timer_setup (void)
tcfg0 = __raw_readl(S3C2410_TCFG0);
tcfg1 = __raw_readl(S3C2410_TCFG1);
  
@@ -6951,7 +6940,7 @@ index 3b27b29..8e6e479 100644
/* timers reload after counting zero, so reduce the count by 1 */
  
tcnt--;
-@@ -226,23 +289,37 @@ static void s3c2410_timer_setup (void)
+@@ -226,23 +284,37 @@ static void s3c2410_timer_setup (void)
__raw_writel(tcfg1, S3C2410_TCFG1);
__raw_writel(tcfg0, S3C2410_TCFG0);
  
@@ -7000,7 +6989,7 @@ index 3b27b29..8e6e479 100644
  }
  
  static void __init s3c2410_timer_resources(void)
-@@ -283,3 +360,58 @@ struct sys_timer s3c24xx_timer = {
+@@ -283,3 +355,58 @@ struct sys_timer s3c24xx_timer = {
.offset = s3c2410_gettimeoffset,
.resume = s3c2410_timer_setup
  };
-- 
1.6.6.1


___
Xenomai-core mailing list
Xenomai-core@gna.org
https://mail.gna.org/listinfo/xenomai-core

[Xenomai-core] [PATCH] adeos-ipipe-2.6.30-arm-1.15-01: Fix hang on 'Calibrating delay loop...' on S3C24xx

[Fabian Godehardt]

This patch should fix the hang during 'Calibrating delay loop...' on S3C24xx
based kernels. Problem is that some machines do not have an externel TCLK
signal so the timer doesn't start to run.

Tested with a S3C2440 cpu.

Signed-off-by: Fabian Godehardt f...@emlix.com
---
 arch/arm/plat-s3c/time.c |5 -
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/arm/plat-s3c/time.c b/arch/arm/plat-s3c/time.c
index 8e6e479..976fe03 100644
--- a/arch/arm/plat-s3c/time.c
+++ b/arch/arm/plat-s3c/time.c
@@ -254,11 +254,6 @@ static void s3c2410_timer_setup (void)
clk_set_parent(tin, tdiv);
 
tcnt = clk_get_rate(tin) / HZ;
-
-   tcfg1 = __raw_readl(S3C2410_TCFG1);
-   tcfg1 = ~(S3C2410_TCFG1_MUX4_MASK | S3C2410_TCFG1_MUX3_MASK);
-   tcfg1 |= (S3C2410_TCFG1_MUX4_TCLK1 | S3C2410_TCFG1_MUX3_TCLK1);
-   __raw_writel(tcfg1, S3C2410_TCFG1);
}
 
tcon = __raw_readl(S3C2410_TCON);
-- 
1.6.6.1


___
Xenomai-core mailing list
Xenomai-core@gna.org
https://mail.gna.org/listinfo/xenomai-core

[Xenomai-core] [PATCH] scripts: use new 'head -n' syntax.

[Fabian Godehardt]

Executing configure on a chroot which uses a modern equivalent of
_POSIX_VERSION breaks on scripts/prepare-kernel.sh:

  patching file mm/vmalloc.c
  head: `-1' option is obsolete; use `-n 1'
  Try `head --help' for more information.

This patch converts prepare-kernel.sh to the new 'head -n' syntax.

Signed-off-by: Fabian Godehardt f...@emlix.com
---
 scripts/prepare-kernel.sh |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index d499563..b052ec3 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -408,10 +408,10 @@ if test -r 
$linux_tree/arch/$linux_arch/include/asm/ipipe.h; then
asm_ipipe_h=$linux_tree/$linux_include_asm/ipipe.h
 else
linux_include_asm=include/asm-$linux_arch
-   asm_ipipe_h=`ls $linux_tree/include/asm-{$linux_arch,$xenomai_arch}/ipipe.h 
2/dev/null|head -1`
+   asm_ipipe_h=`ls $linux_tree/include/asm-{$linux_arch,$xenomai_arch}/ipipe.h 
2/dev/null|head -n1`
 fi
 
-adeos_version=`grep '^#define.*IPIPE_ARCH_STRING.*' $asm_ipipe_h 
2/dev/null|head -1|sed -e 's,.*\(.*\)$,\1,'`
+adeos_version=`grep '^#define.*IPIPE_ARCH_STRING.*' $asm_ipipe_h 
2/dev/null|head -n1|sed -e 's,.*\(.*\)$,\1,'`
 
 if test \! x$adeos_version = x; then
if test x$verbose = x1; then
-- 
1.5.3.7


___
Xenomai-core mailing list
Xenomai-core@gna.org
https://mail.gna.org/listinfo/xenomai-core