From 4b225a5f32493a2f11be1875c9bb03a94bc75f4c Mon Sep 17 00:00:00 2001 From: Dylan Van Assche Date: Sat, 22 May 2021 09:13:55 +0200 Subject: [PATCH] device-pine64-pinephone: drop eg25-manager configs (MR 2185) Replaced by GNSS assistance support [ci:skip-build] already built successfully in CI --- device/main/device-pine64-pinephone/APKBUILD | 16 +----- .../eg25-pinephone-1.0.toml | 49 ------------------ .../eg25-pinephone-1.1.toml | 50 ------------------- .../eg25-pinephone-1.2.toml | 42 ---------------- 4 files changed, 2 insertions(+), 155 deletions(-) delete mode 100644 device/main/device-pine64-pinephone/eg25-pinephone-1.0.toml delete mode 100644 device/main/device-pine64-pinephone/eg25-pinephone-1.1.toml delete mode 100644 device/main/device-pine64-pinephone/eg25-pinephone-1.2.toml diff --git a/device/main/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD index f85c83232..f10d3590e 100644 --- a/device/main/device-pine64-pinephone/APKBUILD +++ b/device/main/device-pine64-pinephone/APKBUILD @@ -5,8 +5,8 @@ # Co-Maintainer: Clayton Craft # Co-Maintainer: Dylan Van Assche pkgname=device-pine64-pinephone -pkgver=0.28 -pkgrel=3 +pkgver=0.29 +pkgrel=0 pkgdesc="PINE64 PinePhone" url="https://postmarketos.org" license="MIT" @@ -49,9 +49,6 @@ source=" kirigami-lowpower.sh modemmanager.conf setup-modem.sh - eg25-pinephone-1.0.toml - eg25-pinephone-1.1.toml - eg25-pinephone-1.2.toml sysrq.conf uboot-script.cmd ucm/HiFi.conf @@ -124,12 +121,6 @@ package() { "$pkgdir"/usr/lib/udev/rules.d/ install -Dm644 "$srcdir"/modemmanager.conf \ "$pkgdir"/etc/conf.d/modemmanager - install -Dm644 "$srcdir"/eg25-pinephone-1.0.toml \ - "$pkgdir"/etc/eg25-manager/pine64,pinephone-1.0.toml - install -Dm644 "$srcdir"/eg25-pinephone-1.1.toml \ - "$pkgdir"/etc/eg25-manager/pine64,pinephone-1.1.toml - install -Dm644 "$srcdir"/eg25-pinephone-1.2.toml \ - "$pkgdir"/etc/eg25-manager/pine64,pinephone-1.2.toml # Wifi / PM install -Dm644 "$srcdir"/70-wifi-pm.rules -t \ @@ -193,9 +184,6 @@ ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd4644 6bc22b369b2d9058b702ac7a7862abaefaf8179b43491868bdb008d181b59104f1ded89db1da51a810e1ccdc803a579b924a438674283a65afc3a9c4d2894caf kirigami-lowpower.sh 3d6e9030125afc1dc3b654d1ce5d124ddd3ef3ad1a4d3e46c8168cf3f8a3762ffd0c75427759740ae26bd5c4f32b6704b7cf7e5806434884560fa704b7e72921 modemmanager.conf fa063e2863afc48e627acc1a5b213a81499ba1dd30325f74f118a44e3964aec7e597b1f4bd318b7cf5bf14f27daf88e6ad9fc277ab106cbbe1189fdcc650d5c1 setup-modem.sh -f9386dfd902028988c9659bd6e001ba46ea87b35f5dce7723dd4cfbe971928c75f6fef9d706201d62cc24cca2d499a39c8c0fed58a3403e2cb848eb1aece0e19 eg25-pinephone-1.0.toml -cf7d4a611701745762f19746e40d87b6df14a6b24f2d466c4177b7ab5ee87a048bab719a6c66722198020e1aa73d3e12d3715b5588bc33bf207f3e86040dcc44 eg25-pinephone-1.1.toml -8adeca98002ff8ee850512f72f2e126348cfa817a1aefdd77d103aee76a6b2e6a024deffcbeef1235ee2fcc766003f55b67cedb3eb06ca92a58d5b81f2bf6848 eg25-pinephone-1.2.toml f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8e4042bb83cc80b2b436224c8d47b6d67361369a724bbf7ee sysrq.conf 9d4bcc02c6c501b3a205516c8f276ef4293d88edea61ac725887ec28f9f6788320e9f9edd7f1cf29bbf6122acfad2ef5b3ad5e4b33763fe867bd23d2ac17ed5c uboot-script.cmd f963898fa2ce66bc830e56feeec6ffc9888834e14cc1591d72908ef45ad82532bc3ef5fb32413e07b6722749c9d03e7cf92f06f1fcb859c38b9297cf58e5cedd HiFi.conf diff --git a/device/main/device-pine64-pinephone/eg25-pinephone-1.0.toml b/device/main/device-pine64-pinephone/eg25-pinephone-1.0.toml deleted file mode 100644 index 8a3cf4590..000000000 --- a/device/main/device-pine64-pinephone/eg25-pinephone-1.0.toml +++ /dev/null @@ -1,49 +0,0 @@ -[manager] -need_libusb = true -usb_vid = 0x2c7c -usb_pid = 0x0125 - -# Uncomment the following if you need to change the modem detection timeout on -# resume and/or the time during which suspend is blocked after modem boot -#[suspend] -#boot_timeout = 120 -#recovery_timeout = 9 - -[gpio] -dtr = 358 -pwrkey = 35 -reset = 68 -apready = 231 -disable = 232 - -[at] -uart = "/dev/ttyS2" -configure = [ -# Each command has 4 possible elements: -# * `cmd` : the AT command itself, which will be translated to "AT+`cmd`" -# * `subcmd`: the subcommand in case a single AT command can be used -# to change multiple parameters, such as QCFG (optional) -# * `value` : the commands, argument, usually used to set the value of -# a specific parameter (optional) -# * `expect`: the expected return value; the command is first executed -# without any value in order to query the current state. This -# state is then compared to the `expect` string; if they don't -# match, the command is then executed with value `expect` in -# order to set the parameter to the configured value (optional) -# A command can have `expect` OR `value` configured, but it shouldn't have both - { cmd = "QGMR" }, - { cmd = "QDAI", expect = "1,1,0,1,0,0,1,1" }, - { cmd = "QCFG", subcmd = "risignaltype", expect = "\"physical\"" }, - { cmd = "QCFG", subcmd = "ims", expect = "1" }, - { cmd = "QCFG", subcmd = "urc/ri/ring", expect = "\"pulse\",2000,1000,5000,\"off\",1" }, - { cmd = "QCFG", subcmd = "urc/ri/smsincoming", expect = "\"pulse\",2000" }, - { cmd = "QCFG", subcmd = "urc/ri/other", expect = "\"off\",1" }, - { cmd = "QCFG", subcmd = "urc/delay", expect = "1" }, - { cmd = "QURCCFG", subcmd = "urcport", expect = "\"usbat\"" }, - { cmd = "QSCLK", value = "1" }, -] -suspend = [ -] -resume = [ -] -reset = [ { cmd = "CFUN", value = "1,1" } ] diff --git a/device/main/device-pine64-pinephone/eg25-pinephone-1.1.toml b/device/main/device-pine64-pinephone/eg25-pinephone-1.1.toml deleted file mode 100644 index 559ba9110..000000000 --- a/device/main/device-pine64-pinephone/eg25-pinephone-1.1.toml +++ /dev/null @@ -1,50 +0,0 @@ -[manager] -need_libusb = true -usb_vid = 0x2c7c -usb_pid = 0x0125 - -# Uncomment the following if you need to change the modem detection timeout on -# resume and/or the time during which suspend is blocked after modem boot -#[suspend] -#boot_timeout = 120 -#recovery_timeout = 9 - -[gpio] -dtr = 358 -pwrkey = 35 -reset = 68 -apready = 231 -disable = 232 - -[at] -uart = "/dev/ttyS2" -configure = [ -# Each command has 4 possible elements: -# * `cmd` : the AT command itself, which will be translated to "AT+`cmd`" -# * `subcmd`: the subcommand in case a single AT command can be used -# to change multiple parameters, such as QCFG (optional) -# * `value` : the commands, argument, usually used to set the value of -# a specific parameter (optional) -# * `expect`: the expected return value; the command is first executed -# without any value in order to query the current state. This -# state is then compared to the `expect` string; if they don't -# match, the command is then executed with value `expect` in -# order to set the parameter to the configured value (optional) -# A command can have `expect` OR `value` configured, but it shouldn't have both - { cmd = "QGMR" }, - { cmd = "QDAI", expect = "1,1,0,1,0,0,1,1" }, - { cmd = "QCFG", subcmd = "risignaltype", expect = "\"physical\"" }, - { cmd = "QCFG", subcmd = "ims", expect = "1" }, - { cmd = "QCFG", subcmd = "urc/ri/ring", expect = "\"pulse\",2000,1000,5000,\"off\",1" }, - { cmd = "QCFG", subcmd = "urc/ri/smsincoming", expect = "\"pulse\",2000" }, - { cmd = "QCFG", subcmd = "urc/ri/other", expect = "\"off\",1" }, - { cmd = "QCFG", subcmd = "urc/delay", expect = "1" }, - { cmd = "QURCCFG", subcmd = "urcport", expect = "\"usbat\"" }, - { cmd = "QSCLK", value = "1" }, -] -suspend = [ -] -resume = [ -] -reset = [ { cmd = "CFUN", value = "1,1" } ] - diff --git a/device/main/device-pine64-pinephone/eg25-pinephone-1.2.toml b/device/main/device-pine64-pinephone/eg25-pinephone-1.2.toml deleted file mode 100644 index 109e46892..000000000 --- a/device/main/device-pine64-pinephone/eg25-pinephone-1.2.toml +++ /dev/null @@ -1,42 +0,0 @@ -# Uncomment the following if you need to change the modem detection timeout on -# resume and/or the time during which suspend is blocked after modem boot -#[suspend] -#boot_timeout = 120 -#recovery_timeout = 9 - -[gpio] -dtr = 34 -pwrkey = 35 -reset = 68 -apready = 231 -disable = 232 -status = 233 - -[at] -uart = "/dev/ttyS2" -configure = [ -# Each command has 4 possible elements: -# * `cmd` : the AT command itself, which will be translated to "AT+`cmd`" -# * `subcmd`: the subcommand in case a single AT command can be used -# to change multiple parameters, such as QCFG (optional) -# * `value` : the commands, argument, usually used to set the value of -# a specific parameter (optional) -# * `expect`: the expected return value; the command is first executed -# without any value in order to query the current state. This -# state is then compared to the `expect` string; if they don't -# match, the command is then executed with value `expect` in -# order to set the parameter to the configured value (optional) -# A command can have `expect` OR `value` configured, but it shouldn't have both - { cmd = "QGMR" }, - { cmd = "QDAI", expect = "1,1,0,1,0,0,1,1" }, - { cmd = "QCFG", subcmd = "risignaltype", expect = "\"physical\"" }, - { cmd = "QCFG", subcmd = "ims", expect = "1" }, - { cmd = "QCFG", subcmd = "apready", expect = "1,0,500" }, - { cmd = "QURCCFG", subcmd = "urcport", expect = "\"usbat\"" }, - { cmd = "QSCLK", value = "1" }, -] -suspend = [ -] -resume = [ -] -reset = [ { cmd = "CFUN", value = "1,1" } ]