Signed-off-by: Andrea Adami <[email protected]> --- .../linux/linux-yocto-dev/akita/akita.scc | 2 - recipes-kernel/linux/linux-yocto-dev/c7x0/c7x0.scc | 2 - .../patches/patches-pxa/sharpsl_param.patch | 61 ---------------------- .../linux/linux-yocto-dev/poodle/poodle.scc | 1 - .../linux/linux-yocto-dev/spitz/spitz.scc | 2 - recipes-kernel/linux/linux-yocto-dev/tosa/tosa.scc | 2 - 6 files changed, 70 deletions(-) delete mode 100644 recipes-kernel/linux/linux-yocto-dev/patches/patches-pxa/sharpsl_param.patch
diff --git a/recipes-kernel/linux/linux-yocto-dev/akita/akita.scc b/recipes-kernel/linux/linux-yocto-dev/akita/akita.scc index 11b9e94..a7f542a 100644 --- a/recipes-kernel/linux/linux-yocto-dev/akita/akita.scc +++ b/recipes-kernel/linux/linux-yocto-dev/akita/akita.scc @@ -4,5 +4,3 @@ kconf hardware akita.cfg include ../zaurus-pxa-only.scc include ../zaurus-common.scc include ../zaurus-usb-host.scc - -patch ../patches/patches-pxa/sharpsl_param.patch diff --git a/recipes-kernel/linux/linux-yocto-dev/c7x0/c7x0.scc b/recipes-kernel/linux/linux-yocto-dev/c7x0/c7x0.scc index ddd5c49..662a7b7 100644 --- a/recipes-kernel/linux/linux-yocto-dev/c7x0/c7x0.scc +++ b/recipes-kernel/linux/linux-yocto-dev/c7x0/c7x0.scc @@ -2,5 +2,3 @@ kconf hardware c7x0.cfg include ../zaurus-pxa-only.scc include ../zaurus-common.scc - -patch ../patches/patches-pxa/sharpsl_param.patch diff --git a/recipes-kernel/linux/linux-yocto-dev/patches/patches-pxa/sharpsl_param.patch b/recipes-kernel/linux/linux-yocto-dev/patches/patches-pxa/sharpsl_param.patch deleted file mode 100644 index 267fdbd..0000000 --- a/recipes-kernel/linux/linux-yocto-dev/patches/patches-pxa/sharpsl_param.patch +++ /dev/null @@ -1,61 +0,0 @@ -From f95dcc12f8bceed2c1c929c49e3f0397338de8a6 Mon Sep 17 00:00:00 2001 -From: Andrea Adami <[email protected]> -Date: Thu, 26 Sep 2013 23:28:44 +0200 -Subject: sharpsl_param.c: fix invalid memory access for pxa devices - -This fixes a regression for kernels after v3.2 - -After commit 72662e01088394577be4a3f14da94cf87bea2591 -ARM: head.S: only include __turn_mmu_on in the initial identity mapping - -Zaurus PXA devices call sharpsl_save_param() during fixup and hang on -boot because memcpy refers to physical addresses no longer valid if the -MMU is setup. -Zaurus collie (SA1100) is unaffected (function is called in init_machine). - -The code was making assumptions and for PXA the virtual address -should have been used before. - -KernelVersion: 3.12-rc2 - -Signed-off-by: Marko Katic <[email protected]> -Signed-off-by: Andrea Adami <[email protected]> ---- - arch/arm/common/sharpsl_param.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c -index d56c932..025f6ce 100644 ---- a/arch/arm/common/sharpsl_param.c -+++ b/arch/arm/common/sharpsl_param.c -@@ -15,6 +15,7 @@ - #include <linux/module.h> - #include <linux/string.h> - #include <asm/mach/sharpsl_param.h> -+#include <asm/memory.h> - - /* - * Certain hardware parameters determined at the time of device manufacture, -@@ -25,8 +26,10 @@ - */ - #ifdef CONFIG_ARCH_SA1100 - #define PARAM_BASE 0xe8ffc000 -+#define param_start(x) (void *)(x) - #else - #define PARAM_BASE 0xa0000a00 -+#define param_start(x) __va(x) - #endif - #define MAGIC_CHG(a,b,c,d) ( ( d << 24 ) | ( c << 16 ) | ( b << 8 ) | a ) - -@@ -41,7 +44,7 @@ EXPORT_SYMBOL(sharpsl_param); - - void sharpsl_save_param(void) - { -- memcpy(&sharpsl_param, (void *)PARAM_BASE, sizeof(struct sharpsl_param_info)); -+ memcpy(&sharpsl_param, param_start(PARAM_BASE), sizeof(struct sharpsl_param_info)); - - if (sharpsl_param.comadj_keyword != COMADJ_MAGIC) - sharpsl_param.comadj=-1; --- -1.8.1.5 - diff --git a/recipes-kernel/linux/linux-yocto-dev/poodle/poodle.scc b/recipes-kernel/linux/linux-yocto-dev/poodle/poodle.scc index 39015f2..e6bd6ac 100644 --- a/recipes-kernel/linux/linux-yocto-dev/poodle/poodle.scc +++ b/recipes-kernel/linux/linux-yocto-dev/poodle/poodle.scc @@ -4,4 +4,3 @@ include ../zaurus-pxa-only.scc include ../zaurus-common.scc patch ../patches/patches-locomokbd/locomo_kbd_tweak-r2.patch -patch ../patches/patches-pxa/sharpsl_param.patch diff --git a/recipes-kernel/linux/linux-yocto-dev/spitz/spitz.scc b/recipes-kernel/linux/linux-yocto-dev/spitz/spitz.scc index ba4c7b5..4508a3c 100644 --- a/recipes-kernel/linux/linux-yocto-dev/spitz/spitz.scc +++ b/recipes-kernel/linux/linux-yocto-dev/spitz/spitz.scc @@ -3,5 +3,3 @@ kconf hardware spitz.cfg include ../zaurus-pxa-only.scc include ../zaurus-common.scc include ../zaurus-usb-host.scc - -patch ../patches/patches-pxa/sharpsl_param.patch diff --git a/recipes-kernel/linux/linux-yocto-dev/tosa/tosa.scc b/recipes-kernel/linux/linux-yocto-dev/tosa/tosa.scc index 2299116..b53d584 100644 --- a/recipes-kernel/linux/linux-yocto-dev/tosa/tosa.scc +++ b/recipes-kernel/linux/linux-yocto-dev/tosa/tosa.scc @@ -3,5 +3,3 @@ kconf hardware tosa.cfg include ../zaurus-pxa-only.scc include ../zaurus-common.scc include ../zaurus-usb-host.scc - -patch ../patches/patches-pxa/sharpsl_param.patch -- 1.8.1.5 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
