a7y18lte-pmos/pmos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nokia-frt: adjust to fixed upstream repo (!380)

Browse Source 
Nokia only provides .zip files without any git history, so I had to
download the kernel git repo for 3.18.79 and then apply all downstream
changes as one singular commit to preserve at least some of the history.

My previous PC had big problems with creating patch files for symlinks
so I added some commits that should have been in patchfiles instead.
This merge request fixes that, leaving in repo just 3.18.79+downstream
patches and all my patches as patchfiles inside aports.

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Piotr Halama 2019-05-26 18:07:11 +00:00 committed by Oliver Smith
parent 5267dd0301
commit dcc2ce2438
7 changed files with 2211 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
device/linux-nokia-frt/00_symlinks.patch Normal file
View File

@ -0,0 +1,171 @@
this patch contains required symlinks and includes
---
diff --git a/drivers/misc/mediatek/btcvsd/inc/mt6735/AudioBTCVSDDef.h b/drivers/misc/mediatek/btcvsd/inc/mt6735/AudioBTCVSDDef.h
new file mode 120000
index 000000000000..039aa8632a90
--- /dev/null
+++ b/drivers/misc/mediatek/btcvsd/inc/mt6735/AudioBTCVSDDef.h
@@ -0,0 +1 @@
+../../AudioBTCVSDDef.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/cmdq/v2/cmdq_def.h b/drivers/misc/mediatek/cmdq/v2/cmdq_def.h
index 9383c5860a00..b01dfddab473 100644
--- a/drivers/misc/mediatek/cmdq/v2/cmdq_def.h
+++ b/drivers/misc/mediatek/cmdq/v2/cmdq_def.h
@@ -22,7 +22,7 @@
#ifdef CMDQ_COMMON_ENG_SUPPORT
#include "cmdq_engine_common.h"
#else
-#include "cmdq_engine.h"
+#include "mt6735/cmdq_engine.h"
#endif
#define CMDQ_SPECIAL_SUBSYS_ADDR (99)
diff --git a/drivers/misc/mediatek/ext_disp/extd_factory.c b/drivers/misc/mediatek/ext_disp/extd_factory.c
index 92c137980092..505dd793ab61 100644
--- a/drivers/misc/mediatek/ext_disp/extd_factory.c
+++ b/drivers/misc/mediatek/ext_disp/extd_factory.c
@@ -17,7 +17,7 @@
#include "extd_log.h"
#include "extd_factory.h"
#include "extd_info.h"
-#include "external_display.h"
+#include "mt6735m/external_display.h"
#include "dpi_dvt_test.h"
diff --git a/drivers/misc/mediatek/ext_disp/extd_multi_control.c b/drivers/misc/mediatek/ext_disp/extd_multi_control.c
index 52dd1f77b6b5..e6277c4eb37c 100644
--- a/drivers/misc/mediatek/ext_disp/extd_multi_control.c
+++ b/drivers/misc/mediatek/ext_disp/extd_multi_control.c
@@ -16,8 +16,8 @@
#include "extd_multi_control.h"
#include "disp_drv_platform.h"
-#include "external_display.h"
-#include "extd_platform.h"
+#include "mt6735m/external_display.h"
+#include "mt6735m/extd_platform.h"
#include "extd_log.h"
#include "mtk_ovl.h"
diff --git a/drivers/misc/mediatek/include/mt-plat/mt6735/include/mach/mt_gpufreq.h b/drivers/misc/mediatek/include/mt-plat/mt6735/include/mach/mt_gpufreq.h
new file mode 120000
index 000000000000..878f8cd06d0d
--- /dev/null
+++ b/drivers/misc/mediatek/include/mt-plat/mt6735/include/mach/mt_gpufreq.h
@@ -0,0 +1 @@
+../../../../../base/power/mt6735/mt_gpufreq.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/include/mt-plat/mt_sd.h b/drivers/misc/mediatek/include/mt-plat/mt_sd.h
new file mode 120000
index 000000000000..578ca29d2b38
--- /dev/null
+++ b/drivers/misc/mediatek/include/mt-plat/mt_sd.h
@@ -0,0 +1 @@
+../../../../mmc/host/mediatek/mt6735/mt_sd.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/m4u/2.0/m4u_reg.h b/drivers/misc/mediatek/m4u/2.0/m4u_reg.h
new file mode 120000
index 000000000000..8b49936c55bf
--- /dev/null
+++ b/drivers/misc/mediatek/m4u/2.0/m4u_reg.h
@@ -0,0 +1 @@
+../mt6735/mt6735m/m4u_reg.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/m4u/mt6735/m4u_priv.h b/drivers/misc/mediatek/m4u/mt6735/m4u_priv.h
index ec1f9d6a2993..9b5fd8ba67d3 100644
--- a/drivers/misc/mediatek/m4u/mt6735/m4u_priv.h
+++ b/drivers/misc/mediatek/m4u/mt6735/m4u_priv.h
@@ -25,9 +25,9 @@
#endif
#include "m4u.h"
-#include "m4u_reg.h"
+#include "mt6735m/m4u_reg.h"
#include "../2.0/m4u_pgtable.h"
-#include "m4u_platform.h"
+#include "mt6735m/m4u_platform.h"
#define M4UMSG(string, args...) pr_err("M4U"string, ##args)
#define M4UINFO(string, args...) pr_debug("M4U"string, ##args)
diff --git a/drivers/misc/mediatek/uart/include/platform_uart.h b/drivers/misc/mediatek/uart/include/platform_uart.h
new file mode 120000
index 000000000000..7850df5513d1
--- /dev/null
+++ b/drivers/misc/mediatek/uart/include/platform_uart.h
@@ -0,0 +1 @@
+../mt6735/platform_uart.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/video/include/ddp_mmp.h b/drivers/misc/mediatek/video/include/ddp_mmp.h
new file mode 120000
index 000000000000..226e7f918f41
--- /dev/null
+++ b/drivers/misc/mediatek/video/include/ddp_mmp.h
@@ -0,0 +1 @@
+../mt6735/ddp_mmp.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/video/include/disp_debug.h b/drivers/misc/mediatek/video/include/disp_debug.h
new file mode 120000
index 000000000000..f474a1e460ce
--- /dev/null
+++ b/drivers/misc/mediatek/video/include/disp_debug.h
@@ -0,0 +1 @@
+../mt6735/disp_debug.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/video/include/disp_event.h b/drivers/misc/mediatek/video/include/disp_event.h
new file mode 120000
index 000000000000..551dd22ee806
--- /dev/null
+++ b/drivers/misc/mediatek/video/include/disp_event.h
@@ -0,0 +1 @@
+../mt6735/disp_event.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_drv.h b/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_drv.h
new file mode 120000
index 000000000000..611b18a27478
--- /dev/null
+++ b/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_drv.h
@@ -0,0 +1 @@
+../ddp_drv.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_dump.h b/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_dump.h
new file mode 120000
index 000000000000..527ca2cc5745
--- /dev/null
+++ b/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_dump.h
@@ -0,0 +1 @@
+../ddp_dump.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_hal.h b/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_hal.h
new file mode 120000
index 000000000000..4a859796c458
--- /dev/null
+++ b/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_hal.h
@@ -0,0 +1 @@
+../ddp_hal.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_info.h b/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_info.h
new file mode 120000
index 000000000000..3902fed2f81c
--- /dev/null
+++ b/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_info.h
@@ -0,0 +1 @@
+../ddp_info.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_path.h b/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_path.h
new file mode 120000
index 000000000000..c2a88d4cbbcc
--- /dev/null
+++ b/drivers/misc/mediatek/video/mt6735/mt6735m/ddp_path.h
@@ -0,0 +1 @@
+../ddp_path.h
\ No newline at end of file
diff --git a/drivers/misc/mediatek/video/mt6735/mt6735m/disp_assert_layer.h b/drivers/misc/mediatek/video/mt6735/mt6735m/disp_assert_layer.h
new file mode 120000
index 000000000000..8eb3b6685798
--- /dev/null
+++ b/drivers/misc/mediatek/video/mt6735/mt6735m/disp_assert_layer.h
@@ -0,0 +1 @@
+../disp_assert_layer.h
\ No newline at end of file

0
device/linux-nokia-frt/00_makefile_path.patch → device/linux-nokia-frt/01_makefile_path.patch
View File

0
device/linux-nokia-frt/01_drvgen_mk.patch → device/linux-nokia-frt/02_drvgen_mk.patch
View File

60
device/linux-nokia-frt/02_path_fixes.patch
View File

@ -1,60 +0,0 @@
Fixes for wrong includes paths, probably missing symlinks
---
diff --git a/drivers/misc/mediatek/cmdq/v2/cmdq_def.h b/drivers/misc/mediatek/cmdq/v2/cmdq_def.h
index 9383c5860a00..b01dfddab473 100644
--- a/drivers/misc/mediatek/cmdq/v2/cmdq_def.h
+++ b/drivers/misc/mediatek/cmdq/v2/cmdq_def.h
@@ -22,7 +22,7 @@
#ifdef CMDQ_COMMON_ENG_SUPPORT
#include "cmdq_engine_common.h"
#else
-#include "cmdq_engine.h"
+#include "mt6735/cmdq_engine.h"
#endif
#define CMDQ_SPECIAL_SUBSYS_ADDR (99)
diff --git a/drivers/misc/mediatek/ext_disp/extd_factory.c b/drivers/misc/mediatek/ext_disp/extd_factory.c
index 92c137980092..505dd793ab61 100644
--- a/drivers/misc/mediatek/ext_disp/extd_factory.c
+++ b/drivers/misc/mediatek/ext_disp/extd_factory.c
@@ -17,7 +17,7 @@
#include "extd_log.h"
#include "extd_factory.h"
#include "extd_info.h"
-#include "external_display.h"
+#include "mt6735m/external_display.h"
#include "dpi_dvt_test.h"
diff --git a/drivers/misc/mediatek/ext_disp/extd_multi_control.c b/drivers/misc/mediatek/ext_disp/extd_multi_control.c
index 52dd1f77b6b5..e6277c4eb37c 100644
--- a/drivers/misc/mediatek/ext_disp/extd_multi_control.c
+++ b/drivers/misc/mediatek/ext_disp/extd_multi_control.c
@@ -16,8 +16,8 @@
#include "extd_multi_control.h"
#include "disp_drv_platform.h"
-#include "external_display.h"
-#include "extd_platform.h"
+#include "mt6735m/external_display.h"
+#include "mt6735m/extd_platform.h"
#include "extd_log.h"
#include "mtk_ovl.h"
diff --git a/drivers/misc/mediatek/m4u/mt6735/m4u_priv.h b/drivers/misc/mediatek/m4u/mt6735/m4u_priv.h
index ec1f9d6a2993..9b5fd8ba67d3 100644
--- a/drivers/misc/mediatek/m4u/mt6735/m4u_priv.h
+++ b/drivers/misc/mediatek/m4u/mt6735/m4u_priv.h
@@ -25,9 +25,9 @@
#endif
#include "m4u.h"
-#include "m4u_reg.h"
+#include "mt6735m/m4u_reg.h"
#include "../2.0/m4u_pgtable.h"
-#include "m4u_platform.h"
+#include "mt6735m/m4u_platform.h"
#define M4UMSG(string, args...) pr_err("M4U"string, ##args)
#define M4UINFO(string, args...) pr_debug("M4U"string, ##args)

6
device/linux-nokia-frt/03_vdsomunge_upstream.patch
View File

@ -1,7 +1,5 @@
Downstream version required various glibc functions, Fixes compilation under gcc8 without glibc
this patch contains version from upstream kernel 4.19
--- ---
diff --git a/arch/arm/vdso/vdsomunge.c b/arch/arm/vdso/vdsomunge.c diff --git a/arch/arm/vdso/vdsomunge.c b/arch/arm/vdso/vdsomunge.c
index 9005b07296c8..f6455273b2f8 100644 index 9005b07296c8..f6455273b2f8 100644
--- a/arch/arm/vdso/vdsomunge.c --- a/arch/arm/vdso/vdsomunge.c
@ -177,4 +175,4 @@ index 9005b07296c8..f6455273b2f8 100644
+ fail("Failed to sync %s: %s\n", outfile, strerror(errno)); + fail("Failed to sync %s: %s\n", outfile, strerror(errno));
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

2028
device/linux-nokia-frt/04_rndis.patch Normal file
View File

File diff suppressed because it is too large Load Diff

20
device/linux-nokia-frt/APKBUILD
View File

@ -4,7 +4,7 @@
maintainer="Piotr Halama <skrzynka@halamix2.pl>" maintainer="Piotr Halama <skrzynka@halamix2.pl>"
pkgname="linux-nokia-frt" pkgname="linux-nokia-frt"
pkgver=3.18.79 pkgver=3.18.79
pkgrel=0 pkgrel=1
pkgdesc="Nokia 1 kernel fork" pkgdesc="Nokia 1 kernel fork"
arch="armv7" arch="armv7"
_carch="arm" _carch="arm"
@ -20,15 +20,15 @@ HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
# Source # Source
_repository="android_kernel_nokia_1" _repository="android_kernel_nokia_1"
_commit="f17e3dc43479ed748f85080e5be04be228ed754d" _commit="588ea962d4c9c21d20a7109273587e49c7da9235"
_config="config-${_flavor}.${arch}" _config="config-${_flavor}.${arch}"
source=" source="
$pkgname-$_commit.tar.gz::https://github.com/pmsourcedump/${_repository}/archive/${_commit}.tar.gz $pkgname-$_commit.tar.gz::https://github.com/pmsourcedump/${_repository}/archive/${_commit}.tar.gz
$_config $_config
gcc8-fix-put-user.patch gcc8-fix-put-user.patch
00_makefile_path.patch 00_symlinks.patch
01_drvgen_mk.patch 01_makefile_path.patch
02_path_fixes.patch 02_drvgen_mk.patch
03_vdsomunge_upstream.patch 03_vdsomunge_upstream.patch
" "
#gcc7-give-up-on-ilog2-const-optimizations.patch #gcc7-give-up-on-ilog2-const-optimizations.patch
@ -73,10 +73,10 @@ package() {
modules_install modules_install
} }
sha512sums="d9026958c7f9cb7dbc56b27baab3362d6a34e975ebf933e8ee404dc76638d17fd3d2508f262f10190f646a0881d68ab0e0a40f2fce15a55409527f3af8ea9d19 linux-nokia-frt-f17e3dc43479ed748f85080e5be04be228ed754d.tar.gz sha512sums="676be1813c0886c509591a4940b9fdbd91243aaf84a8efebd7229f681e84211d86cc3466079808eb2fba45c0ada4bc7d43a4b5ab599326702c1d4830fa16d630 linux-nokia-frt-588ea962d4c9c21d20a7109273587e49c7da9235.tar.gz
4e4c05f4095c0490bb04b262b19033adda7d95fdec5c6c5bf1ba4b2cfa812ff159c9637f9cb6a3e854b46923467e9559d39b8b2b81f6fe6d038a6dbf5961c303 config-nokia-frt.armv7 4e4c05f4095c0490bb04b262b19033adda7d95fdec5c6c5bf1ba4b2cfa812ff159c9637f9cb6a3e854b46923467e9559d39b8b2b81f6fe6d038a6dbf5961c303 config-nokia-frt.armv7
197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch
ef8b9da80ca67424a02acfbf99924e3ea06574c83c6a737031f6ac41b718742ef0bd66b968b14118cac021067e29184e2199f238ace2a43dc2176d9cce796bc5 00_makefile_path.patch 1d1a99de49b29069eb1711ad884e3f0db0956d8eeb81bdb332e6aa13fb7f5cdd48cd75791cebc08b1aa0644cdd643d7632791a272333547a6ffe68a75295e7a8 00_symlinks.patch
aaf7e208f307db3126202f3f3410d4f8a74b450ef719717a064c817258cb428a150a798494f57e43f9e1f747ad83527e565f8d81c3c746d1fb0b4e42e6e30d50 01_drvgen_mk.patch ef8b9da80ca67424a02acfbf99924e3ea06574c83c6a737031f6ac41b718742ef0bd66b968b14118cac021067e29184e2199f238ace2a43dc2176d9cce796bc5 01_makefile_path.patch
bba77598f2fc5615b21f98db7e6a43a35d9cfae0e10fb8754d3b3c198ed36def390937c766550e251ae6c9867145e13dd0d1977bc8cc259ac53e48fedc4d0fee 02_path_fixes.patch aaf7e208f307db3126202f3f3410d4f8a74b450ef719717a064c817258cb428a150a798494f57e43f9e1f747ad83527e565f8d81c3c746d1fb0b4e42e6e30d50 02_drvgen_mk.patch
2bd2706f7b42a313e81bf27726ef697f0292f8f2c53ded5d344d410d25fc02375ea9659c7dab93500d4966e91efb0658d6ecf3292196350159e2cd54ed78441e 03_vdsomunge_upstream.patch" 19a6c3445bfd8057e4fabe1709f3d2344f3a99fef49b44636c07a18ba8791fab1bcff77f93aadff887946ae6f83c9d86e1c28f9b88d03c6ba156704d430b4470 03_vdsomunge_upstream.patch"