forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

lg-lenok: change arch from armhf to armv7 (MR 2169)

Browse source
This commit is contained in:
Andrea Scarpino 2021-05-13 00:30:19 +02:00 committed by Bart Ribbers
parent 4fc2da5cd6
commit 0a83652947
No known key found for this signature in database
GPG key ID: 699D16185DAFAE61
5 changed files with 64 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
device/testing/device-lg-lenok/APKBUILD
View file

@ -1,10 +1,10 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-lg-lenok
pkgver=1
pkgrel=17
pkgrel=18
pkgdesc="LG G Watch R"
url="https://postmarketos.org"
arch="armhf"
arch="armv7"
license="MIT"
depends="postmarketos-base linux-lg-lenok mkbootimg mesa-dri-swrast"
makedepends="devicepkg-dev"
@ -23,7 +23,9 @@ package() {
"$pkgdir"/etc/profile.d/fb_fix.sh
}
sha512sums="2de41f2a87b7d41611112c2a031039543692fc0afa11074799a3b5f2337327426c70d23194c3f6aa658c3203bd223bc4f03fb7eb532aa08557864c55b18cafe7 deviceinfo
sha512sums="
65857b13770a2df227dddcb1a50f9066da651b40582436867dfb3685f9ecfa68b6eb53fdb60f6bb32567b223b71304f52e4be01e5ce876462f81b88f31a1470d deviceinfo
d29105805adcd79d4f73c2f2c4483a2c627dc7b70acb77f43d085742ef930407c9b1423f7020c34f38e8a09f40cadd991b9acae23e936c90d6a4c0900250da22 initfs-hook.sh
a36ba9017df3b4be233783096c303abafa873dcdf50f6357b82f3c5526fd161a1914dafe143377cb5982955108b987890638b51911d0dd339172554e39a82d9f 90-android-touch-dev.rules
1e72e40935d21f194cf3183fad33e8f5baeacf1458568af61f8ef7cc54c3370e63072de3d414e2ba8feddeee8f012a0d9a40ce23bbb5a47173fd92b9794846c8 fb_fix.sh"
1e72e40935d21f194cf3183fad33e8f5baeacf1458568af61f8ef7cc54c3370e63072de3d414e2ba8feddeee8f012a0d9a40ce23bbb5a47173fd92b9794846c8 fb_fix.sh
"

2
device/testing/device-lg-lenok/deviceinfo
View file

@ -12,7 +12,7 @@ deviceinfo_dtb=""
deviceinfo_modules_initfs=""
deviceinfo_external_storage="false"
deviceinfo_flash_method="fastboot"
deviceinfo_arch="armhf"
deviceinfo_arch="armv7"
# Splash screen
deviceinfo_screen_width="320"

14
device/testing/linux-lg-lenok/APKBUILD
View file

@ -2,9 +2,9 @@
pkgname=linux-lg-lenok
pkgver=3.10.105
pkgrel=16
pkgrel=17
pkgdesc="LG G Watch R kernel fork"
arch="armhf"
arch="armv7"
_carch="arm"
_flavor="lg-lenok"
url="https://kernel.org"
@ -30,6 +30,7 @@ source="
$_config
gcc10-extern_YYLOC_global_declaration.patch
02_mdss_fb_refresh_rate.patch
fix_slow_boot_emmc_timeout.patch
"
builddir="$srcdir/$_repository-$_commit"
_outdir="out"
@ -49,7 +50,10 @@ package() {
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
}
sha512sums="ae4dbdf716cf446e9788c5e1d847ff45cca60831b6199568c9a46d6319824e57515f63eabf5250ceffee5f543c1de0813a1fb48e559c2f7d51cfc73a809ee934 linux-lg-lenok-7044f08636f6b8407bb00404a2e27ae0ce859f1e.tar.gz
69d66b11cb1e1fed50ecd7ebb618a487d14727d1a13702c12b73febb03d2f73207a8a0881b44c2917d749d6a817b7742e9783de98024e194af8a45d4d5c91866 config-lg-lenok.armhf
sha512sums="
ae4dbdf716cf446e9788c5e1d847ff45cca60831b6199568c9a46d6319824e57515f63eabf5250ceffee5f543c1de0813a1fb48e559c2f7d51cfc73a809ee934 linux-lg-lenok-7044f08636f6b8407bb00404a2e27ae0ce859f1e.tar.gz
69d66b11cb1e1fed50ecd7ebb618a487d14727d1a13702c12b73febb03d2f73207a8a0881b44c2917d749d6a817b7742e9783de98024e194af8a45d4d5c91866 config-lg-lenok.armv7
2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch
a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8 02_mdss_fb_refresh_rate.patch"
a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8 02_mdss_fb_refresh_rate.patch
e4d2a3ee6807659fe2bbbbdea4f9b4934b04ed1714ccdfea14dead5c8bc46cd9ebb93a98e2ff350382b0aa09bc4a6a00884f2b920082fdd6ab3a758a20b8e224 fix_slow_boot_emmc_timeout.patch
"

0
device/testing/linux-lg-lenok/config-lg-lenok.armhf → device/testing/linux-lg-lenok/config-lg-lenok.armv7
View file

48
device/testing/linux-lg-lenok/fix_slow_boot_emmc_timeout.patch Normal file
View file

@ -0,0 +1,48 @@
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 452782b..4b79592 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1025,6 +1025,19 @@ static inline void mmc_blk_reset_success(struct mmc_blk_data *md, int type)
md->reset_done &= ~type;
}
+int mmc_access_rpmb(struct mmc_queue *mq)
+{
+ struct mmc_blk_data *md = mq->data;
+ /*
+ * If this is a RPMB partition access, return ture
+ */
+ if (md && md->part_type == EXT_CSD_PART_CONFIG_ACC_RPMB)
+ return true;
+
+ return false;
+}
+EXPORT_SYMBOL_GPL(mmc_access_rpmb);
+
static int mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
{
struct mmc_blk_data *md = mq->data;
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 3e049c1..6ceede0 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -38,7 +38,7 @@ static int mmc_prep_request(struct request_queue *q, struct request *req)
return BLKPREP_KILL;
}
- if (mq && mmc_card_removed(mq->card))
+ if (mq && (mmc_card_removed(mq->card) || mmc_access_rpmb(mq)))
return BLKPREP_KILL;
req->cmd_flags |= REQ_DONTPREP;
diff --git a/drivers/mmc/card/queue.h b/drivers/mmc/card/queue.h
index 5752d50..99e6521 100644
--- a/drivers/mmc/card/queue.h
+++ b/drivers/mmc/card/queue.h
@@ -73,4 +73,6 @@ extern void mmc_queue_bounce_post(struct mmc_queue_req *);
extern int mmc_packed_init(struct mmc_queue *, struct mmc_card *);
extern void mmc_packed_clean(struct mmc_queue *);
+extern int mmc_access_rpmb(struct mmc_queue *);
+
#endif