nokia-sand: change device name to real codename (MR 2258)
This device was called nokia-rm846 before. [ci:skip-vercheck] [ci:skip-build] package rename, nothing changed
This commit is contained in:
Max Buchholz
Clayton Craft
parent
c6a5e885c0
commit
595f3dcb9c
7 changed files with 13 additions and 9 deletions
49
device/testing/linux-nokia-sand/00_fix_return_address.patch
Normal file
49
device/testing/linux-nokia-sand/00_fix_return_address.patch
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
From aeea3592a13bf12861943e44fc48f1f270941f8d Mon Sep 17 00:00:00 2001
|
||||
From: Behan Webster <behanw@converseincode.com>
|
||||
Date: Wed, 24 Sep 2014 01:06:46 +0100
|
||||
Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
|
||||
|
||||
With compilers which follow the C99 standard (like modern versions of gcc and
|
||||
clang), "extern inline" does the wrong thing (emits code for an externally
|
||||
linkable version of the inline function). In this case using static inline
|
||||
and removing the NULL version of return_address in return_address.c does
|
||||
the right thing.
|
||||
|
||||
Signed-off-by: Behan Webster <behanw@converseincode.com>
|
||||
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
|
||||
Acked-by: Steven Rostedt <rostedt@goodmis.org>
|
||||
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
||||
---
|
||||
arch/arm/include/asm/ftrace.h | 2 +-
|
||||
arch/arm/kernel/return_address.c | 5 -----
|
||||
2 files changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
|
||||
index 39eb16b0066f2..bfe2a2f5a644e 100644
|
||||
--- a/arch/arm/include/asm/ftrace.h
|
||||
+++ b/arch/arm/include/asm/ftrace.h
|
||||
@@ -45,7 +45,7 @@ void *return_address(unsigned int);
|
||||
|
||||
#else
|
||||
|
||||
-extern inline void *return_address(unsigned int level)
|
||||
+static inline void *return_address(unsigned int level)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
|
||||
index fafedd86885dd..f6aa84d5b93c9 100644
|
||||
--- a/arch/arm/kernel/return_address.c
|
||||
+++ b/arch/arm/kernel/return_address.c
|
||||
@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
|
||||
#warning "TODO: return_address should use unwind tables"
|
||||
#endif
|
||||
|
||||
-void *return_address(unsigned int level)
|
||||
-{
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
|
||||
|
||||
EXPORT_SYMBOL_GPL(return_address);
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
source:
|
||||
https://github.com/ShinySide/HispAsian_Lollipop_G6/commit/b7756b6fc4bb728722b14d2dfdbaf1dc843812e9
|
||||
|
||||
* These need to be static to avoid these errors:
|
||||
|
||||
drivers/built-in.o: In function `.LANCHOR1':
|
||||
msm_iommu_sec.c:(.data+0x9298): undefined reference to `kgsl_iommu_sync_lock'
|
||||
msm_iommu_sec.c:(.data+0x929c): undefined reference to `kgsl_iommu_sync_unlock'
|
||||
Makefile:877: recipe for target '.tmp_vmlinux1' failed
|
||||
make: *** [.tmp_vmlinux1] Error 1
|
||||
|
||||
Signed-off-by: Chet Kener <Cl3Kener@gmail.com>
|
||||
|
||||
--- a/drivers/gpu/msm/kgsl_iommu.c
|
||||
+++ b/drivers/gpu/msm/kgsl_iommu.c
|
||||
@@ -1010,7 +1010,7 @@ static int kgsl_iommu_init_sync_lock(struct kgsl_mmu *mmu)
|
||||
*
|
||||
* Return - int - number of commands.
|
||||
*/
|
||||
-inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu,
|
||||
+static inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu,
|
||||
unsigned int *cmds)
|
||||
{
|
||||
struct kgsl_device *device = mmu->device;
|
||||
@@ -1080,7 +1080,7 @@ inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu,
|
||||
*
|
||||
* Return - int - number of commands.
|
||||
*/
|
||||
-inline unsigned int kgsl_iommu_sync_unlock(struct kgsl_mmu *mmu,
|
||||
+static inline unsigned int kgsl_iommu_sync_unlock(struct kgsl_mmu *mmu,
|
||||
unsigned int *cmds)
|
||||
{
|
||||
struct kgsl_device *device = mmu->device;
|
||||
71
device/testing/linux-nokia-sand/APKBUILD
Normal file
71
device/testing/linux-nokia-sand/APKBUILD
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
# Kernel config based on: arch/arm/configs/lineage_zeal_defconfig
|
||||
|
||||
pkgname=linux-nokia-sand
|
||||
pkgver=3.4.0
|
||||
pkgrel=3
|
||||
pkgdesc="Lumia 620 kernel fork"
|
||||
arch="armv7"
|
||||
_carch="arm"
|
||||
_flavor="nokia-sand"
|
||||
url="https://kernel.org"
|
||||
license="GPL2"
|
||||
options="!strip !check !tracedeps pmb:cross-native"
|
||||
makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev gcc6"
|
||||
|
||||
# Compiler: GCC 6 (doesn't boot when compiled with newer versions)
|
||||
if [ "${CC:0:5}" != "gcc6-" ]; then
|
||||
CC="gcc6-$CC"
|
||||
HOSTCC="gcc6-gcc"
|
||||
CROSS_COMPILE="gcc6-$CROSS_COMPILE"
|
||||
fi
|
||||
|
||||
# Source
|
||||
_repository="android_kernel_nokia_msm8x27"
|
||||
_commit="28fe134696ce748ddaaf3633d3e345d3509276bd"
|
||||
_config="config-$_flavor.$arch"
|
||||
source="
|
||||
$pkgname-$_commit.tar.gz::https://github.com/Android4Lumia/android_kernel_nokia_msm8x27/archive/$_commit.tar.gz
|
||||
$_config
|
||||
00_fix_return_address.patch
|
||||
psmouse_base.patch
|
||||
02_gpu-msm-fix-gcc5-compile.patch
|
||||
"
|
||||
builddir="$srcdir/$_repository-$_commit"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
. downstreamkernel_prepare
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
make ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
|
||||
}
|
||||
|
||||
package() {
|
||||
# kernel.release
|
||||
install -D "$builddir/include/config/kernel.release" \
|
||||
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
|
||||
|
||||
# zImage (find the right one)
|
||||
cd "$builddir/arch/$_carch/boot"
|
||||
_target="$pkgdir/boot/vmlinuz-$_flavor"
|
||||
for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
|
||||
[ -e "$_zimg" ] || continue
|
||||
msg "zImage found: $_zimg"
|
||||
install -Dm644 "$_zimg" "$_target"
|
||||
break
|
||||
done
|
||||
if ! [ -e "$_target" ]; then
|
||||
error "Could not find zImage in $PWD!"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
sha512sums="
|
||||
6a576c9bfb645083d1d8477daae647ee44f15732414cb73a585d1c7e27c5481ccdcd98d6e8fe100b61400f1c3186a3339c2d438fb605177e1d11832e93dbc70b linux-nokia-sand-28fe134696ce748ddaaf3633d3e345d3509276bd.tar.gz
|
||||
2486c86d2debe239a339d03a7ebddd34ef32a19694f88c71373d6ae3a08fd7ce21ee408225236d9ca25ff9a35c95e9df288f16655709a0c4e5682256c99c6c25 config-nokia-sand.armv7
|
||||
ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 00_fix_return_address.patch
|
||||
f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc213874e358a6ff367418556a4542fba7e3c17e4b8e82e05c3a543 psmouse_base.patch
|
||||
7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch
|
||||
"
|
||||
4027
device/testing/linux-nokia-sand/config-nokia-sand.armv7
Normal file
4027
device/testing/linux-nokia-sand/config-nokia-sand.armv7
Normal file
File diff suppressed because it is too large
Load diff
106
device/testing/linux-nokia-sand/psmouse_base.patch
Normal file
106
device/testing/linux-nokia-sand/psmouse_base.patch
Normal file
|
|
@ -0,0 +1,106 @@
|
|||
From ae4fef6fc558b0621532d0de6ebaaeaabe861792 Mon Sep 17 00:00:00 2001
|
||||
From: sub77 <sub77@ymail.com>
|
||||
Date: Fri, 31 Jul 2015 17:47:45 +0200
|
||||
Subject: [PATCH] fix build error: PS2MOUSE fsp_detect & lifebook
|
||||
|
||||
---
|
||||
drivers/input/mouse/psmouse-base.c | 62 +++++++++++++++++++-------------------
|
||||
1 file changed, 31 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
|
||||
index a19c183557d..ad3d2e861d0 100644
|
||||
--- a/drivers/input/mouse/psmouse-base.c
|
||||
+++ b/drivers/input/mouse/psmouse-base.c
|
||||
@@ -708,14 +708,14 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
||||
/*
|
||||
* We always check for lifebook because it does not disturb mouse
|
||||
* (it only checks DMI information).
|
||||
+ *
|
||||
+ * if (psmouse_do_detect(lifebook_detect, psmouse, set_properties) == 0) {
|
||||
+ * if (max_proto > PSMOUSE_IMEX) {
|
||||
+ * if (!set_properties || lifebook_init(psmouse) == 0)
|
||||
+ * return PSMOUSE_LIFEBOOK;
|
||||
+ * }
|
||||
+ * }
|
||||
*/
|
||||
- if (psmouse_do_detect(lifebook_detect, psmouse, set_properties) == 0) {
|
||||
- if (max_proto > PSMOUSE_IMEX) {
|
||||
- if (!set_properties || lifebook_init(psmouse) == 0)
|
||||
- return PSMOUSE_LIFEBOOK;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
/*
|
||||
* Try Kensington ThinkingMouse (we try first, because synaptics probe
|
||||
* upsets the thinkingmouse).
|
||||
@@ -821,19 +821,19 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
||||
/*
|
||||
* Try Finger Sensing Pad. We do it here because its probe upsets
|
||||
* Trackpoint devices (causing TP_READ_ID command to time out).
|
||||
- */
|
||||
- if (max_proto > PSMOUSE_IMEX) {
|
||||
- if (psmouse_do_detect(fsp_detect,
|
||||
- psmouse, set_properties) == 0) {
|
||||
- if (!set_properties || fsp_init(psmouse) == 0)
|
||||
- return PSMOUSE_FSP;
|
||||
-/*
|
||||
+ *
|
||||
+ * if (max_proto > PSMOUSE_IMEX) {
|
||||
+ * if (psmouse_do_detect(fsp_detect,
|
||||
+ * psmouse, set_properties) == 0) {
|
||||
+ * if (!set_properties || fsp_init(psmouse) == 0)
|
||||
+ * return PSMOUSE_FSP;
|
||||
+ *
|
||||
* Init failed, try basic relative protocols
|
||||
+ *
|
||||
+ * max_proto = PSMOUSE_IMEX;
|
||||
+ * }
|
||||
+ * }
|
||||
*/
|
||||
- max_proto = PSMOUSE_IMEX;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
/*
|
||||
* Reset to defaults in case the device got confused by extended
|
||||
* protocol probes. Note that we follow up with full reset because
|
||||
@@ -944,12 +944,12 @@ static const struct psmouse_protocol psmouse_protocols[] = {
|
||||
},
|
||||
#endif
|
||||
#ifdef CONFIG_MOUSE_PS2_LIFEBOOK
|
||||
- {
|
||||
- .type = PSMOUSE_LIFEBOOK,
|
||||
- .name = "LBPS/2",
|
||||
- .alias = "lifebook",
|
||||
- .init = lifebook_init,
|
||||
- },
|
||||
+/* {
|
||||
+* .type = PSMOUSE_LIFEBOOK,
|
||||
+* .name = "LBPS/2",
|
||||
+* .alias = "lifebook",
|
||||
+* .init = lifebook_init,
|
||||
+* },*/
|
||||
#endif
|
||||
#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
|
||||
{
|
||||
@@ -985,13 +985,13 @@ static const struct psmouse_protocol psmouse_protocols[] = {
|
||||
},
|
||||
#endif
|
||||
#ifdef CONFIG_MOUSE_PS2_SENTELIC
|
||||
- {
|
||||
- .type = PSMOUSE_FSP,
|
||||
- .name = "FSPPS/2",
|
||||
- .alias = "fsp",
|
||||
- .detect = fsp_detect,
|
||||
- .init = fsp_init,
|
||||
- },
|
||||
+/* {
|
||||
+* .type = PSMOUSE_FSP,
|
||||
+* .name = "FSPPS/2",
|
||||
+* .alias = "fsp",
|
||||
+* .detect = fsp_detect,
|
||||
+* .init = fsp_init,
|
||||
+* },*/
|
||||
#endif
|
||||
{
|
||||
.type = PSMOUSE_CORTRON,
|
||||
Loading…
Add table
Add a link
Reference in a new issue